Commit Graph

2300 Commits (mes-uat-changshu0609)
 

Author SHA1 Message Date
puxiao fa97952dde Merge branch 'mes-uat-changshu0609' of https://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into mes-uat-changshu0609 3 days ago
puxiao 54998f9c0e Finish Task#6617 智慧内饰&出风口条码规则需求 3 days ago
王杰 4c1416968c Merge remote-tracking branch 'origin/uat-temp-nht-2506120000-jialiao' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 5 days ago
jason 9f1f07649d 容器绑定条码扫描容器条码,明细数量自动变化问题 5 days ago
jason 4f72b2b291 自动化线接口 5 days ago
王杰 cb3476ce44 常熟容器主条码场景问题修复 5 days ago
王杰 c4f5f32963 Merge remote-tracking branch 'origin/uat-temp-nht-2506120000-jialiao' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 6 days ago
jason 1152ff0aeb 自动化线接口 6 days ago
王杰 431c38f550 Merge remote-tracking branch 'origin/uat-temp-nht-2506120000-jialiao' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 6 days ago
jason 5042cd6750 自动化线接口 6 days ago
jason 49056e59d3 Merge remote-tracking branch 'origin/mes-uat-changshu0609-temp-wj-250616-xisu' into uat-temp-nht-2506120000-jialiao
# Conflicts:
#	modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
6 days ago
jason 39922d0bd2 自动化线接口 6 days ago
王杰 360d200a48 常熟 6 days ago
王杰 2a1c27f06d 常熟 7 days ago
jason 8b7f9d3b00 自动喷胶问题修复 1 week ago
jason 7e993be18b 自动喷胶问题修复 1 week ago
王杰 c0e5324006 Merge branch 'mes-uat-changshu0609' into mes-uat-changshu0609-temp-wj-250616-xisu 1 week ago
王杰 4a3de5c315 Merge branch 'mes-uat' into mes-uat-changshu0609 1 week ago
jason fa1b1c1ece 修改芜湖PCN打印获取客户零件号 1 week ago
jason ac46763de1 调配原料演示问题修复 1 week ago
jason a9cd69ee86 调配原料演示问题修复 1 week ago
jason c77004ef62 每模统计自动喷胶量 2 weeks ago
王杰 07ff755b9c 匹配原料站点工步 2 weeks ago
jason e382826800 工步调配原料功能 2 weeks ago
jason 56e9bc09e2 工步调配原料功能 2 weeks ago
jason 1b22d0a8bc 工步调配原料功能 2 weeks ago
jason 3a1a45777c 工步调配原料功能 2 weeks ago
jason afdae0a8d2 工步调配原料功能 2 weeks ago
王杰 e78bbc0740 不可用规则代码错误 修复 3 weeks ago
王杰 fbea1bb2f3 临时提交 3 weeks ago
puxiao 83a5e9ae35 Merge branch 'mes-uat-changshu0609' of https://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into mes-uat-changshu0609 3 weeks ago
puxiao 8cb969b30a Finish Task#6617 智慧内饰&出风口条码规则需求 3 weeks ago
王杰 c173d3749f Merge branch 'mes-uat-changshu0609' into mes-uat-changshu0609-temp-wj-250616-xisu 3 weeks ago
王杰 b42af31686 Merge branch 'mes-uat' into mes-uat-changshu0609 3 weeks ago
王杰 88bd632347 成都标签 注释信息 3 weeks ago
王杰 ce75150d14 龙兴75jph问题修复 3 weeks ago
王杰 c180720114 吸塑扣料装配件 3 weeks ago
jason ca33e99050 修复上料问题 3 weeks ago
王杰 38cc443854 Merge branch 'mes-uat-changshu0609-temp-wj-250616-xisu' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 3 weeks ago
王杰 742b9f435f Merge remote-tracking branch 'origin/uat-temp-nht-2506120000-jialiao' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 3 weeks ago
王杰 1fc4f406c8 吸塑 3 weeks ago
jason 963c87f432 Merge remote-tracking branch 'origin/mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht' into uat-temp-nht-2506120000-jialiao 3 weeks ago
jason f8ca56f0fa 修复上料问题 3 weeks ago
jason 499158e9d4 修复上料问题 3 weeks ago
jason 9dcc1c9346 修复上料问题 3 weeks ago
王杰 be76e6420c Merge remote-tracking branch 'origin/uat-temp-nht-2506120000-jialiao' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 3 weeks ago
jason 0846f9e96b 修复上料问题 3 weeks ago
jason 999d5d02a2 修复上料问题 3 weeks ago
jason e5c437b997 修复上料问题 3 weeks ago
puxiao e9a6bcbc25 Revert "Finish Task#6617 智慧内饰&出风口条码规则需求"
This reverts commit afe4a0e2
3 weeks ago