jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,613 Commits 134 Branches 31 Tags
0d253c54c8b1a8455975464293896c506615bf7c
Commit Graph

847 Commits

Author SHA1 Message Date
禹翔辉
0d253c54c8 Accept Merge Request #1272: (feature/工单优化_1 -> develop) 
Merge Request: 优化工单

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1272
 2024-08-29 18:19:22 +08:00
yuxianghui
d2c5fdb509 优化工单 2024-08-29 18:18:19 +08:00
mgw
778896a670 修复验证代码 2024-08-29 17:52:56 +08:00
yuxianghui
b8f8e90444 Merge branch 'feature/刀具组装扫码优化' into feature/工单工序排序方法优化 2024-08-29 17:31:39 +08:00
yuxianghui
ea94d74657 优化工单工序排序方法 2024-08-29 17:30:54 +08:00
jinling.yang
8ead5655cf 修复外协采购 2024-08-29 15:23:28 +08:00
jinling.yang
e154f5b763 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工单 
# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py
 2024-08-29 14:22:50 +08:00
jinling.yang
804bdb60e8 修复外协采购单 2024-08-29 14:21:18 +08:00
mgw
0e672aef79 修复装夹判断逻辑 2024-08-28 18:07:34 +08:00
mgw
efe98b5133 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 2024-08-28 17:42:38 +08:00
mgw
2d2abfce25 修改提示词 2024-08-28 17:42:23 +08:00
jinling.yang
821a7a63be 优化工单 2024-08-28 17:30:46 +08:00
廖丹龙
de221ba67e Accept Merge Request #1263: (feature/tax_sync -> develop) 
Merge Request: 多面工艺排程问题

Created By: @廖丹龙
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1263
 2024-08-28 14:55:40 +08:00
liaodanlong
c5bb9a32d0 多面工艺排程问题 2024-08-28 14:50:39 +08:00
jinling.yang
aa96e63fff 修复报废-时间 2024-08-27 16:58:32 +08:00
jinling.yang
83d45b6d3f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废-坯料序列号 2024-08-27 16:13:06 +08:00
jinling.yang
35c13dc51c 修复报废-坯料序列号 2024-08-27 16:12:48 +08:00
liaodanlong
e49362e2e3 Merge branch 'refs/heads/develop' into feature/tax_sync 2024-08-27 14:04:13 +08:00
liaodanlong
d5b5231873 多面加工工单排程优化 2024-08-27 14:03:41 +08:00
jinling.yang
a3357e01aa Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺排序 
# Conflicts:
#	sf_manufacturing/models/stock.py
#	sf_mrs_connect/controllers/controllers.py
 2024-08-27 11:34:39 +08:00
jinling.yang
2931d6a92d 去掉不要的代码 2024-08-27 11:32:16 +08:00
jinling.yang
5e6ae1ff55 去掉设置token代码 2024-08-27 11:29:17 +08:00
jinling.yang
d7a0dc578b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废 
# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py
 2024-08-27 11:27:42 +08:00
jinling.yang
b40a87df88 修复报废 2024-08-27 11:24:04 +08:00
胡尧
72e9443048 Accept Merge Request #1251: (feature/agv_dispatch -> develop) 
Merge Request: 修复工件配送后没有同步任务下发时间的bug，AGV配置中增加是否下发AGV任务

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1251?initial=true
 2024-08-27 10:43:44 +08:00
胡尧
c6f6927d57 修复工件配送后没有同步任务下发时间的bug，AGV配置中增加是否下发AGV任务 2024-08-27 10:42:24 +08:00
胡尧
361f187026 Accept Merge Request #1249: (feature/agv_dispatch -> develop) 
Merge Request: 修改人工报价流程

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1249
 2024-08-27 09:23:50 +08:00
胡尧
b35f444e49 修改人工报价流程 2024-08-27 09:23:18 +08:00
mgw
93ca2000a1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 2024-08-27 08:56:13 +08:00
胡尧
ca43aa836e Accept Merge Request #1247: (feature/agv_dispatch -> develop) 
Merge Request: 修改人工报价流程

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1247?initial=true
 2024-08-27 08:55:15 +08:00
胡尧
937ea42af3 修改人工报价流程 2024-08-27 08:54:33 +08:00
jinling.yang
9b957848c2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废 2024-08-27 08:53:29 +08:00
jinling.yang
e662490cb5 修复报废 2024-08-26 17:31:14 +08:00
mgw
e1a4784092 增加设备oee数据 2024-08-26 17:20:46 +08:00
mgw
78d00e9157 修复coding问题，增加机床类型返回 2024-08-26 13:23:44 +08:00
jinling.yang
f1780181fa 修复报废向导 2024-08-25 17:36:07 +08:00
jinling.yang
6c0b84ec43 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废 2024-08-25 14:58:57 +08:00
jinling.yang
3e438a10ee 优化表面工艺排序 2024-08-25 14:58:40 +08:00
jinling.yang
9218633a5e 优化表面工艺 2024-08-23 17:32:35 +08:00
jinling.yang
7fee98cdee 修复报废 2024-08-23 16:13:03 +08:00
mgw
296659ebb0 增加异常明细 2024-08-23 11:44:05 +08:00
mgw
f17ff2bc57 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 2024-08-23 10:05:30 +08:00
mgw
5df3de7dcd 增加返工数量等 2024-08-23 10:05:17 +08:00
胡尧
b37738fbc3 Accept Merge Request #1240: (feature/agv_dispatch -> develop) 
Merge Request: 屏蔽下发agv小车任务

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1240?initial=true
 2024-08-22 15:57:49 +08:00
胡尧
79f3dce0ec 屏蔽下发agv小车任务 2024-08-22 15:57:17 +08:00
胡尧
4b87ea3f0e Accept Merge Request #1239: (feature/agv_dispatch -> develop) 
Merge Request: 修改下发agv任务逻辑

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1239?initial=true
 2024-08-22 15:43:01 +08:00
胡尧
098ac0e7e9 修改下发agv任务逻辑 2024-08-22 15:42:34 +08:00
jinling.yang
536c766272 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废-拣货单（sfp） 2024-08-22 10:52:38 +08:00
jinling.yang
d13961ff5f 修复报废-拣货单（sfp） 2024-08-22 10:52:19 +08:00
胡尧
5dc392a27b Accept Merge Request #1235: (feature/agv_dispatch -> develop) 
Merge Request: 修复配送完成修改工件配送单的bug

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1235
 2024-08-21 20:19:13 +08:00