jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 599d2280f5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-30 10:19:16 +08:00
  • e1397f4b93 Accept Merge Request #1198: (feature/修复工单bug -> develop) 禹翔辉 2024-07-30 09:25:48 +08:00
  • d49e8779f9 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/tax_sync liaodanlong 2024-07-30 09:24:48 +08:00
  • 71c606974c Merge branch 'feature/工单优化_2' into feature/修复工单bug yuxianghui 2024-07-30 09:23:24 +08:00
  • a0ed14aed1 解决 制造订单提交返工-申请重新编程-第一张工单状态不对 bug yuxianghui 2024-07-30 09:21:08 +08:00
  • be3d4979b7 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-29 17:16:46 +08:00
  • 373ce89a2c Merge branch 'feature/修复返工-cmm' into develop jinling.yang 2024-07-29 17:16:36 +08:00
  • 56317ab111 Accept Merge Request #1197: (feature/工单优化_2 -> develop) 禹翔辉 2024-07-29 17:05:01 +08:00
  • 683d79a4e3 恢复制造订单的功能刀具备注字段自动计算方法代码 yuxianghui 2024-07-29 17:03:25 +08:00
  • 362801f527 Accept Merge Request #1196: (feature/修复返工-cmm -> develop) 杨金灵 2024-07-29 16:43:46 +08:00
  • a81ad08740 修复功能刀具 jinling.yang 2024-07-29 16:43:37 +08:00
  • d2d5702125 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复返工-cmm jinling.yang 2024-07-29 16:42:13 +08:00
  • 9c47a6bdba 修复返工-cmm jinling.yang 2024-07-29 16:36:46 +08:00
  • f0a887887e Accept Merge Request #1195: (feature/工单优化_1 -> develop) 禹翔辉 2024-07-29 16:05:41 +08:00
  • fffe0a230b 1 yuxianghui 2024-07-29 15:40:44 +08:00
  • 81dbbf980c Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/tax_sync liaodanlong 2024-07-29 15:09:37 +08:00
  • 2600d15e2b Accept Merge Request #1194: (feature/工单优化_1 -> develop) 禹翔辉 2024-07-29 11:35:53 +08:00
  • c60b91c315 Merge branch 'feature/优化工单_5' into feature/工单优化_1 yuxianghui 2024-07-29 11:33:35 +08:00
  • 639dd4e78d 1、处理大批量修改cnc编程单的工单状态时，导致工单状态的自动计算方法进行递归而产生的栈溢出问题 yuxianghui 2024-07-29 11:32:33 +08:00
  • 3c4286319f Accept Merge Request #1193: (feature/优化工单_5 -> develop) 马广威 2024-07-28 16:37:33 +08:00
  • 55016918eb 1、添加工单状态自动计算方法的触发条件 yuxianghui 2024-07-28 16:35:17 +08:00
  • 4236600b39 Accept Merge Request #1192: (feature/优化工单_5 -> develop) 禹翔辉 2024-07-28 16:24:18 +08:00
  • e84842d0a3 1、功能刀具状态备注值自动计算方法优化 yuxianghui 2024-07-28 16:23:17 +08:00
  • 60df55d71e Accept Merge Request #1191: (feature/优化工单_5 -> develop) 禹翔辉 2024-07-28 16:09:23 +08:00
  • 6643684e9b Merge branch 'feature/优化工单_4' into feature/优化工单_5 yuxianghui 2024-07-28 16:06:20 +08:00
  • f77a1f6167 1、优化工单状态；2、添加功能刀具位置字段自动计算方法触发条件 yuxianghui 2024-07-28 16:05:09 +08:00
  • a467aef925 Accept Merge Request #1190: (feature/修复多次返工报依赖问题 -> develop) 杨金灵 2024-07-28 15:21:12 +08:00
  • b1b805959a 修复多次返工报依赖问题 jinling.yang 2024-07-28 15:20:12 +08:00
  • e602095b50 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-28 11:47:19 +08:00
  • 39214e5352 注释代码 jinling.yang 2024-07-28 11:47:12 +08:00
  • ba05827126 Accept Merge Request #1189: (feature/优化工单_4 -> develop) 禹翔辉 2024-07-28 10:26:42 +08:00
  • 89bd9533d7 Merge branch 'feature/优化工单_3' into feature/优化工单_4 yuxianghui 2024-07-28 10:24:32 +08:00
  • fd2228ba59 Merge branch 'feature/修复返工' into develop jinling.yang 2024-07-28 10:13:02 +08:00
  • 2758817048 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-28 10:12:45 +08:00
  • 2e916337e9 1 yuxianghui 2024-07-26 17:25:01 +08:00
  • 47b8a0051b Accept Merge Request #1188: (feature/优化制造功能 -> develop) 马广威 2024-07-26 17:24:10 +08:00
  • 76e6502afe Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-07-26 17:22:59 +08:00
  • 1b96f420ec 增加由dashboard调用的接口 mgw 2024-07-26 17:22:44 +08:00
  • 00645364b3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复返工 jinling.yang 2024-07-26 16:55:07 +08:00
  • fdad5100ae Accept Merge Request #1187: (feature/修复返工 -> develop) 杨金灵 2024-07-26 16:54:32 +08:00
  • 8cd03a1040 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复返工 jinling.yang 2024-07-26 16:53:05 +08:00
  • 41c2523201 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-26 16:52:55 +08:00
  • 22a1ae11a6 修复返工 jinling.yang 2024-07-26 16:52:48 +08:00
  • 4939c6d6db Accept Merge Request #1186: (feature/优化工单_3 -> develop) 禹翔辉 2024-07-26 16:27:58 +08:00
  • 460670843f Merge branch 'feature/优化工单_2' into feature/优化工单_3 yuxianghui 2024-07-26 16:25:54 +08:00
  • 66caeee1cd 1、优化工单状态方法 yuxianghui 2024-07-26 16:25:16 +08:00
  • 28041cbef9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-26 15:49:32 +08:00
  • 36a2bcca6e 优化表面工yi jinling.yang 2024-07-26 15:49:25 +08:00
  • fddddf1649 Accept Merge Request #1185: (feature/前端样式修改 -> develop) 黄焱 2024-07-26 15:49:22 +08:00
  • 3e61e31314 修改刀具拆解时选择目标货位会出现重叠的现象 hy 2024-07-26 15:44:52 +08:00
  • 549a64b012 Accept Merge Request #1184: (feature/优化工单_2 -> develop) 禹翔辉 2024-07-26 14:53:37 +08:00
  • dbaad85670 Merge branch 'feature/优化工单_1' into feature/优化工单_2 yuxianghui 2024-07-26 14:52:08 +08:00
  • b731ffba33 1、优化工单状态 yuxianghui 2024-07-26 14:51:23 +08:00
  • 9048b32405 Accept Merge Request #1183: (feature/优化工单_1 -> develop) 禹翔辉 2024-07-26 11:50:59 +08:00
  • 98d2aa756a 1、解决 功能刀具是无效刀时-制造订单提交返工【申请重新编程】要做成必选 yuxianghui 2024-07-26 11:49:33 +08:00
  • 3749872780 Accept Merge Request #1182: (feature/优化工单_1 -> develop) 禹翔辉 2024-07-26 10:59:05 +08:00
  • de8bebc1f9 1、添加制造订单的刀具备注字段自动计算逻辑及方法；2、优化工单状态自动计算方法； yuxianghui 2024-07-26 10:57:11 +08:00
  • b468ac216c Merge branch 'feature/修复返工bug' into develop jinling.yang 2024-07-26 09:47:14 +08:00
  • 05f5b10833 Accept Merge Request #1181: (feature/修复返工bug -> develop) 杨金灵 2024-07-26 09:46:15 +08:00
  • 8686d93651 还原注释代码 jinling.yang 2024-07-26 09:43:28 +08:00
  • 258e24eb05 修复返工bug jinling.yang 2024-07-25 17:30:33 +08:00
  • 19c4b99bae 创建制造订单后生成询价单 jinling.yang 2024-07-25 17:21:44 +08:00
  • cc4b58b136 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-25 15:44:10 +08:00
  • 33fdd0f051 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺 jinling.yang 2024-07-25 15:44:01 +08:00
  • d36250aa48 Merge branch 'feature/修复工件配送目的生产线' into develop jinling.yang 2024-07-25 15:43:13 +08:00
  • ad43b43beb Accept Merge Request #1180: (feature/修复工件配送目的生产线 -> develop) 杨金灵 2024-07-25 15:42:57 +08:00
  • f9ace6da7c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工件配送目的生产线 jinling.yang 2024-07-25 15:41:01 +08:00
  • 12b4b418ea Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-25 15:40:54 +08:00
  • 60b77e09d6 修复工件配送目的生产线 jinling.yang 2024-07-25 15:40:44 +08:00
  • 891fe257e1 Accept Merge Request #1179: (feature/修复工单cnc校验bug_3 -> develop) 禹翔辉 2024-07-25 15:31:18 +08:00
  • 6859458db2 Merge branch 'feature/修复工单cnc校验bug_2' into feature/修复工单cnc校验bug_3 yuxianghui 2024-07-25 15:29:39 +08:00
  • ca7c3867cd Accept Merge Request #1178: (release/release_2.1 -> develop) 禹翔辉 2024-07-25 15:26:45 +08:00
  • 4bcf8236ef Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-25 15:25:43 +08:00
  • 74d557a0fc Merge branch 'feature/修复返工-工件配送' into develop jinling.yang 2024-07-25 15:25:34 +08:00
  • 3686c0e070 Merge branch refs/heads/develop into refs/heads/release/release_2.1 release/release_2.1 禹翔辉 2024-07-25 15:25:07 +08:00
  • 536d7e9e79 Accept Merge Request #1177: (feature/修复返工-工件配送 -> develop) 杨金灵 2024-07-25 15:24:59 +08:00
  • 67e79c5fb8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复返工-工件配送 jinling.yang 2024-07-25 15:23:03 +08:00
  • 0c3217824e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-25 15:22:55 +08:00
  • 9eddfe36d6 修复返工-工件配送 jinling.yang 2024-07-25 15:22:48 +08:00
  • 9655281b67 1、解决 缺刀状态第一张工单状态不对 bug yuxianghui 2024-07-25 15:21:36 +08:00
  • 18b584438a 设备oee界面优化 mgw 2024-07-25 15:08:26 +08:00
  • 2deaffb4eb 添加表面工艺产品校验 jinling.yang 2024-07-25 14:07:36 +08:00
  • 709f29185d Accept Merge Request #1175: (feature/优化制造功能 -> develop) 马广威 2024-07-25 14:06:38 +08:00
  • 886de3195c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-07-25 14:05:49 +08:00
  • d9e5ffa68d 设备日志、oee优化 mgw 2024-07-25 14:05:35 +08:00
  • 8996297521 Merge branch 'refs/heads/master' into feature/tax_sync liaodanlong 2024-07-25 11:43:01 +08:00
  • 030a900580 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-25 10:39:10 +08:00
  • 0d1cb49cb7 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺 jinling.yang 2024-07-25 10:35:52 +08:00
  • 4370236edf Merge branch 'feature/修复中控对接接口' into develop jinling.yang 2024-07-25 10:35:41 +08:00
  • e01209f343 Accept Merge Request #1174: (feature/修复中控对接接口 -> develop) 杨金灵 2024-07-25 10:34:29 +08:00
  • b4803f03fa 修复制造订单完成生产数量问题 jinling.yang 2024-07-25 10:34:12 +08:00
  • c9d4f0667a 修复中控对接接口 jinling.yang 2024-07-25 10:27:07 +08:00
  • 8840e9642d Accept Merge Request #1173: (release/release_2.1 -> master) 马广威 2024-07-24 20:23:31 +08:00
  • 96c22a5d46 添加表面工艺服务产品验证 jinling.yang 2024-07-24 17:30:59 +08:00
  • 30c823189c Accept Merge Request #1172: (feature/修复更新程序 -> develop) 杨金灵 2024-07-24 17:16:28 +08:00
  • 3ed503391e 修复更新程序 jinling.yang 2024-07-24 17:10:35 +08:00
  • 121861863f 优化销售订单确认方法 jinling.yang 2024-07-24 16:57:50 +08:00
  • c2c8d63848 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺 jinling.yang 2024-07-24 16:41:19 +08:00
  • befe0c2b00 Accept Merge Request #1171: (feature/修复批量更新程序 -> develop) 杨金灵 2024-07-24 16:40:48 +08:00
  • 44a9ad340b 修复批量更新程序 jinling.yang 2024-07-24 16:39:38 +08:00