jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

Commit Graph

  • 45c7fe23da Merge branch 'dev-temp-ljs-202501091824-44656' into dev xiangwei.zhang 2025-01-16 09:24:06 +0800
  • 6b3edf90ac 44852 MES:生产工单-需要支持排序工单的批量导入； dev-temp-xw-202501150000-44852 xiangwei.zhang 2025-01-15 21:52:56 +0800
  • bf114910e2 Merge branch 'uat-temp-wj-2501090000-44517' into test yfai-mes-ext-v2.8 王杰 2025-01-15 19:00:41 +0800
  • 585a8edc62 Merge remote-tracking branch 'origin/uat-temp-castle-2501101619-44817' into test 王杰 2025-01-15 18:59:27 +0800
  • 1c33dce687 Merge remote-tracking branch 'origin/dev-temp-xw-202501130000-44813' into test 王杰 2025-01-15 18:58:16 +0800
  • a1b3d04f30 Merge branch 'dev-temp-xw-202501150000-44838' into dev xiangwei.zhang 2025-01-15 18:27:32 +0800
  • f6b3a36560 44838 MES:裁片补片逻辑更新＆裁片报表 xiangwei.zhang 2025-01-15 18:27:00 +0800
  • 973ff08b91 Merge branch 'dev-temp-xw-202501150000-44838' into dev xiangwei.zhang 2025-01-15 18:15:13 +0800
  • 338dd627ca 44838 MES:裁片补片逻辑更新＆裁片报表 xiangwei.zhang 2025-01-15 18:13:41 +0800
  • 1815794e04 Merge branch 'dev-temp-xw-202501150000-44838' into dev xiangwei.zhang 2025-01-15 15:43:39 +0800
  • 6e756d0065 44813 PC: 缺陷类型与零件类型关系导入后，没有关联显示出来缺陷类型名称和零件类型名称 xiangwei.zhang 2025-01-15 15:30:27 +0800
  • 10131f750e 44838 MES:裁片补片逻辑更新＆裁片报表 xiangwei.zhang 2025-01-15 14:58:33 +0800
  • 082acc3901 merge origin/uat-temp-castle-2412301457-44643 解决冲突 王杰 2025-01-15 12:20:09 +0800
  • 87f42674da Merge remote-tracking branch 'origin/dev-temp-xw-202501090000-44270' into test 王杰 2025-01-15 12:16:11 +0800
  • 132f7d53d7 Merge branch 'uat-temp-wj-2501090000-44746' into test 王杰 2025-01-15 12:14:12 +0800
  • f3dd964e48 Merge remote-tracking branch 'origin/dev-temp-xw-202501071939-44728' into test 王杰 2025-01-15 12:13:30 +0800
  • d7e9810924 Merge remote-tracking branch 'origin/dev-temp-xw-202501151600-44670' into test 王杰 2025-01-15 12:12:43 +0800
  • 8e29e74429 merge dev-temp-ljs-202501091824-44656 解决冲突 王杰 2025-01-15 12:10:18 +0800
  • d8fcc8abfd 44670 PC: 模板导入时报错问题 xiangwei.zhang 2025-01-15 12:08:20 +0800
  • 471967fd7e 44756 版本回退 xiangwei.zhang 2025-01-15 12:02:04 +0800
  • 3c152132ca Merge remote-tracking branch 'origin/uat-temp-castle-2501090952-44747' into test 王杰 2025-01-15 11:35:20 +0800
  • 663f430d23 Merge branch 'dev-temp-xw-202412301219-44255' into test 王杰 2025-01-15 11:22:29 +0800
  • 5faa656bd2 Merge branch 'dev-temp-xw-202412301219-44255' into test 王杰 2025-01-15 11:21:59 +0800
  • 4f5f24f84a Merge branch 'uat-temp-wj-2412300000-44653' into test 王杰 2025-01-15 11:09:59 +0800
  • f1294f551c Merge branch 'uat-temp-wj-2412300000-44615' into test 王杰 2025-01-15 11:08:39 +0800
  • cf77b07eda Merge remote-tracking branch 'origin/dev' into dev jun 2025-01-14 12:53:55 +0800
  • e42cdd4f76 44656 报工调整报表中原因为空 测试问题修复 jun 2025-01-14 12:51:01 +0800
  • 06cb051548 Merge branch 'dev-temp-xw-202412301219-44255' into dev xiangwei.zhang 2025-01-13 19:26:53 +0800
  • 620ae11ebd 44255-优化：非排序工艺路线支持所有路线主表明细批量导入 xiangwei.zhang 2025-01-13 19:26:31 +0800
  • 732d8acea6 Merge branch 'dev-temp-xw-202501090000-44270' into dev xiangwei.zhang 2025-01-13 19:21:06 +0800
  • 6d160bfc2e Merge remote-tracking branch 'origin/dev' into dev xiangwei.zhang 2025-01-13 19:20:10 +0800
  • a16cf1e759 Merge branch 'dev-temp-xw-202501130000-44813' into dev xiangwei.zhang 2025-01-13 19:17:11 +0800
  • 6ff07cd721 44813 PC: 缺陷类型与零件类型关系导入后，没有关联显示出来缺陷类型名称和零件类型名称 xiangwei.zhang 2025-01-13 19:10:29 +0800
  • ce6e53fd72 44270 PC：非排序产品加工规则的批量导入 xiangwei.zhang 2025-01-13 19:06:17 +0800
  • f08ab29045 44656 报工调整报表中原因为空 提示信息错误 jun 2025-01-13 18:17:18 +0800
  • d283381dd5 Merge branch 'uat-temp-wj-2501090000-44517' into dev 王杰 2025-01-13 15:58:08 +0800
  • d4725e67c2 44517 装箱防错后吐条码需求（芜湖） 王杰 2025-01-13 15:57:50 +0800
  • d953cb8202 Merge branch 'uat-temp-wj-2501090000-44746' into dev 王杰 2025-01-13 13:10:40 +0800
  • 29026a1051 44746 产量统计报表增加报工调整数据查询 王杰 2025-01-13 13:10:25 +0800
  • bb794935c9 Merge branch 'uat-temp-wj-2501090000-44746' into dev 王杰 2025-01-13 12:18:56 +0800
  • c0b76c9800 44746 产量统计报表增加报工调整数据查询 王杰 2025-01-13 12:18:37 +0800
  • 10315bedcf Merge branch 'uat-temp-wj-2501090000-44746' into dev 王杰 2025-01-13 12:08:38 +0800
  • 99386ba5a0 44746 产量统计报表增加报工调整数据查询 王杰 2025-01-13 12:08:18 +0800
  • 8c6178ffbb Merge branch 'uat-temp-wj-2501090000-44517' into dev 王杰 2025-01-13 10:49:29 +0800
  • 346a5b6049 Merge remote-tracking branch 'origin/uat-temp-castle-2501101619-44817' into dev 王杰 2025-01-13 10:21:48 +0800
  • e9cc89e278 Merge remote-tracking branch 'origin/dev-temp-xw-202501090000-44270' into dev 王杰 2025-01-13 10:21:30 +0800
  • 1b61155d64 fix bug 44817 离线生成的装配件数据缺少 臧学普 2025-01-10 17:47:10 +0800
  • b6889e8bb6 Merge branch 'dev-temp-xw-202501090000-44270' into dev xiangwei.zhang 2025-01-09 20:03:27 +0800
  • 9cdc9c3b1c 44270 非排序产品加工规则的批量导入 xiangwei.zhang 2025-01-09 20:03:07 +0800
  • fc20661b2b Merge remote-tracking branch 'origin/dev' into dev xiangwei.zhang 2025-01-09 19:51:45 +0800
  • 7c92d43739 Merge branch 'uat-temp-wj-2501090000-44746' into dev 王杰 2025-01-09 19:34:57 +0800
  • 46e28e7efe 44746 产量统计报表增加报工调整数据查询 王杰 2025-01-09 19:34:23 +0800
  • ffa9deb112 revert 7831a81822 王杰 2025-01-09 19:31:00 +0800
  • 77144820fa Merge remote-tracking branch 'origin/dev-temp-ljs-202501091824-44656' into dev 王杰 2025-01-09 19:28:21 +0800
  • 0bb9335720 Merge branch 'dev-temp-xw-202501090000-44270' into dev xiangwei.zhang 2025-01-09 19:20:51 +0800
  • 42721ff26b 44270 非排序产品加工规则的批量导入 xiangwei.zhang 2025-01-09 19:20:16 +0800
  • 41c65e0c3a Merge remote-tracking branch 'origin/dev-temp-ljs-202501091824-44656' into dev 王杰 2025-01-09 18:42:18 +0800
  • 4d34673835 44656 报工调整报表中原因为空 jun 2025-01-09 18:39:02 +0800
  • 7831a81822 44746 产量统计报表增加报工调整数据查询 王杰 2025-01-09 18:37:54 +0800
  • 7a2d89eda0 44517 装箱防错后吐条码需求（芜湖） 王杰 2025-01-09 18:26:10 +0800
  • f9fcde7687 Merge remote-tracking branch 'origin/uat-temp-castle-2501090952-44747' into dev 王杰 2025-01-09 14:45:07 +0800
  • 19c2acaacb Merge branch 'dev-temp-xw-202501061909-44756' into dev 王杰 2025-01-09 14:44:14 +0800
  • 87ef87ccc9 fix bug 44747 同一个原零件对应多个PTR逻辑优化 臧学普 2025-01-09 10:17:31 +0800
  • 40d041a3cd 44670 PC: 模板导入时报错问题 xiangwei.zhang 2025-01-08 16:05:17 +0800
  • b9b38e7e4f 44756 零件生产组配置-启用Bom版本号”逻辑优化 xiangwei.zhang 2025-01-07 19:44:37 +0800
  • 822a48d1ee Merge remote-tracking branch 'origin/dev' into dev xiangwei.zhang 2025-01-07 19:43:34 +0800
  • cae71e76cc Merge branch 'dev-temp-xw-202501061909-44756' into dev xiangwei.zhang 2025-01-07 19:42:26 +0800
  • 6905574055 Merge branch 'dev-temp-xw-202501071939-44728' into dev xiangwei.zhang 2025-01-07 19:41:13 +0800
  • 5e233d6d65 44728: 包装定义明细菜单需要导入按钮 xiangwei.zhang 2025-01-07 19:40:20 +0800
  • a02631e51c 44756-零件生产组配置-“启用Bom版本号”逻辑优化 merge dev-temp-xw-202501061909-44756 解决冲突 王杰 2025-01-07 14:19:31 +0800
  • 21ceb1064d 44756 零件生产组配置-“启用Bom版本号”逻辑优化 xiangwei.zhang 2025-01-07 14:09:30 +0800
  • 486d1a4102 Merge branch 'dev-temp-xw-202412301219-44255' into dev 王杰 2025-01-07 14:04:51 +0800
  • a0b0442720 44756-零件生产组配置-“启用Bom版本号”逻辑优化 xiangwei.zhang 2025-01-06 21:02:46 +0800
  • 745048e43d 44700 沃尔沃料架主数据开发 dev-temp-xw-202501031219-44700 xiangwei.zhang 2025-01-03 15:27:41 +0800
  • c735e3068c 44255-优化：非排序工艺路线支持所有路线主表明细批量导入 xiangwei.zhang 2025-01-03 15:06:39 +0800
  • b8977cffb8 Merge branch 'uat-temp-wj-2501030000-00000' into test yfai-mes-ext-v2.7 王杰 2025-01-03 14:29:33 +0800
  • 64b892966a Merge branch 'uat-temp-wj-2501030000-00000' into dev 王杰 2025-01-03 14:29:07 +0800
  • ddecc828f7 44704 PC-批量报工和报工调整，根据生效时间和bom_code查询时，bom_code查询条件未生效 王杰 2025-01-03 14:28:46 +0800
  • 39b0a5ab24 Merge branch 'uat-temp-wj-2412300000-44653' into dev 王杰 2024-12-31 14:46:12 +0800
  • ac1971ff16 Merge remote-tracking branch 'origin/uat-temp-xw-202412311219-hotfix' into dev 王杰 2024-12-31 14:17:50 +0800
  • b75b23e6f0 44653 电子化检验输入数量支持小数点输入 王杰 2024-12-31 13:21:11 +0800
  • f3e7ec6eaf hotfix-报工工作中心不对 xiangwei.zhang 2024-12-31 11:19:35 +0800
  • 947b02ffae Merge branch 'dev-temp-xw-202412301219-44255' into dev xiangwei.zhang 2024-12-30 19:50:20 +0800
  • 191704bbae 44255-优化：非排序工艺路线支持所有路线主表明细批量导入 xiangwei.zhang 2024-12-30 19:16:16 +0800
  • 9317426969 44255-优化：非排序工艺路线支持所有路线主表明细批量导入 xiangwei.zhang 2024-12-30 18:43:43 +0800
  • 246a7d3269 合并 44615 发运明细报表增加客户订单号、发运组名称字段模糊查询 解决冲突: 使用origin/test 分支的MesWorkOrderService/MesCreateWorkOrderImpl 覆盖到dev 王杰 2024-12-30 16:42:56 +0800
  • 15066f676b merge dev-temp-castle-241223-44172 解决冲突 王杰 2024-12-30 16:24:12 +0800
  • 25893a29b5 44643 正式环境发运明细报表，条码查询条件无效 臧学普 2024-12-30 14:58:19 +0800
  • fada312113 44615 发运明细报表增加客户订单号、发运组名称字段模糊查询 王杰 2024-12-30 14:52:48 +0800
  • 49c072cc44 44615 发运明细报表增加客户订单号、发运组名称字段模糊查询 王杰 2024-12-30 14:32:55 +0800
  • 6a90f0f54d Merge remote-tracking branch 'origin/test' into test 臧学普 2024-12-28 20:45:13 +0800
  • be6816c3dd 43316 修复bomVersion启用问题 臧学普 2024-12-28 20:44:32 +0800
  • bdc5db8ea2 Merge branch 'test-temp-castle-2412271558-44316' into test 王杰 2024-12-27 19:30:30 +0800
  • 60aa5a2272 Merge branch 'test-temp-castle-2412271558-44316' into dev 王杰 2024-12-27 19:30:03 +0800
  • f5f2a4b31d 43316 修复bomVersion启用问题 臧学普 2024-12-27 18:47:35 +0800
  • c343f0bda6 合并 test-temp-castle-2412271558-44316 44316 排序工单BOM拆分逻辑更新 --- 解决冲突 王杰 2024-12-27 16:54:36 +0800
  • 62d27d7b53 Merge branch 'uat-temp-wj-2412270000-44628' into test 王杰 2024-12-27 16:50:41 +0800
  • 219353cde2 合并 test-temp-castle-2412271558-44316 44316 排序工单BOM拆分逻辑更新 --- 解决冲突 王杰 2024-12-27 16:50:27 +0800
  • 3db69d968e 合并 test-temp-castle-2412271558-44316 44316 排序工单BOM拆分逻辑更新 --- 解决冲突 王杰 2024-12-27 16:49:11 +0800
  • bc76beab75 43316 臧学普 2024-12-27 16:36:11 +0800