Commit Graph

2196 Commits (83a5e9ae3514dcabcb6d2339a2059aad6caa6656)
 

Author SHA1 Message Date
王杰 ad4a948e0c Merge remote-tracking branch 'origin/dev-temp-xw-202502170000-45135' into test 4 months ago
王杰 470aff1fd6 45573 PCN-打印方法:customFieldPrintStrategy 修复没有打印出八位年月日的日期 4 months ago
王杰 033319d59f Merge remote-tracking branch 'origin/dev_temp_xw_202503120000_45558' into uat-temp-wj-chongqingdaqu-dev-bak 4 months ago
王杰 c7c99cbe77 Merge remote-tracking branch 'origin/dev_temp_xw_202503120000_45558' into test 4 months ago
王杰 b6fa6e7922 Merge remote-tracking branch 'origin/dev_temp_xw202503020000_45316' into uat-temp-wj-chongqingdaqu-dev-bak 4 months ago
王杰 22a4892215 Merge remote-tracking branch 'origin/dev_temp_xw202503020000_45316' into test 4 months ago
王杰 ae921145f4 Merge remote-tracking branch 'origin/dev_temp_xw_202503100000_45411' into uat-temp-wj-chongqingdaqu-dev-bak 4 months ago
王杰 e662f73c69 Merge remote-tracking branch 'origin/dev_temp_xw_202503100000_45411' into test 4 months ago
王杰 29ee1aed93 龙兴排序平行工位 4 months ago
王杰 fbd6b0cea5 生产线开班只允许开个班组 4 months ago
王杰 4c811b0c9b 礼嘉工位零件打印配置 4 months ago
王杰 8f7a6ad150 非排序打印 增加打印机配置, 是否取物料的打印机 4 months ago
王杰 8080df155a 深汕工单 4 months ago
王杰 d36ada5454 rfid 匹配工步 不用 去掉特殊字符进行比对 4 months ago
王杰 7c42d15787 rfid 匹配工步 不用 去掉特殊字符进行比对 4 months ago
王杰 a07ebfb545 深汕工单 4 months ago
王杰 ab96cf0c6a 龙兴发运单 4 months ago
王杰 de0d2f188e 深汕工单验证 4 months ago
jason 743e215893 Merge branch 'uat-temp-nht-2503130000-chengdu-shipping' into uat-temp-wj-chongqingdaqu-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-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
4 months ago
jason a8568af626 成都发运代码提交 4 months ago
王杰 e2b2f1ce05 排序发运打印 龙兴 4 months ago
王杰 af973db0c1 深汕工单验证 4 months ago
jason 1d689e8075 成都发运,临时提交 4 months ago
王杰 0d73181b92 龙兴发运单 4 months ago
王杰 72076ac0a9 龙兴发运单 4 months ago
王杰 8cdb942b89 发运打印 4 months ago
王杰 804b34cd56 pcn发运单打印 4 months ago
王杰 7a4a4db923 pcn 发运单打印 4 months ago
jason ab2a49e0c8 成都发运,临时提交 4 months ago
王杰 fc1c59a8c6 推单 4 months ago
王杰 f8dcad0633 深汕工单 4 months ago
jason 40ae22240f 成都发运,临时提交 4 months ago
王杰 6ebbed58bc 深汕工单验证 4 months ago
王杰 a2972fac11 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 4 months ago
王杰 b48a13fd26 Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev-temp-logic-20250313-45623' into uat-temp-wj-chongqingdaqu-prod 4 months ago
logic.fang 41a2096367 45623 PCN-龙兴装配目视单模板取值调整-新增龙兴方法 4 months ago
logic.fang 7477087af8 Revert "45623 PCN-龙兴装配目视单模板取值调整"
This reverts commit dca737d9c8.
4 months ago
王杰 3137abbfa9 推单 4 months ago
王杰 bc1bb87025 推单 4 months ago
王杰 7ed7b181e6 Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into uat-temp-wj-chongqingdaqu-prod 4 months ago
jason 74fd70db6f 成都新增条码生成策略,年份只格式化两位 4 months ago
logic.fang dca737d9c8 45623 PCN-龙兴装配目视单模板取值调整 4 months ago
xiangwei.zhang 57c54e2892 45558 PCN:排序报工job针对非排序报工时有工单和无工单需要分开处理。 4 months ago
xiangwei.zhang 242a3558a7 45558 PCN:排序报工job针对非排序报工时有工单和无工单需要分开处理。 4 months ago
王杰 a7676fa89e Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 4 months ago
王杰 a562648201 Merge remote-tracking branch 'origin/uat-temp-nht-2503110000-45555' into uat-temp-wj-chongqingdaqu-prod 4 months ago
王杰 7960bc7b22 推单 4 months ago
jason dffc97d764 修复Bug:45555,修复写入队列状态改为创建 4 months ago
王杰 31cad1bc26 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 4 months ago
王杰 3f72d858e3 推单 4 months ago