Commit Graph

1967 Commits (0fe38648c45b4548f332d6ff9f05d3535dbb5fe2)
 

Author SHA1 Message Date
jason 0fe38648c4 Merge branch 'uat-temp-nht-25027-chengdu' into dev 2 months ago
jason 74fd70db6f 成都新增条码生成策略,年份只格式化两位 2 months ago
xiangwei.zhang f33390859e Merge branch 'dev_temp_xw_202503120000_45558' into dev 2 months ago
xiangwei.zhang 57c54e2892 45558 PCN:排序报工job针对非排序报工时有工单和无工单需要分开处理。 2 months ago
xiangwei.zhang 242a3558a7 45558 PCN:排序报工job针对非排序报工时有工单和无工单需要分开处理。 2 months ago
jason 24e92050f8 Merge remote-tracking branch 'origin/uat-temp-nht-2503100000-45420' into dev 2 months ago
jason 9d601a3b3c 修复Bug:45420,修复批量并发操作卡控问题 2 months ago
jason b36097d061 Merge remote-tracking branch 'origin/uat-temp-nht-2503100000-45420' into dev 2 months ago
jason 9997395c46 Merge remote-tracking branch 'origin/uat-temp-nht-2503100000-45420' into uat-temp-nht-2503100000-45420 2 months ago
jason bf93405f1d 修复Bug:45420,修复批量并发操作卡控问题 2 months ago
jason 28e6f3fc1c Merge remote-tracking branch 'origin/uat-temp-nht-2503100000-45420' into dev 2 months ago
jason e024483504 修复Bug:45420,修复批量并发操作卡控问题 2 months ago
jason 5ffe3ed58a Merge remote-tracking branch 'origin/uat-temp-nht-2503110000-45556' into dev 2 months ago
jason e5d8013c66 修复Bug:45556,PCN-电子化检验、条码打印的零件查询开窗,要用unit关联 2 months ago
jason 6513564010 Merge remote-tracking branch 'origin/uat-temp-nht-2503100000-45420' into dev 2 months ago
jason a5df54bc98 修复bug:45420,操作的NC处理,2个人同时操作,产生2笔move数据。 2 months ago
jason 3848cf1545 Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into dev 2 months ago
jason 325b82d949 新增看板 2 months ago
臧学普 ed432c6fe1 Merge branch 'uat-temp-castle-2502241152-fordFetchWeb' into dev 2 months ago
臧学普 37843777b5 福特抓取网页 2 months ago
臧学普 0ed0d4e43f 福特抓取网页 2 months ago
王杰 53330ff307 Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev 2 months ago
jason eadbd49ec2 Merge remote-tracking branch 'origin/uat-temp-nht-2502140000-part-print' into dev
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/CustPartSnNumberRuleStrategyService.java
2 months ago
jason 76f10afa80 去除条码生成规则的零件条码参数卡控逻辑 2 months ago
王杰 613625ce19 代码优化 2 months ago
臧学普 8d7fed8bbc 福特抓取网页 2 months ago
王杰 8ca9f3fad1 排序推单 2 months ago
jason b809ff0a7c Merge remote-tracking branch 'origin/uat-temp-nht-25027-chengdu' into dev 2 months ago
jason 4bf1931b39 新增成都条码打印生产时间获取 2 months ago
王杰 50a78c8f08 排序推单展示组件 3 months ago
王杰 84aa53b820 Merge remote-tracking branch 'origin/uat-temp-nht-202502270000-45335' into test 3 months ago
王杰 a9cb79ff8b 排序推单 3 months ago
王杰 ccd746fa64 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 3 months ago
王杰 c3bfa9dc28 工步判可疑 来源库位 代码错误 修正 3 months ago
王杰 64380a5f5a 工步判可疑 来源库位 代码错误 修正 3 months ago
jason aec8a2d3e3 Merge remote-tracking branch 'origin/uat-temp-nht-202502180000-shippingkanban' into dev 3 months ago
jason f55139b42e 修改龙兴发运看板 3 months ago
王杰 283cc58820 发运RFID 3 months ago
jason 982f95191a Merge remote-tracking branch 'origin/uat-temp-nht-202502270000-45335' into dev 3 months ago
jason ab6f09114a 45335 修复cockpit发运校验明细数据,扫描跳过码后,往mes_jis_shipping表写入数据问题 3 months ago
王杰 9f7aa32198 Merge branch 'test-temp-wj-45329' into dev 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
jason 17b7c10a7a 重新提交自定义打印功能,用于合并test 3 months ago
王杰 2ed8052a73 Merge remote-tracking branch 'origin/test-demp-ljs-202501181621-44904' into test 3 months ago
王杰 734b6642ba Merge branch 'test-temp-wj-2501170000-44435' into test 3 months ago