Commit Graph

1948 Commits (ed432c6fe18e42c03d2e64d65ddf141b54eb4944)
 

Author SHA1 Message Date
王杰 95af0ecaca 排序推单 3 months ago
王杰 a6c556fd17 排序推单 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
jason 20451aafcc Merge remote-tracking branch 'origin/dev-temp-nht-202502180000-customprint' into dev 3 months ago
jason 01bdfa295b 修复自定义打印补打问题 3 months ago
王杰 07f55b5967 排序工单显示 优化 3 months ago
xiangwei.zhang 7c0951c37b Merge branch 'uat_temp_xw_202502100000_44424' into dev 3 months ago
xiangwei.zhang cb3d4821a3 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 3 months ago
jason 54ce53f638 新增龙兴发运看板 3 months ago
xiangwei.zhang 34eed4efe4 Merge branch 'uat_temp_xw_202502100000_44424' into dev 3 months ago
xiangwei.zhang f15bcc4d74 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 3 months ago
jason 7d44248a45 Merge remote-tracking branch 'origin/dev-temp-nht-202502180000-customprint' into dev 3 months ago
jason 0038093c07 修复自定义打印问题 3 months ago
王杰 cacbf941b3 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 3 months ago
王杰 526cdc2bb0 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 3 months ago
王杰 808f999454 打包 3 months ago
jason 0dc4d80053 修复自定义打印问题 3 months ago
臧学普 53c609b4c2 Merge branch 'uat-temp-castle-250209-kitting' into dev 3 months ago
王杰 11348964e4 45151 PCN:电子化检验操作会突然退出登录 3 months ago
王杰 d706a2ed4c 合并解决冲突 3 months ago
xiangwei.zhang 456ecfe23d Merge branch 'dev-temp-xw-202502170000-45135' into dev 3 months ago
xiangwei.zhang def2ab6318 Merge branch 'uat_temp_xw_202502100000_44424' into dev 3 months ago
xiangwei.zhang f55285ef76 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 3 months ago
xiangwei.zhang f2bc641b5f 45135 PCN:武汉待排序总成问题 3 months ago
王杰 6948872ca3 批次防错:不可用规则 作用于菜单功能中的换件 3 months ago
xiangwei.zhang 5ec10ea186 Merge branch 'dev-temp-xw-202502170000-111111' into dev
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
3 months ago
xiangwei.zhang 0ea05632ed 待排序发运 3 months ago
xiangwei.zhang 03d835ab7b Merge branch 'uat_temp_xw_202502100000_44424' into dev 3 months ago
xiangwei.zhang 7526830899 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 3 months ago
王杰 a005f627d8 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 3 months ago
jason 48423a2f67 新增产品二维码生成策略 3 months ago
jason 44a3b7c7de 新增产品二维码生成策略 3 months ago
xiangwei.zhang 0ef0cbb325 待排序发运 3 months ago
王杰 6a833dd6a3 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 3 months ago