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

2159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jinling.yang
da97fce6d5 新增agv相关接口 2024-02-22 17:16:16 +08:00
龚启豪
b34611d1b3 Accept Merge Request #828: (feature/修改机床参数bug -> 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/828?initial=true
 2024-02-22 16:55:55 +08:00
qihao.gong@jikimo.com
75e2b2fabe Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 
# Conflicts:
#	sf_manufacturing/controllers/controllers.py
 2024-02-22 16:54:15 +08:00
qihao.gong@jikimo.com
df57b33e19 修改接口 2024-02-22 16:52:48 +08:00
jinling.yang
0ca4165219 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-02-22 16:00:03 +08:00
jinling.yang
9ce4cf779b Merge branch 'feature/新增cmm程序' into develop 2024-02-22 15:58:53 +08:00
杨金灵
4ccebfac29 Accept Merge Request #827: (feature/新增cmm程序 -> develop) 
Merge Request: 新增cmm程序及接口

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/827?initial=true
 2024-02-22 15:58:35 +08:00
jinling.yang
1142400e9c 新增库位接口（启豪的代码） 2024-02-22 15:56:34 +08:00
jinling.yang
abcada8466 新增cmm程序对象及新增cmm接口 2024-02-22 15:55:35 +08:00
qihao.gong@jikimo.com
a8bedd0425 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2024-02-22 15:35:48 +08:00
jinling.yang
fe89a971a6 Merge branch 'feature/优化工件预调接口' into develop 2024-02-22 15:23:33 +08:00
jinling.yang
6df562a8ab Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工件预调接口 2024-02-22 15:20:13 +08:00
jinling.yang
c086bd03f0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-02-22 15:19:58 +08:00
jinling.yang
9e591c3813 修复工件预调接口 2024-02-22 15:18:40 +08:00
jinling.yang
0be75bc54f Merge branch 'feature/优化中控接口' into develop 2024-02-22 14:44:06 +08:00
杨金灵
d94e4469f6 Accept Merge Request #825: (feature/优化中控接口 -> 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/825
 2024-02-22 14:43:48 +08:00
jinling.yang
4b4fd649e6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化中控接口 2024-02-22 14:42:06 +08:00
jinling.yang
fad44a5413 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-02-22 14:41:47 +08:00
禹翔辉
8910b3493e Accept Merge Request #824: (feature/中控刀具接口优化 -> 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/824
 2024-02-22 14:35:44 +08:00
yuxianghui
20fe65c73c Merge branch 'feature/刀具组接口优化' into feature/中控刀具接口优化 2024-02-22 14:34:16 +08:00
qihao.gong@jikimo.com
3fe9c9e532 修改接口方法 2024-02-22 14:30:51 +08:00
yuxianghui
259d723ec9 优化刀具组接口 2024-02-22 14:30:38 +08:00
jinling.yang
0d755a50ae 优化工单相关接口 2024-02-22 14:26:56 +08:00
禹翔辉
e27f2f72bf Accept Merge Request #823: (feature/刀具组接口优化 -> 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/823
 2024-02-22 14:26:26 +08:00
yuxianghui
b6ea81d07f Merge branch 'feature/中控接口14-19优化' into feature/刀具组接口优化 2024-02-22 14:24:26 +08:00
yuxianghui
ed8cbb1f81 1、优化刀具组接口 2024-02-22 14:23:19 +08:00
jinling.yang
65b5f7f30a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-02-22 13:44:25 +08:00
杨金灵
bc30c0558d Accept Merge Request #822: (feature/修复中控接口 -> 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/822
 2024-02-22 11:56:38 +08:00
jinling.yang
8913d2f65f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复中控接口 2024-02-22 11:54:18 +08:00
jinling.yang
907f5db4e2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-02-22 11:54:01 +08:00
jinling.yang
79c6459adf 1.cnc工单新增程序文件字段2.优化获取编程单接口3.修复与中控对接的接口 2024-02-22 11:53:50 +08:00
qihao.gong@jikimo.com
87e9ecb9e2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2024-02-22 10:24:03 +08:00
禹翔辉
e5129fe55f Accept Merge Request #821: (feature/中控接口14-19优化 -> 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/821
 2024-02-22 10:20:15 +08:00
yuxianghui
5f760cf94b Merge branch 'feature/新增中控接口' into feature/中控接口14-19优化 2024-02-22 10:17:24 +08:00
yuxianghui
ce01127664 中控对接接口优化 2024-02-22 10:15:07 +08:00
jinling.yang
ef3219a098 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-02-22 09:35:37 +08:00
qihao.gong@jikimo.com
473a8ea6fe Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 
# Conflicts:
#	sf_warehouse/views/shelf_location.xml
 2024-02-21 16:40:24 +08:00
禹翔辉
8695a66e3d Accept Merge Request #820: (feature/新增中控接口 -> develop) 
Merge Request: 1、新增刀具组、机床刀具组接口，修改中控相关接口名称

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/820?initial=true
 2024-02-21 16:28:39 +08:00
yuxianghui
410b384fd6 Merge branch 'feature/中控接口优化' into feature/新增中控接口 2024-02-21 16:26:27 +08:00
qihao.gong@jikimo.com
bb321f90a5 处理库存报错bug 2024-02-21 16:26:18 +08:00
yuxianghui
51b7bcac8a 1、新增刀具组、机床刀具组接口，修改中控相关接口名称 2024-02-21 16:24:10 +08:00
马广威
36ce43cf8a Accept Merge Request #819: (feature/制造代码优化 -> develop) 
Merge Request: 修复序列号问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/819?initial=true
 2024-02-21 15:26:42 +08:00
mgw
b4538a3f9d 修复序列号问题 2024-02-21 15:25:55 +08:00
jinling.yang
af725fa363 Merge branch 'feature/优化快速订单' into develop 2024-02-21 14:54:58 +08:00
杨金灵
7d3a320893 Accept Merge Request #818: (feature/优化快速订单 -> 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/818?initial=true
 2024-02-21 14:54:40 +08:00
jinling.yang
0354f6b136 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化快速订单 2024-02-21 14:52:36 +08:00
jinling.yang
1e006b0bd7 1.工单新增rfid字段 
2.修改中控对接的工单接口
3.快速订单材料，型号，客户修改为可选择
 2024-02-21 14:52:14 +08:00
马广威
50b0204cc6 Accept Merge Request #817: (feature/制造代码优化 -> develop) 
Merge Request: 修复物流方式导致的分配工厂失败问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/817?initial=true
 2024-02-21 11:33:18 +08:00
mgw
72df0aa640 修复物流方式导致的分配工厂失败问题 2024-02-21 11:32:06 +08:00
马广威
02bf6a6764 Accept Merge Request #816: (feature/制造代码优化 -> develop) 
Merge Request: 货架货位拆分测试异常问题修复

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/816?initial=true
 2024-02-20 20:17:50 +08:00