Commit Graph

1882 Commits (4583b5e93160f5dc715a83df064fadee7459475e)
 

Author SHA1 Message Date
xiangwei.zhang 4583b5e931 Merge branch 'dev-temp-xw-202502170000-45135' into dev 4 months ago
xiangwei.zhang a276255718 45135 武汉待排序总成问题 4 months ago
xiangwei.zhang 0a8a7287dc Merge remote-tracking branch 'origin/dev' into dev 4 months ago
jason de53859b0c Merge remote-tracking branch 'origin/uat-temp-nht-2502200000-lijia-sn-print' into dev 4 months ago
jason b30a42946a 新增礼嘉标签模板打印策略 4 months ago
jason b5f2a06b49 新增礼嘉条码打印策略 4 months ago
xiangwei.zhang 7027284179 Merge remote-tracking branch 'origin/dev' into dev 4 months ago
王杰 54413462d8 裁片包装模版维护 报错提示信息修改 4 months ago
jason 20451aafcc Merge remote-tracking branch 'origin/dev-temp-nht-202502180000-customprint' into dev 4 months ago
jason 01bdfa295b 修复自定义打印补打问题 4 months ago
xiangwei.zhang 7c0951c37b Merge branch 'uat_temp_xw_202502100000_44424' into dev 4 months ago
xiangwei.zhang cb3d4821a3 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 4 months ago
xiangwei.zhang 34eed4efe4 Merge branch 'uat_temp_xw_202502100000_44424' into dev 4 months ago
xiangwei.zhang f15bcc4d74 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 4 months ago
jason 7d44248a45 Merge remote-tracking branch 'origin/dev-temp-nht-202502180000-customprint' into dev 5 months ago
jason 0038093c07 修复自定义打印问题 5 months ago
王杰 cacbf941b3 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 5 months ago
王杰 526cdc2bb0 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 5 months ago
王杰 808f999454 打包 5 months ago
jason 0dc4d80053 修复自定义打印问题 5 months ago
臧学普 53c609b4c2 Merge branch 'uat-temp-castle-250209-kitting' into dev 5 months ago
王杰 11348964e4 45151 PCN:电子化检验操作会突然退出登录 5 months ago
王杰 d706a2ed4c 合并解决冲突 5 months ago
xiangwei.zhang 456ecfe23d Merge branch 'dev-temp-xw-202502170000-45135' into dev 5 months ago
xiangwei.zhang def2ab6318 Merge branch 'uat_temp_xw_202502100000_44424' into dev 5 months ago
xiangwei.zhang f55285ef76 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 5 months ago
xiangwei.zhang f2bc641b5f 45135 PCN:武汉待排序总成问题 5 months ago
王杰 6948872ca3 批次防错:不可用规则 作用于菜单功能中的换件 5 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
5 months ago
xiangwei.zhang 0ea05632ed 待排序发运 5 months ago
xiangwei.zhang 03d835ab7b Merge branch 'uat_temp_xw_202502100000_44424' into dev 5 months ago
xiangwei.zhang 7526830899 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 5 months ago
王杰 a005f627d8 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 5 months ago
jason 48423a2f67 新增产品二维码生成策略 5 months ago
xiangwei.zhang 0ef0cbb325 待排序发运 5 months ago
王杰 6a833dd6a3 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 5 months ago
王杰 601e1b1b05 根据读取条码生成条码工步 5 months ago
王杰 6caf273050 Mt:erge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 5 months ago
王杰 8b701a9620 打包 空指针异常修复 5 months ago
王杰 ddbc3f2978 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 5 months ago
王杰 cc84bd5b50 演示 问题修复 5 months ago
王杰 9fe72b45f9 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 5 months ago
王杰 b8ad4d5a8b 发运写入发运队列 5 months ago
王杰 d6e646c26e Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 5 months ago
王杰 b768efd78d 零件打包 缺少工单号字段值 5 months ago
王杰 70648bb380 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 5 months ago
王杰 098688f669 打包进度 5 months ago
王杰 b6940676b1 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 5 months ago
王杰 43780c26d2 电子化检验弹框提示信息 5 months ago
王杰 94c675700a 解决冲突 5 months ago