Commit Graph

587 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
王杰 07ff755b9c 匹配原料站点工步 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
jason ca33e99050 修复上料问题 3 weeks ago
王杰 842972c26c 上下文 3 weeks ago
王杰 60a35cddc1 吸塑打包适配 4 weeks ago
王杰 a8ae77b8e3 吸塑打包适配 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 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 411af468eb 常熟上料功能 1 month ago
jason 3231d46ea5 常熟上料功能 1 month ago
logic.fang e181519b04 47191 DM202504290012 龙兴工厂CKPT线排序信息拆单需求-EDI功能修改(扫描发运新增“校验是否末单”、“发送用户自定义指令至PLC点位”) 1 month ago
王杰 5d4aafd24b Merge branch 'uat-temp-wj-chongqingdaqu-prod-huaweiyun' into mes-test-merge-daxiaoxie 2 months ago
xiangwei.zhang a19b5b43b2 47023 PCN: NC报废流程相关优化设计文档[DM202505140012] 2 months ago
王杰 c31d5e44c6 合并 46881 PCN:龙兴发运看板优化 解决冲突 2 months ago
王杰 4c89c16a09 Merge remote-tracking branch 'origin/uat-temp-nht-2504300000-46708' into mes-test 2 months ago
jason beee1d6277 46881 PCN:发运看板开启多个导致CPU很高,优化查询SQL 2 months ago
王杰 7576219ed8 合并宁德发运 2 months ago
王杰 f1f8f0b68b Merge remote-tracking branch 'origin/uat-temp-nht-202505090001-46746' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415 2 months ago
王杰 373dd1e038 大小写问题 2 months ago
jason 5f88ad674a 46746 PCN:在生产控制页面增加“替换装配件”按钮,参考返工作业的“替换装配件”功能 2 months ago
王杰 ce0e486efb Merge branch 'uat-temp-wj-chongqingdaqu-prod-lijiabatchreport' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 2 months ago
王杰 8d4ac268c6 Merge branch 'uat-temp-wj-chongqingdaqu-prod-temp-46319' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 2 months ago
王杰 ce7e467540 礼嘉缝纫批量汇报 2 months ago
王杰 d8186cb52f 礼嘉缝纫批量汇报 2 months ago
jason 36918bbbfc 46708 PCN-龙兴发运看板增加折线图,和现有看板页面定时翻页显示 3 months ago
王杰 86196f23c0 合并代码 3 months ago
jason 5b4231bdc8 46499 MES-PCN: 宁德二次发运逻辑更新 3 months ago
王杰 5c6e543f8c Merge remote-tracking branch 'origin/dev_temp_xw_202504170000_45858' into uat-temp-wj-chongqingdaqu-prod-huaweiyun 3 months ago
王杰 7abfa524fd 礼嘉发运单 打印 3 months ago
xiangwei.zhang e69d160c0c Merge branch 'dev_temp_xw_202503260000_45858' into dev_temp_xw_202504170000_45858 3 months ago
xiangwei.zhang 690b21b224 45858 MES:电子化检验初判和终判批量导入 3 months ago
王杰 c623014a76 装配件匹配工步 提示信息优化 3 months ago