puxiao.liao
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity

Commit Graph

  • fa97952dde Merge branch 'mes-uat-changshu0609' of https://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into mes-uat-changshu0609 mes-uat-changshu0609 puxiao 2025-07-19 15:02:45 +0800
  • 54998f9c0e Finish Task#6617 智慧内饰&出风口条码规则需求 puxiao 2025-07-19 15:02:24 +0800
  • 4c1416968c Merge remote-tracking branch 'origin/uat-temp-nht-2506120000-jialiao' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 王杰 2025-07-17 11:48:43 +0800
  • 9f1f07649d 容器绑定条码扫描容器条码，明细数量自动变化问题 jason 2025-07-17 11:29:00 +0800
  • 4f72b2b291 自动化线接口 jason 2025-07-17 10:49:50 +0800
  • cb3476ce44 常熟容器主条码场景问题修复 王杰 2025-07-17 09:25:05 +0800
  • c4f5f32963 Merge remote-tracking branch 'origin/uat-temp-nht-2506120000-jialiao' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 王杰 2025-07-16 14:02:29 +0800
  • 1152ff0aeb 自动化线接口 jason 2025-07-16 14:01:37 +0800
  • 431c38f550 Merge remote-tracking branch 'origin/uat-temp-nht-2506120000-jialiao' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 王杰 2025-07-16 13:59:34 +0800
  • 5042cd6750 自动化线接口 jason 2025-07-16 13:54:08 +0800
  • 49056e59d3 Merge remote-tracking branch 'origin/mes-uat-changshu0609-temp-wj-250616-xisu' into uat-temp-nht-2506120000-jialiao jason 2025-07-16 13:38:47 +0800
  • 39922d0bd2 自动化线接口 jason 2025-07-16 13:35:38 +0800
  • 360d200a48 常熟 王杰 2025-07-16 13:25:55 +0800
  • 2a1c27f06d 常熟 王杰 2025-07-15 13:17:08 +0800
  • 8b7f9d3b00 自动喷胶问题修复 jason 2025-07-14 16:16:49 +0800
  • 7e993be18b 自动喷胶问题修复 jason 2025-07-14 14:16:59 +0800
  • c0e5324006 Merge branch 'mes-uat-changshu0609' into mes-uat-changshu0609-temp-wj-250616-xisu 王杰 2025-07-13 08:29:23 +0800
  • 4a3de5c315 Merge branch 'mes-uat' into mes-uat-changshu0609 王杰 2025-07-13 08:28:36 +0800
  • fa1b1c1ece 修改芜湖PCN打印获取客户零件号 jason 2025-07-11 19:25:58 +0800
  • ac46763de1 调配原料演示问题修复 jason 2025-07-11 18:06:25 +0800
  • a9cd69ee86 调配原料演示问题修复 jason 2025-07-11 15:52:44 +0800
  • c77004ef62 每模统计自动喷胶量 jason 2025-07-11 10:18:23 +0800
  • 07ff755b9c 匹配原料站点工步 王杰 2025-07-11 06:59:24 +0800
  • e382826800 工步调配原料功能 jason 2025-07-08 19:53:59 +0800
  • 56e9bc09e2 工步调配原料功能 jason 2025-07-08 16:06:27 +0800
  • 1b22d0a8bc 工步调配原料功能 jason 2025-07-07 18:28:54 +0800
  • 3a1a45777c 工步调配原料功能 jason 2025-07-07 14:41:11 +0800
  • afdae0a8d2 工步调配原料功能 jason 2025-07-07 09:20:44 +0800
  • e78bbc0740 不可用规则代码错误 修复 王杰 2025-07-03 23:28:09 +0800
  • fbea1bb2f3 临时提交 王杰 2025-07-03 23:08:12 +0800
  • 83a5e9ae35 Merge branch 'mes-uat-changshu0609' of https://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into mes-uat-changshu0609 puxiao 2025-07-03 13:23:57 +0800
  • 8cb969b30a Finish Task#6617 智慧内饰&出风口条码规则需求 puxiao 2025-07-03 13:23:38 +0800
  • c173d3749f Merge branch 'mes-uat-changshu0609' into mes-uat-changshu0609-temp-wj-250616-xisu 王杰 2025-07-02 20:01:32 +0800
  • b42af31686 Merge branch 'mes-uat' into mes-uat-changshu0609 王杰 2025-07-02 20:01:00 +0800
  • 88bd632347 成都标签 注释信息 王杰 2025-07-02 19:59:35 +0800
  • ce75150d14 龙兴75jph问题修复 王杰 2025-07-02 19:56:12 +0800
  • c180720114 吸塑扣料装配件 王杰 2025-07-02 17:48:53 +0800
  • ca33e99050 修复上料问题 jason 2025-07-02 17:13:07 +0800
  • 38cc443854 Merge branch 'mes-uat-changshu0609-temp-wj-250616-xisu' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 王杰 2025-07-02 15:16:34 +0800
  • 742b9f435f Merge remote-tracking branch 'origin/uat-temp-nht-2506120000-jialiao' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 王杰 2025-07-02 15:16:14 +0800
  • 1fc4f406c8 吸塑 王杰 2025-07-02 15:15:46 +0800
  • 963c87f432 Merge remote-tracking branch 'origin/mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht' into uat-temp-nht-2506120000-jialiao jason 2025-07-02 14:13:06 +0800
  • f8ca56f0fa 修复上料问题 jason 2025-07-02 14:12:12 +0800
  • 499158e9d4 修复上料问题 jason 2025-07-02 10:53:18 +0800
  • 9dcc1c9346 修复上料问题 jason 2025-07-02 10:25:17 +0800
  • be76e6420c Merge remote-tracking branch 'origin/uat-temp-nht-2506120000-jialiao' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 王杰 2025-07-02 09:43:14 +0800
  • 0846f9e96b 修复上料问题 jason 2025-07-02 09:36:14 +0800
  • 999d5d02a2 修复上料问题 jason 2025-07-01 21:54:03 +0800
  • e5c437b997 修复上料问题 jason 2025-07-01 16:49:48 +0800
  • e9a6bcbc25 Revert "Finish Task#6617 智慧内饰&出风口条码规则需求" puxiao 2025-07-01 15:28:14 +0800
  • e2d09dcbb7 Merge remote-tracking branch 'origin/mes-uat-temp-logic-20250609-47191' into mes-test mes-test 王杰 2025-07-01 15:08:12 +0800
  • 0a5d7976c8 Merge remote-tracking branch 'origin/mes-uat-temp-logic-20250529-47241' into mes-test 王杰 2025-07-01 15:07:21 +0800
  • afe4a0e2c1 Finish Task#6617 智慧内饰&出风口条码规则需求 puxiao 2025-07-01 15:00:06 +0800
  • 0003a83af8 spotbugs问题修复 spotbugs-0630 jason 2025-07-01 10:41:41 +0800
  • 78b29e3638 Merge branch 'mes-uat-changshu0609-temp-wj-250616-xisu' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 王杰 2025-06-30 11:18:03 +0800
  • e3331fdada Merge remote-tracking branch 'origin/uat-temp-nht-2506120000-jialiao' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 王杰 2025-06-30 11:17:51 +0800
  • 842972c26c 上下文 mes-uat-changshu0609-temp-wj-250616-xisu 王杰 2025-06-30 11:07:32 +0800
  • 491aef044b 修复上料问题 uat-temp-nht-2506120000-jialiao jason 2025-06-30 10:30:26 +0800
  • fec628c575 容器匹配 王杰 2025-06-29 23:47:49 +0800
  • 0dd4b784f0 容器扣减 提示信息错误 修正 王杰 2025-06-27 22:43:47 +0800
  • f6a46b4b94 Merge remote-tracking branch 'origin/uat-temp-nht-2506120000-jialiao' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 王杰 2025-06-27 20:49:46 +0800
  • 71d155577f Merge branch 'mes-uat-changshu0609-temp-wj-250616-xisu' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 王杰 2025-06-27 20:49:36 +0800
  • f5e14e1e27 吸塑打包 问题修复 list转linkedList 王杰 2025-06-27 20:49:15 +0800
  • 892e331ef2 修复上料问题 jason 2025-06-27 19:42:25 +0800
  • 092fc29899 Merge remote-tracking branch 'origin/uat-temp-nht-2506120000-jialiao' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 王杰 2025-06-27 17:03:06 +0800
  • 93a2743b15 修复上料问题 jason 2025-06-27 17:01:11 +0800
  • 5a630bf141 Merge remote-tracking branch 'origin/uat-temp-nht-2506120000-jialiao' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 王杰 2025-06-27 16:49:03 +0800
  • 60a35cddc1 吸塑打包适配 王杰 2025-06-27 16:42:28 +0800
  • a8ae77b8e3 吸塑打包适配 王杰 2025-06-27 15:56:58 +0800
  • 8331a33cc7 Merge remote-tracking branch 'origin/mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht' into uat-temp-nht-2506120000-jialiao jason 2025-06-26 19:41:34 +0800
  • 2c07545ad5 修复上料问题 jason 2025-06-26 19:41:08 +0800
  • dc36612fe9 Merge branch 'mes-uat-changshu0609-temp-wj-250616-xisu' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 王杰 2025-06-26 19:38:53 +0800
  • 9c36c5a298 吸塑 王杰 2025-06-26 19:38:34 +0800
  • 5f09777ada Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46824' into mes-dev mes-dev jason 2025-06-26 18:35:30 +0800
  • 5a6d034d07 修复总成回退加工记录软删问题 dev_temp_xw_202505150000_46824 jason 2025-06-26 18:34:39 +0800
  • 6d2c010b38 Merge branch 'mes-uat-changshu0609-temp-wj-250616-xisu' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 王杰 2025-06-26 16:32:48 +0800
  • 48d0c74aa8 吸塑 王杰 2025-06-26 16:32:02 +0800
  • 755c9a6d19 Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46824' into mes-dev jason 2025-06-26 14:59:25 +0800
  • 6846c57bbc Merge remote-tracking branch 'origin/uat-temp-nht-2506120000-jialiao' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 王杰 2025-06-26 11:48:14 +0800
  • c814ce98fa Merge branch 'mes-uat-changshu0609-temp-wj-250616-xisu' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 王杰 2025-06-26 11:47:04 +0800
  • 5a385d72d0 吸塑 王杰 2025-06-26 11:46:12 +0800
  • a90b8d16c3 修复上料问题 jason 2025-06-26 11:12:34 +0800
  • 1f4821052c 修复总成回退加工记录软删问题 jason 2025-06-26 11:10:54 +0800
  • ffeb7bfdff Merge branch 'refs/heads/mes-uat-temp-logic-20250609-47191' into mes-dev logic.fang 2025-06-26 10:38:11 +0800
  • a57f3e7cb5 47191 DM202504290012 龙兴工厂CKPT线排序信息拆单需求-EDI功能修改（扫描发运新增“校验是否末单”、“发送用户自定义指令至PLC点位”-优化） mes-uat-temp-logic-20250609-47191 logic.fang 2025-06-26 10:37:23 +0800
  • 1ebc9037bc 吸塑扣减装配件工步 王杰 2025-06-25 21:40:47 +0800
  • 6184690b17 吸塑扣减装配件工步 王杰 2025-06-25 21:39:39 +0800
  • 13ea542a77 修复上料问题 jason 2025-06-25 19:51:42 +0800
  • d20a066740 吸塑 王杰 2025-06-25 16:06:27 +0800
  • c95658c378 Merge branch 'mes-uat-changshu0609-temp-wj-250616-xisu' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht 王杰 2025-06-25 15:15:08 +0800
  • 03d7044219 吸塑 合并 上料 王杰 2025-06-25 15:14:40 +0800
  • 657978ff63 吸塑 合并 上料 王杰 2025-06-25 14:15:04 +0800
  • 12ca15bb36 吸塑 王杰 2025-06-25 14:05:27 +0800
  • 42ef11c53c 修改工步上料 jason 2025-06-25 13:59:37 +0800
  • f51eb189e3 Merge branch 'uat-temp-nht-2506240000-step-feeding' into uat-temp-nht-2506120000-jialiao jason 2025-06-25 01:51:07 +0800
  • 6c1e758399 工步上料 jason 2025-06-25 01:49:05 +0800
  • 16f94f85f1 Merge branch 'dev_temp_xw_20250624_ncdev' into mes-dev xiangwei.zhang 2025-06-24 17:12:15 +0800
  • 51d56e8e70 Merge branch 'dev_temp_xw_202506090000_47023' into dev_temp_xw_20250624_ncdev dev_temp_xw_20250624_ncdev xiangwei.zhang 2025-06-24 17:08:27 +0800
  • e2d9af5960 Merge branch 'dev_temp_xw_202505150000_46824' into dev_temp_xw_20250624_ncdev xiangwei.zhang 2025-06-24 17:03:26 +0800
  • cedb437b4e 弹框输入工单数量 王杰 2025-06-24 15:13:18 +0800