Commit Graph

1808 Commits (0f0694e1168f7c09f444704a3c2dd9fdbc3aea47)

Author SHA1 Message Date
王杰 0f0694e116 Merge branch 'uat' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 bc68293588 Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 5a0a850499 Merge branch 'uat-temp-wj-shenshanorder' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 1ec300a921 空腔码 bug 在重庆大区改 ,成都工厂尝鲜bug 2 months ago
王杰 b8431e3ec4 合并解决冲突 2 months ago
王杰 8ad85034e9 Merge remote-tracking branch 'origin/uat-temp-logic-20250307-45527' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 25e8681d3f 推单 2 months ago
logic.fang 5f0eb647af 45527 礼嘉福特发运单打印-assyCode排序优化 2 months ago
王杰 6b3145bbaa 合并 uat-temp-nht-2502140000-part-print 解决冲突 2 months ago
王杰 fdc82c4da0 Merge remote-tracking branch 'origin/uat_temp_castle_250213_44248' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 123cac3d14 Merge remote-tracking branch 'origin/uat-temp-wj-250208-manycellbug' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 e232ab0992 推单 2 months ago
王杰 60858c597a 推单 2 months ago
王杰 0a4e306a06 推单 2 months ago
王杰 0c1f4a1545 推单 2 months ago
王杰 46a3ea1bd8 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 7caad41035 推单 2 months ago
王杰 309a7ab848 Merge branch 'uat-temp-wj-chongqingdaqu-prod' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 7b04194349 Merge remote-tracking branch 'origin/uat-temp-nht-202502180000-shippingkanban' into uat-temp-wj-chongqingdaqu-prod 2 months ago
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
王杰 4668055c23 推单 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
jason 325b82d949 新增看板 2 months ago
王杰 512c06b5dc 龙兴 排序客户条码打印策略 2 months ago
臧学普 37843777b5 福特抓取网页 2 months ago
臧学普 0ed0d4e43f 福特抓取网页 2 months ago
王杰 e6e061967b 重庆大区 2 months ago
jason 76f10afa80 去除条码生成规则的零件条码参数卡控逻辑 2 months ago