Commit Graph

1771 Commits (5766c6eebff744ecb32ad7207db9a1d7766b316d)

Author SHA1 Message Date
xiangwei.zhang 5766c6eebf Merge branch 'uat_temp_xw_202502100000_44424' into dev
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java
3 months ago
xiangwei.zhang a5cebd3818 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 3 months ago
xiangwei.zhang 8b0ce28a1c Merge branch 'uat_temp_xw_202502100000_44424' into dev 3 months ago
xiangwei.zhang 6e290c1f42 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 3 months ago
xiangwei.zhang 62e7ef5171 Merge branch 'uat_temp_xw_202502100000_44424' into dev 3 months ago
xiangwei.zhang f34311bcef 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 3 months ago
xiangwei.zhang 07937c4239 Merge branch 'dev-temp-xw-202502050000-44881' into dev 3 months ago
xiangwei.zhang b10add6bc4 44881 MES:裁片补片逻辑更新&裁片报表 3 months ago
王杰 e3c7e1d282 Merge branch 'uat-temp-wj-250210-45015' into dev 3 months ago
王杰 21f0ed4b6c 45015 MES:SPS单据打印,拉动单上面按照库位地址升序 3 months ago
王杰 cd0c23b45d Merge branch 'uat-temp-wj-250208-manycellbug' into dev 3 months ago
王杰 9034a345ac 验证通过后切换分屏扫描框工步 系统异常 问题修复 3 months ago
王杰 3e91c6c0cb Merge branch 'uat-temp-wj-250208-44424' into dev 3 months ago
王杰 3b391c1019 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 3 months ago
王杰 8a459bea31 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 3 months ago
王杰 def94938db Merge branch 'uat-temp-wj-250208-44424' into dev 3 months ago
王杰 b46e6a6a8a 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 3 months ago
王杰 6f1fe719a0 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 3 months ago
Janson cbffd69ac3 Merge remote-tracking branch 'origin/uat-temp-nht-2502060000-44953' into dev 3 months ago
Janson 90c099d055 44953 新增条码打印模板的字段支持自定义配置 3 months ago
王杰 a5788a338a 合并解决冲突 3 months ago
王杰 1a5c2272e7 红外焊超差预警 3 months ago
xiangwei.zhang bee36e00ec Merge branch 'dev-temp-xw-202502050000-44881' into dev 3 months ago
xiangwei.zhang 4fb5c3d50b 44881 MES:裁片补片逻辑更新&裁片报表 3 months ago
xiangwei.zhang de73649c13 Merge remote-tracking branch 'origin/dev' into dev 4 months ago
xiangwei.zhang 8a55afc42c Merge branch 'uat-temp-xw-202501250000-44863' into dev 4 months ago
xiangwei.zhang 4e543f517f 44863 PCN-零件生产组增加“禁用Bom版本号”开关最终确认版逻辑优化 4 months ago
王杰 21e3ad07d4 Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 fcd7d440c5 包装补打印 4 months ago
王杰 be895cc23a Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 dca4d89330 包装补打印 4 months ago
王杰 4c8f46dd44 Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 c59e47601d 包装补打印 4 months ago
王杰 27fb491e3e Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 712a6603d9 打包 4 months ago
王杰 61f6b12119 Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 5bfed2ca8e 打包 4 months ago
王杰 6f5b1e5de0 Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 bc39704375 打包 4 months ago
王杰 ba025d2f01 Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 32b9447a35 打包 4 months ago
王杰 941b979c49 Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 17818f5ea2 打包 4 months ago
王杰 b75e9198d9 revert c9e1ee1024
revert 打包
4 months ago
王杰 c9e1ee1024 打包 4 months ago
王杰 3b060d3496 Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 91fbdbed6a 打包 4 months ago
王杰 ebdb79e7bc Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 d8fd96cf28 Merge branch 'uat-temp-wj-250122-44937' into dev 4 months ago
王杰 548ba84f08 44937 PCN:批量手动报工页面,排序方式按照工单号升序 4 months ago