2113 Commits (35399d7b1b8cf42f250f57a3d1b510a7ca95d00d)

Author SHA1 Message Date
元气满满(jgy) 8ef8eb43d1 2024-11-05 Device设备 - 查询点检产线-工单状态应为w1 1 year ago
元气满满(jgy) 979fba0209 2024-11-5 Device设备 - 点检 -只生成当日计划生产的产线 1 year ago
mengjiao 9ced49d488 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-wms/src/main/java/com/op/wms/controller/BpProcureOrderController.java
1 year ago
mengjiao 3d08918ac0 wms修改重复过账测试bug 1 year ago
zhaoxiaolin 84f2290dcd 修复2 1 year ago
zhaoxiaolin f22f64e54a 修复2 1 year ago
zhaoxiaolin d773d44507 问题修复11 1 year ago
陈恒杰 c5d8552506 Merge remote-tracking branch 'origin/master' 1 year ago
陈恒杰 5cb2adad8f 白坯原材料采购单 1 year ago
mengjiao 497514647d Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 5c49d63444 wms修改1 1 year ago
zhaoxiaolin 8c81e1d64c 问题修复10 1 year ago
zhaoxiaolin 897a9e83a5 问题修复9 1 year ago
mengjiao 561d15680c wms和打印机做对接 1 year ago
mengjiao fbad45bd59 wms采购到货(SRM)到货登记界面改进,重点加上“整张送货单一键报检”,不用选择和修改数字 加标识卡的打印顺序,如:7张标识卡的话,就是7-1、7-2、7-3这样 1 year ago
Yangwl 2ae296d681 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl fa04d66dff 白坯业务看板 1 year ago
zhaoxiaolin 040785982e 问题修复8 1 year ago
zhaoxiaolin e4a97da59a 问题修复7 1 year ago
陈恒杰 6c629a4d84 Merge remote-tracking branch 'origin/master' 1 year ago
陈恒杰 17a2ec19f3 白坯原材料入库 1 year ago
mengjiao f07749eafb Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao d89016e4fe wms白胚部分修改 1 year ago
Yangwl a52a4eab62 白坯需求实体 1 year ago
Yangwl 4893ed8ac8 Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl df21d00b98 SAP白坯需求数量接口 1 year ago
陈恒杰 89c8973cac Merge remote-tracking branch 'origin/master' 1 year ago
陈恒杰 0b22b0542c 白坯原材料入库 1 year ago
zhaoxiaolin 21818265fc 问题修复6 1 year ago
mengjiao 761e5b97aa Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao f1d3595e79 wms页面修改 1 year ago
zhaoxiaolin 6504f975a4 问题修复5 1 year ago
Yangwl 04aff0d8f9 报表推送修改 1 year ago
zhaoxiaolin 235955dce2 问题修复4 1 year ago
zhaoxiaolin b0c5d5e8c6 问题修复4 1 year ago
zhaoxiaolin 71c2c09b2f 问题修复3 1 year ago
zhaoxiaolin a4b0ec81da 问题修复2 1 year ago
zhaoxiaolin 92f7cf7741 问题修复 1 year ago
zhaoxiaolin 09b3795c50 问题修复 1 year ago
zhaoxiaolin bed8f9a353 问题修复 1 year ago
mengjiao 991307491a Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao ccf6e9303b wms部分修改3 1 year ago
陈恒杰 6495ff8292 来料检验物料号模糊查询 1 year ago
zhaoxiaolin 5fad84018d 问题修复 1 year ago
zhaoxiaolin 7c8e7dc38e Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 954170a6cb 问题修复 1 year ago
mengjiao f0f7b81534 wms部分修改2.1 1 year ago
mengjiao 818d395e3d wms部分修改2 1 year ago
mengjiao 1872a8d7ba Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 707130bbae wms部分修改 1 year ago
zhaoxiaolin b3efa8d1bf 问题修复 1 year ago
zhaoxiaolin 7a80d9dc30 问题修复 1 year ago
元气满满(jgy) 85bec1c62d 2024-10-18 设备-运行记录-导出 1 year ago
mengjiao 76983c9df4 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 9763eb4408 wms过账加过账批次 1 year ago
zhaoxiaolin 335226b2dc 问题修复 1 year ago
zhaoxiaolin 36e7c1427e 问题修复 1 year ago
mengjiao 8fa1a90af5 wmsSap收货过账字段生产时间的修改 1 year ago
mengjiao ded3c3ec2c wms批次的截取规则修改 1 year ago
mengjiao bee7cff0c2 wms成品出库查询的修改 1 year ago
mengjiao a4f83dd248 wms定时任务2 1 year ago
mengjiao a482c1b621 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao c924f6c467 wms定时任务 1 year ago
zhaoxiaolin e33b29e349 oa 1 year ago
zhaoxiaolin 393983493a oa 1 year ago
zhaoxiaolin 9f5836d239 oa 1 year ago
zhaoxiaolin d3b0dcf26b 线体产品 1 year ago
zhaoxiaolin 4e661cabe8 cpk分析报表 1 year ago
zhaoxiaolin dfc7627430 受控文件功能开发升级 1 year ago
zhaoxiaolin 1320887022 受控文件功能开发 1 year ago
mengjiao f09dcd1aa1 wms生产领料手持确认接口修改 1 year ago
mengjiao 98ce3d3b7d wms入库批次修改批次2 1 year ago
mengjiao 028e2a0583 wms入库批次修改批次 1 year ago
mengjiao 3f4d016372 wms包材库存页面添加上送货单和采购单--有利于反查,同时加上补打按钮 1 year ago
mengjiao eda3150b06 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao eaf3066869 wms供应商字段的查询 1 year ago
zhaoxiaolin 9160f1c223 定量检测项明细报表 1 year ago
mengjiao e7e9d57758 wms包材出库明细页面接口 1 year ago
mengjiao 2d7d562cdd wms成品过账修改3和加送货单字插入 1 year ago
mengjiao f0ac9a24ec Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao c5212b74d3 wms成品过账修改2 1 year ago
mengjiao cc8ccba803 wms成品过账修改1 1 year ago
zhaoxiaolin d49b3b9bdd 质量问题修改 1 year ago
元气满满(jgy) c3cc940ebc 2024-10-09 设备-工单导出 1 year ago
元气满满(jgy) d76e261b1c 2024-10-09 设备-安环-点检、巡检、保养三个报表 1 year ago
zhaoxiaolin a7b2989873 质量问题修改 1 year ago
mengjiao 126c1ec1f3 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 3e6678a95e wms过账修改 1 year ago
元气满满(jgy) 499ef4d5bd 2024-10-08 设备-点检巡检保养报表 加合格率 1 year ago
mengjiao cfab9c2d69 wms查询页面修改 1 year ago
mengjiao 848bc9082c wms打印标识卡bug 1 year ago
mengjiao 6ace161a53 wms105过账bug 1 year ago
mengjiao 430dec322b wms之前的库存临时打印标识卡页面修改加测试问题 1 year ago
mengjiao 6c52e7de3f wms补打问题 1 year ago
mengjiao b4986a84ff wms问题修改 1 year ago
mengjiao 0e7cf9b438 wms包材退货过账接口修改 1 year ago
mengjiao d9fdb56d9d wms包材退货接口5 1 year ago
mengjiao 54450f5f22 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao b4aad429d2 wms包材退货接口4修改 1 year ago
zhaoxiaolin 64b203c956 三层报工修改 1 year ago
mengjiao 66682323f9 wms包材退货接口3 1 year ago
mengjiao a8648e0543 wms包材退货和打印接口2 1 year ago
mengjiao b40e61930a Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 37df2b577d wms包材退货和打印接口 1 year ago
zhaoxiaolin 6aeb8d76cb 工艺默认同步1000工厂 1 year ago
mengjiao 43d99edb29 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 0cf33db060 wms包材接口修改 1 year ago
元气满满(jgy) bc28d92c76 Merge remote-tracking branch 'origin/master' 1 year ago
元气满满(jgy) b501b7059d 2024-09-20 设备-两个改动 手持接口+快读工单重复 1 year ago
mengjiao e1aa0eef08 生产领料-查询接口修改 1 year ago
mengjiao 48c6ee4db1 过账接口修改1 1 year ago
mengjiao 3f3ec65d11 sap接口修改 1 year ago
mengjiao 223dcf589d Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao c5a8c3d29c wms修改2 1 year ago
陈恒杰 76378ec84e Merge remote-tracking branch 'origin/master' 1 year ago
陈恒杰 7fe2550fef 附属属性修改 1 year ago
mengjiao 3c1efdc3ce 补打修改 1 year ago
mengjiao eae3aba059 wms修改 1 year ago
陈恒杰 1fba7c8452 Merge remote-tracking branch 'origin/master' 1 year ago
陈恒杰 cea2fc0784 页面优化 1 year ago
Yangwl f9d882fdff Merge remote-tracking branch 'origin/master' 1 year ago
Yangwl d944723919 企业微信推送修改 1 year ago
mengjiao 133c270d17 过账修改 1 year ago
mengjiao 85652ede50 查询修改 1 year ago
mengjiao 65a70b9a7a Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao c6cc87fb8a 包材出库过账修改 1 year ago
zhaoxiaolin 040ffed149 质量cpk配置 1 year ago
mengjiao 3460f4ec24 包材出库修改3 1 year ago
mengjiao 410aecd5ac 包材出库修改2 1 year ago
mengjiao a7b34640bf Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao b23047f1e6 包材出库修改 1 year ago
陈恒杰 e8cb726894 页面优化 1 year ago
zhaoxiaolin dd8b2d9d8c 质量cpk 1 year ago
zhaoxiaolin a3bff82c1c Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 7a9d2dd4ae 数据源 1 year ago
mengjiao 4e519ae69d bug修复 1 year ago
mengjiao ca4ef2c6a8 包材出库提交 1 year ago
zhaoxiaolin f18ec9c8e2 质量手持bug修复7 1 year ago
zhaoxiaolin 186955f16f 质量手持bug修复6 1 year ago
zhaoxiaolin 8b50870a38 质量手持bug修复5 1 year ago
zhaoxiaolin da1910fc60 质量手持bug修复4 1 year ago
zhaoxiaolin 6dad3b4ce5 质量手持bug修复3 1 year ago
zhaoxiaolin b28459cd76 质量手持bug修复2 1 year ago
zhaoxiaolin 24d8b7c6a1 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin abc649aef4 质量手持bug修复 1 year ago
陈恒杰 9340ef8a3d 包材采购单页面修改 1 year ago
陈恒杰 8013613b20 Merge remote-tracking branch 'origin/master' 1 year ago
陈恒杰 5514b5d951 包材采购单页面修改 1 year ago
mengjiao ac827d2d67 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 393e90e69e 批次号生成问题 1 year ago
zhaoxiaolin ede02cca4e Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 4a477c9259 标识卡加重置 1 year ago
mengjiao 6bce1430e6 成品过账和查询修改2 1 year ago
zhaoxiaolin a497b975e7 Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 7ea5e138ef 质量细节优化 1 year ago
mengjiao 4dc9b4cb80 成品过账修改 1 year ago
mengjiao 615676adab 成品模糊查询2 1 year ago
mengjiao 2ee57da594 成品模糊查询 1 year ago
mengjiao 79d0a701e6 成品过账修复bug2 1 year ago
mengjiao 51137e400d Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 96671e9717 成品过账修复bug 1 year ago
zhaoxiaolin 2b2e022c27 标识卡细节优化 1 year ago
mengjiao 044659cbdd 扫标识卡带出信息修改1 1 year ago
mengjiao a2036319c1 获取质检结果 1 year ago
mengjiao 7bd830a5f8 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao de3d71c143 wms过账修改2 1 year ago
A0010407 58d2aa0a4d 2024-09-02 MES-关于上位机三个报表-产线编码改为产线名称 1 year ago
mengjiao 45bc283865 wms过账修改 1 year ago
zhaoxiaolin c4f8443c53 细节优化 1 year ago
zhaoxiaolin dc57edbaa1 细节优化 1 year ago
A0010407 7b77694ec1 2024-09-02 MES-点检报表-根据上位机进行调整-班组改为班次 1 year ago
zhaoxiaolin 2cbd5582cc Merge remote-tracking branch 'origin/master' 1 year ago
zhaoxiaolin 9074446d16 细节优化 1 year ago
mengjiao f791cc3439 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao cc87add6d2 sap105部分对接 1 year ago
mengjiao aba51d999f 标识卡修改1 1 year ago
A0010407 91606b8a3d 2024-08-15 1 year ago
mengjiao 31ab0037cb 入库修改3 1 year ago
mengjiao d8caf598e2 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 110e3a7fc0 入库修改2 1 year ago
陈恒杰 73df145d8b Merge remote-tracking branch 'origin/master' 1 year ago
陈恒杰 b7f5b2edab 人员薪酬统计展示 1 year ago
mengjiao ac075bc726 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 60640bfe48 入库修改1 1 year ago
zhaoxiaolin bb82554e6f 无用引用 1 year ago
mengjiao f775a70953 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 5ff83afa31 物料标识卡生成修改 1 year ago
zhaoxiaolin 0df8aa8a51 标识卡和检测项配置调整 1 year ago
mengjiao e9ebfb2853 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao c4b19d376c 包材入库修改- 扫码物料标识卡--获取信息 1 year ago
A0010407 84a774f61e 2024-08-29 MES-自检互检报表+首件报表 1 year ago
mengjiao 0e249df6f3 包材入库修改 1 year ago
mengjiao a39b38ee40 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao ffaa3af681 临时打印已经在仓库的成品的标识卡(标识卡根据他们提个的库存信息生成),--(这种没法确认对应的订单,wms自己生成,), 1 year ago
zhaoxiaolin b8a09c3101 仓库检验 成品检测项归一 1 year ago
mengjiao f96b71da35 Merge remote-tracking branch 'origin/master' 1 year ago
mengjiao 9063382fce 补打,成品入库扫标识卡接口bug 1 year ago
zhaoxiaolin b3cfa58a3d 检验明细结果导出2 1 year ago
zhaoxiaolin cf85447bdb 检验明细结果导出 1 year ago
Yangwl 442fb1831f Merge remote-tracking branch 'origin/master' 1 year ago