Commit Graph

1663 Commits (64f890c0f3c687c4026240aac2153ddfdac76d01)
 

Author SHA1 Message Date
王杰 75ef282bcf 44423 返工作业页面增加排序拆解按钮 merge 解决冲突 10 months ago
王杰 559e87f8b4 Merge branch 'dev-temp-castle-2412191916-44449' into test 10 months ago
王杰 5e7541a1cd Merge branch 'uat-temp-wj-2412280000-44630' into dev 10 months ago
王杰 601b16567a 44630 读胎膜信号工步,无法适配柔性焊流程,需要优化 10 months ago
王杰 0da9863cf7 Merge branch 'dev-temp-wj-2412190000-44423' into dev 10 months ago
王杰 e602f615b9 44423 返工作业页面增加排序拆解按钮 10 months ago
王杰 0552ad769d Merge branch 'uat-temp-wj-2412280000-44630' into dev 10 months ago
王杰 35f98ef220 44630 读胎膜信号工步,无法适配柔性焊流程,需要优化 10 months ago
王杰 c8aee6a401 Merge branch 'uat-temp-wj-2412280000-44630' into dev 10 months ago
王杰 7462388c13 44630 读胎膜信号工步,无法适配柔性焊流程,需要优化 10 months ago
王杰 270bf21986 分支提交错误, 代码回退 10 months ago
王杰 567a81d3bf Merge branch 'dev-temp-wj-2412190000-44423' into dev 10 months ago
王杰 c6570b2916 44423 返工作业页面增加排序拆解按钮 10 months ago
王杰 98f999bc7e 44630 读胎膜信号工步,无法适配柔性焊流程,需要优化 10 months ago
王杰 5aaa08b8b7 Merge branch 'uat-temp-wj-2412241000-44315-44425' into dev 10 months ago
王杰 a39dad81eb 44425 当有多个线边库位的情况,电子化检验的来源库位如何获取 10 months ago
王杰 7a52fea201 Merge branch 'uat-temp-wj-2412270000-44586' into dev 10 months ago
王杰 20adcbfa3c Merge branch 'uat-temp-wj-2412270000-44514' into dev 10 months ago
王杰 fe5275dcce 44514 料包绑定条码列显示全,扫描的条码需要增加定位 (修改提示信息) 10 months ago
王杰 ed5bb4bd66 44586 排序线客户条码下线后,在其它工位重新扫描条码状态改为在加工 10 months ago
王杰 b79667bf09 44586 排序线客户条码下线后,在其它工位重新扫描条码状态改为在加工 10 months ago
王杰 ec9bc99df3 44586 排序线客户条码下线后,在其它工位重新扫描条码状态改为在加工 10 months ago
王杰 4890c50a76 Merge branch 'uat-temp-copydevorderservice' into dev 10 months ago
王杰 c544b33b99 44613 未完成数量不能小于0 10 months ago
王杰 70bd1fd55b Merge branch 'uat-temp-castle-2412250942-44253' into dev 10 months ago
王杰 8ba822d174 Merge branch 'uat-temp-wj-2412260000-44069' into dev 10 months ago
王杰 4e6102f15f 44609 油漆线增加一套打印模版 10 months ago
xiangwei.zhang df69bc6293 未完成数量不能小于0 10 months ago
王杰 1dd4c179f6 Merge branch 'uat-temp-wj-2412241000-44315-44425' into dev 10 months ago
王杰 4d5d0cfb52 Merge branch 'uat-temp-wj-2412240000-44246' into dev 10 months ago
王杰 0d0205d48f Merge branch 'uat-temp-copydevorderservice' into dev 10 months ago
王杰 375b196b3f 合并dev-temp-castle-2412201550-44316 存在冲突 fork uat 后 copy dev 的工单类 后 再copy 44316改动的地方 10 months ago
王杰 414021eee0 44246 每件正常做完,背景变蓝,而报错时背景闪红 10 months ago
castle.zang b335bdd105 修复bug 44253 同Pisces,零件发运组/发运组明细可以实现“前道工艺”校验 10 months ago
王杰 b75199dadc 44425 当有多个线边库位的情况,电子化检验的来源库位如何获取 10 months ago
王杰 d0b86456de Merge branch 'uat-temp-castle-20241224-44242-new' into dev 10 months ago
castle.zang 29cf5385d9 设置扫描的是包装 10 months ago
王杰 5c568266d8 Merge branch 'dev-temp-castle-2412200948-44429' into dev 10 months ago
王杰 70f24a27b4 Merge branch 'uat-temp-xw-2412241000-44315' into test 10 months ago
castle.zang 2837839ff6 统一记录errorMsg 10 months ago
王杰 36468d6b0d Merge branch 'uat-temp-xw-2412241000-44315' into dev 10 months ago
王杰 314887d8cb Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 10 months ago
王杰 069890b9c5 uat-temp-xw-2412241000-44315; uat-temp-castle-20241224-44242-new 10 months ago
王杰 051f8674f9 Merge branch 'dev-temp-xw-2412201000-44315' into dev 10 months ago
xiangwei.zhang 6d5faf79cd 二次电子化初检,需要区分批次和单件 10 months ago
xiangwei.zhang 28c9d5f7b7 二次电子化初检,需要区分批次和单件 10 months ago
castle.zang 4002a1ac61 fix bug 44242 PCN:装箱防错,已经关箱的箱条码,如果重复扫描,不需要重置,可以扫描下一个需要装箱的条码 10 months ago
王杰 c54f8c7f37 Merge branch 'uat-temp-wj-241223-44507' into dev 10 months ago
王杰 3626cdb3ce 44507 发运校验,大小写校验去除、需要启用“扫描方式判断” 10 months ago
王杰 cff7de02c1 Merge branch 'dev-temp-castle-2412191916-44449' into dev 10 months ago