Commit Graph

1927 Commits (b809ff0a7c3512b40ebfdd7b96f7e23d43fcef1f)
 

Author SHA1 Message Date
jason b809ff0a7c Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into dev 2 months ago
jason 4bf1931b39 新增成都条码打印生产时间获取 2 months ago
王杰 ccd746fa64 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 3 months ago
王杰 c3bfa9dc28 工步判可疑 来源库位 代码错误 修正 3 months ago
王杰 64380a5f5a 工步判可疑 来源库位 代码错误 修正 3 months ago
jason aec8a2d3e3 Merge remote-tracking branch 'origin/uat-temp-nht-202502180000-shippingkanban' into dev 3 months ago
jason f55139b42e 修改龙兴发运看板 3 months ago
jason 982f95191a Merge remote-tracking branch 'origin/uat-temp-nht-202502270000-45335' into dev 3 months ago
jason ab6f09114a 45335 修复cockpit发运校验明细数据,扫描跳过码后,往mes_jis_shipping表写入数据问题 3 months ago
王杰 9f7aa32198 Merge branch 'test-temp-wj-45329' into dev 3 months ago
王杰 e8ec0688dc 45329 PCN:SPS物料拉动,扫描强过码后报系统异常,导致现场无法正常扫描 3 months ago
王杰 1db013d028 合并44424解决冲突 3 months ago
王杰 db21e38959 Merge branch 'uat-temp-wj-250208-44424' into test 3 months ago
王杰 653e9f192b Merge remote-tracking branch 'origin/uat-temp-nht-202502260000-customprint' into test 3 months ago
jason 17b7c10a7a 重新提交自定义打印功能,用于合并test 3 months ago
王杰 2ed8052a73 Merge remote-tracking branch 'origin/test-demp-ljs-202501181621-44904' into test 3 months ago
王杰 734b6642ba Merge branch 'test-temp-wj-2501170000-44435' into test 3 months ago
jason 84c3d427f2 完成龙兴发运看板 3 months ago
xiangwei.zhang c52f12a042 Merge branch 'dev-temp-xw-202502170000-45135' into dev 3 months ago
xiangwei.zhang 6f9f8f71cc 45135 武汉待排序总成问题 3 months ago
xiangwei.zhang 58575c43db Merge branch 'uat_temp_xw_202502100000_44424' into dev 3 months ago
xiangwei.zhang 65c13bdc8f 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 3 months ago
xiangwei.zhang c651c7ef78 Merge branch 'uat_temp_xw_202502100000_44424' into dev 3 months ago
xiangwei.zhang 8eaa0261ba 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 3 months ago
jason ff7b11e271 完成龙兴发运看板 3 months ago
jason cb50635c6c 完成龙兴发运看板 3 months ago
jason 0dc14ff147 修改龙兴发运看板 3 months ago
xiangwei.zhang 9c79411f52 Merge branch 'uat_temp_xw_202502100000_44424' into dev 3 months ago
xiangwei.zhang 68b186e431 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 3 months ago
xiangwei.zhang 42ab17b031 Merge branch 'uat_temp_xw_202502100000_44424' into dev 3 months ago
xiangwei.zhang 8b3bf424aa 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 3 months ago
臧学普 9953e8a9ac Merge remote-tracking branch 'origin/uat' into uat 3 months ago
xiangwei.zhang 203ac5a768 Merge remote-tracking branch 'origin/dev' into dev 3 months ago
jason 83ecd84119 Merge remote-tracking branch 'origin/dev-temp-nht-202502180000-customprint' into dev 3 months ago
jason ee8360f5fe 修复工步打印问题 3 months ago
jason d765e02a4b 新增龙兴发运看板 3 months ago
xiangwei.zhang 4583b5e931 Merge branch 'dev-temp-xw-202502170000-45135' into dev 3 months ago
xiangwei.zhang a276255718 45135 武汉待排序总成问题 3 months ago
xiangwei.zhang 0a8a7287dc Merge remote-tracking branch 'origin/dev' into dev 3 months ago
jason de53859b0c Merge remote-tracking branch 'origin/uat-temp-nht-2502200000-lijia-sn-print' into dev 3 months ago
jason b30a42946a 新增礼嘉标签模板打印策略 3 months ago
王杰 39bbfb44fe Merge branch 'test' into uat 3 months ago
王杰 863ef779fe Merge remote-tracking branch 'origin/uat-temp-castle-250209-kitting' into test 3 months ago
王杰 9548dc2a5b 合并工单类 冲突 3 months ago
jason b5f2a06b49 新增礼嘉条码打印策略 3 months ago
xiangwei.zhang 7027284179 Merge remote-tracking branch 'origin/dev' into dev 3 months ago
王杰 fdba01de69 裁片包装模版维护 报错提示信息修改 3 months ago
王杰 54413462d8 裁片包装模版维护 报错提示信息修改 3 months ago
王杰 26b923b3ca 合并 45034 45035 解决冲突 3 months ago
王杰 9774e051f1 合并45028 批量手动报工页面增加“过账日期”选择条件 解决冲突 3 months ago