Commit Graph

1797 Commits (4742fb158320ac96da75bd1aff5fa115da60e277)
 

Author SHA1 Message Date
jason 4742fb1583 修复bug:45560,根据发运组编码进行配置匹配。 2 months ago
王杰 7d1d6149fc Merge remote-tracking branch 'origin/uat-temp-castle-2502241152-fordFetchWeb' 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
logic.fang ca85a6f637 Merge remote-tracking branch 'refs/remotes/origin/uat-temp-logic-20250307-45527' 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/MesPartShippingGroupService.java
2 months ago
臧学普 d42f88d77a 福特抓取网页增加分页 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 5dd7bb7eee 45550 PDA-MES-PDA发运扫描排序方式修改(序号提示优化) 2 months ago
王杰 486ed45033 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 1afc3574d8 发运RFI去特殊字符 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
王杰 228aa76db7 推单 2 months ago
王杰 98311a5c2d 设备加工参数【排序】发送异常问题修复 2 months ago
王杰 17ec31db78 设备加工参数【排序】发送异常问题修复 2 months ago
王杰 0819b960e2 排序推单 2 months ago
logic.fang 2592f341fe 45527 礼嘉福特发运单打印-优化 2 months ago
logic.fang a53f97b8a0 45527 礼嘉福特发运单打印 2 months ago
王杰 0cf312c04e Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 346f8a7bac 推单 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
王杰 512c06b5dc 龙兴 排序客户条码打印策略 2 months ago
臧学普 37843777b5 福特抓取网页 2 months ago
臧学普 0ed0d4e43f 福特抓取网页 2 months ago
王杰 e6e061967b 重庆大区 2 months ago
王杰 aeea38b898 Merge remote-tracking branch 'origin/uat-temp-nht-250226-lijia' into uat-temp-wj-chongqingdaqu 2 months ago
王杰 ef97dbd871 Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into uat-temp-wj-chongqingdaqu 2 months ago
王杰 d72950b3a3 Merge remote-tracking branch 'origin/uat-temp-wj-lijia-prod' into uat-temp-wj-chongqingdaqu 2 months ago
王杰 613625ce19 代码优化 2 months ago
臧学普 8d7fed8bbc 福特抓取网页 2 months ago
王杰 8ca9f3fad1 排序推单 2 months ago
jason 4bf1931b39 新增成都条码打印生产时间获取 2 months ago
王杰 50a78c8f08 排序推单展示组件 3 months ago
王杰 a9cb79ff8b 排序推单 3 months ago
jason 23c9eb8c3f 修改礼嘉条码打印包含时分秒的生产日期为条码的创建时间 3 months ago
jason ff3cd4e496 修改礼嘉条码打印包含时分秒的生产日期为条码的创建时间 3 months ago
王杰 25e4d011fe Merge branch 'uat' into uat-temp-wj-lijia-prod 3 months ago
王杰 7036e0f1b4 礼嘉 从重庆分支中单独拉取 根据读条码生成条码工步 3 months ago
王杰 64380a5f5a 工步判可疑 来源库位 代码错误 修正 3 months ago
jason 47233e04c4 修复礼嘉条码打印策略丢失问题 3 months ago
王杰 283cc58820 发运RFID 3 months ago
王杰 e8ec0688dc 45329 PCN:SPS物料拉动,扫描强过码后报系统异常,导致现场无法正常扫描 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