Commit Graph

1855 Commits (fc1c59a8c61ec56c76c58055dc001346127cc286)
 

Author SHA1 Message Date
王杰 fc1c59a8c6 推单 2 months ago
王杰 a2972fac11 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 b48a13fd26 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250313-45623' into uat-temp-wj-chongqingdaqu-prod 2 months ago
logic.fang 41a2096367 45623 PCN-龙兴装配目视单模板取值调整-新增龙兴方法 2 months ago
logic.fang 7477087af8 Revert "45623 PCN-龙兴装配目视单模板取值调整"
This reverts commit dca737d9c8.
2 months ago
王杰 3137abbfa9 推单 2 months ago
王杰 bc1bb87025 推单 2 months ago
王杰 7ed7b181e6 Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into uat-temp-wj-chongqingdaqu-prod 2 months ago
jason 74fd70db6f 成都新增条码生成策略,年份只格式化两位 2 months ago
logic.fang dca737d9c8 45623 PCN-龙兴装配目视单模板取值调整 2 months ago
王杰 a7676fa89e Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 a562648201 Merge remote-tracking branch 'origin/uat-temp-nht-2503110000-45555' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 7960bc7b22 推单 2 months ago
jason dffc97d764 修复Bug:45555,修复写入队列状态改为创建 2 months ago
王杰 31cad1bc26 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 3f72d858e3 推单 2 months ago
王杰 71a7a18e7c Merge remote-tracking branch 'origin/uat-temp-nht-2503110000-45555' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 6731579689 解决冲突 2 months ago
王杰 0ef4d6834e 代码占位符写错 修复 2 months ago
王杰 0f0694e116 Merge branch 'uat' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 43ff4c7863 合并 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
jason f3f739e8e2 修复Bug45555,零件发运组,扫描确认零件方式增加“扫描目视单”枚举,实现扫描目视单发运校验方式 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
王杰 32f69d61fd pom 2 months ago
王杰 7caad41035 推单 2 months ago
王杰 78e353f0ad 修改pom 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