2163 Commits (828e94fac043b3854e204a037e254d8474ab3f23)

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