Commit Graph

510 Commits (804b34cd5639d57b269e5c7789295a351a4fbfb4)

Author SHA1 Message Date
王杰 804b34cd56 pcn发运单打印 2 months ago
王杰 7a4a4db923 pcn 发运单打印 2 months ago
王杰 a2972fac11 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 3137abbfa9 推单 2 months ago
王杰 7b04194349 Merge remote-tracking branch 'origin/uat-temp-nht-202502180000-shippingkanban' into uat-temp-wj-chongqingdaqu-prod 2 months ago
jason c64c73971f Merge remote-tracking branch 'origin/uat-temp-nht-2502110000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
2 months ago
jason 6216692e39 Merge remote-tracking branch 'origin/uat-temp-logic-20250309-45550' into uat-temp-nht-2502110000-chongqing-step
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
2 months ago
jason 7ac587c05f Merge remote-tracking branch 'origin/uat-temp-logic-20250307-45527' into uat-temp-nht-2502110000-chongqing-step 2 months ago
jason 0c6e965bf0 修复bug:45560,增加系统参数配置MES_SHIPPING_QUEUE_SAVE_CFG,发运组配置后写入mes_shipping_queue,没有配置则不写入。 2 months ago
logic.fang d9c2b6c8b1 45550 PDA-MES-PDA发运扫描排序方式修改 2 months ago
王杰 9dfff1db6e Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 4cbaf37b13 发运RFID 2 months ago
王杰 0819b960e2 排序推单 2 months ago
王杰 ef30d1db83 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 7b5ffeb7d4 推单 2 months ago
王杰 e6e061967b 重庆大区 2 months ago
王杰 8ca9f3fad1 排序推单 3 months ago
jason 4bf1931b39 新增成都条码打印生产时间获取 3 months ago
王杰 50a78c8f08 排序推单展示组件 3 months ago
王杰 b5a9e63d0a Merge branch 'uat-temp-wj-250208-44424' into uat-temp-wj-2502060000-chongqing-step 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
王杰 cae8f9af41 排序推单 3 months ago
jason 17b7c10a7a 重新提交自定义打印功能,用于合并test 3 months ago
王杰 734b6642ba Merge branch 'test-temp-wj-2501170000-44435' into test 3 months ago
王杰 14dba4b720 排序推单 3 months ago
jason 84c3d427f2 完成龙兴发运看板 3 months ago
王杰 933eef1adb 排序推单 3 months ago
jason 0dc14ff147 修改龙兴发运看板 3 months ago
王杰 a6c556fd17 排序推单 3 months ago
jason d765e02a4b 新增龙兴发运看板 3 months ago
jason 54ce53f638 新增龙兴发运看板 3 months ago
王杰 b768efd78d 零件打包 缺少工单号字段值 3 months ago
王杰 28078b3a74 45028 批量手动报工页面增加“过账日期”选择条件 - 二次修改, 发现了其他代码BUG: 超工单情况下改工单状态完成 不生效; 超工单报错情况下会偶发缓存问题导致篡改DB的工单信息 3 months ago
王杰 4721c5e1ba 批次防错 3 months ago
王杰 4241dcd230 shipping rfid 3 months ago
xiangwei.zhang f34311bcef 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 3 months ago
王杰 6f1fe719a0 44424 PCN:工单判可疑的码,扫描工单检验通过后,在扫描装配件工步时扫描判可疑码,工单标记为可疑 3 months ago
王杰 3967b7acfd merge 红外焊超差预警 解决冲突 3 months ago
王杰 1a5c2272e7 红外焊超差预警 3 months ago
王杰 17818f5ea2 打包 4 months ago
王杰 bd4f18ed84 重庆打包 4 months ago
王杰 1f6fe5e4a0 零件打包 4 months ago
王杰 6892759782 44435 PCN:排序下线条码打印配置follow Pisces 4 months ago
王杰 0c74c405de 重庆打包 4 months ago
王杰 14939ea2e5 Merge branch 'uat-temp-wj-2501090000-44517' into test 4 months ago
王杰 a8ee0646d0 Merge branch 'uat-temp-wj-2412300000-44653' into test 4 months ago
王杰 f9c6b5e81b 44517 装箱防错后吐条码需求(芜湖) 4 months ago
王杰 4a9dabfbf3 44517 装箱防错后吐条码需求(芜湖) 4 months ago