Commit Graph

543 Commits (mes-uat-changshu0609)

Author SHA1 Message Date
王杰 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 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 常熟 1 week ago
jason ac46763de1 调配原料演示问题修复 2 weeks ago
jason a9cd69ee86 调配原料演示问题修复 2 weeks ago
王杰 07ff755b9c 匹配原料站点工步 2 weeks ago
jason 1b22d0a8bc 工步调配原料功能 2 weeks ago
jason 3a1a45777c 工步调配原料功能 2 weeks ago
王杰 fbea1bb2f3 临时提交 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
王杰 1fc4f406c8 吸塑 3 weeks ago
jason e5c437b997 修复上料问题 3 weeks ago
王杰 0a5d7976c8 Merge remote-tracking branch 'origin/mes-uat-temp-logic-20250529-47241' into mes-test 3 weeks ago
jason 8331a33cc7 Merge remote-tracking branch 'origin/mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht' into uat-temp-nht-2506120000-jialiao 4 weeks ago
jason 2c07545ad5 修复上料问题 4 weeks ago
王杰 6d2c010b38 Merge branch 'mes-uat-changshu0609-temp-wj-250616-xisu' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 4 weeks ago
王杰 48d0c74aa8 吸塑 4 weeks ago
王杰 c814ce98fa Merge branch 'mes-uat-changshu0609-temp-wj-250616-xisu' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 4 weeks ago
王杰 5a385d72d0 吸塑 4 weeks ago
王杰 1ebc9037bc 吸塑扣减装配件工步 4 weeks ago
王杰 6184690b17 吸塑扣减装配件工步 4 weeks ago
王杰 657978ff63 吸塑 合并 上料 4 weeks ago
王杰 12ca15bb36 吸塑 4 weeks ago
jason 42ef11c53c 修改工步上料 4 weeks ago
jason f51eb189e3 Merge branch 'uat-temp-nht-2506240000-step-feeding' into uat-temp-nht-2506120000-jialiao 4 weeks ago
jason 6c1e758399 工步上料 4 weeks ago
王杰 619a3d72b5 容器扣减匹配装配件站点工步 4 weeks ago
王杰 a6a28ab4fb 容器扣减匹配装配件站点工步 4 weeks ago
jason 6fdba66cfb 常熟站点绑定功能 4 weeks ago
jason 7acf815e9b Merge remote-tracking branch 'origin/mes-uat-changshu0609-temp-logic-20250613-3533' into uat-temp-nht-2506120000-jialiao 1 month ago
jason 49cee1361f 常熟上料功能 1 month ago
xiangwei.zhang 6233a5f31a 大包套小包逻辑 1 month ago
xiangwei.zhang ce178a01ef 大包套小包逻辑 1 month ago
logic.fang 9f0b69405c 47700 MES-PCN:站点容器绑定问题汇总:(优化) 1 month ago
logic.fang 1a60f3cdca 47700 MES-PCN:站点容器绑定问题汇总: 1 month ago
xiangwei.zhang 5aa5c776af 大包套小包逻辑 1 month ago
jason 3231d46ea5 常熟上料功能 1 month ago
王杰 9bc0945a11 temp commit 1 month ago
logic.fang 8c3a6b9f10 3533 主数据表设计与开发(容器条码与站点关系表-接口变更) 1 month ago
logic.fang 7886c85e1c 3533 主数据表设计与开发(容器条码与站点关系表) 1 month ago
王杰 5d4aafd24b Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun' into mes-test-merge-daxiaoxie 2 months ago
logic.fang 7cc05f616f 47241 PCN:赛力斯jis队列接收和赛力斯JIS单接收,增加取消订单按钮,按钮需要权限管控 2 months ago
xiangwei.zhang a19b5b43b2 47023 PCN: NC报废流程相关优化设计文档[DM202505140012] 2 months ago
王杰 352221cceb Merge branch 'mes-uat-temp-47040' into mes-test 2 months ago
王杰 e3d5501b05 合并46894 MES PCN: 吉翔下线条码,客户零件号优先取客户待开票物料 uat-temp-nht202505120000-46757 2 months ago
王杰 ce4fce0b7f Merge remote-tracking branch 'origin/uat-temp-nht-2505200000-47042' into mes-test 2 months ago
王杰 888275dd6b 选择产成零件按钮 2 months ago