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

2000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
qihao.gong@jikimo.com
e1d6726d8b 修改库区信息方法 2024-02-23 16:41:09 +08:00
qihao.gong@jikimo.com
8b8c8ebd26 修改获取库区接口 2024-02-23 16:29:23 +08:00
qihao.gong@jikimo.com
397cae4f87 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2024-02-23 15:31:44 +08:00
qihao.gong@jikimo.com
c726bb614c 新增获取库区信息定时器 
修改库存变更接口
 2024-02-23 15:31:25 +08:00
黄焱
6fa8bfffe7 Accept Merge Request #841: (feature/前端样式修改 -> develop) 
Merge Request: 扫码RFID实时显示功能

Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/841?initial=true
 2024-02-23 15:31:04 +08:00
黄焱
a80f62c87f 扫码RFID实时显示功能 2024-02-23 15:28:30 +08:00
qihao.gong@jikimo.com
99ba2d0a4d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2024-02-23 11:58:26 +08:00
qihao.gong@jikimo.com
b045854a63 修改库位变更接口 2024-02-23 11:58:12 +08:00
马广威
f015cbb9fd Accept Merge Request #839: (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/839
 2024-02-23 11:12:11 +08:00
杨金灵
2b9c088d1d Accept Merge Request #840: (feature/修复agv接口 -> develop) 
Merge Request: 修复agv接口

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/840?initial=true
 2024-02-23 11:12:05 +08:00
jinling.yang
9ecd95faa0 1.修复质量模块的权限2.修复agv接口 2024-02-23 11:09:57 +08:00
qihao.gong@jikimo.com
7062289c89 修改工单开始 2024-02-23 10:41:28 +08:00
qihao.gong@jikimo.com
d2b80ea42c 修改工单开始接口 2024-02-23 10:32:51 +08:00
jinling.yang
39381ac5b0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-02-23 10:20:11 +08:00
jinling.yang
cc7b3ea25e Merge branch 'feature/优化后置三元检测' into develop 2024-02-23 10:19:50 +08:00
杨金灵
85a4fa49a4 Accept Merge Request #838: (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/838?initial=true
 2024-02-23 10:19:25 +08:00
jinling.yang
935b317fe6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化后置三元检测 2024-02-23 10:17:46 +08:00
jinling.yang
ad0b9983bf 1.新增检测报告链接地址字段 
2.优化rfid码扫描
3.优化工单页面
 2024-02-23 10:17:20 +08:00
龚启豪
648954faa3 Accept Merge Request #837: (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/837?initial=true
 2024-02-23 10:15:16 +08:00
qihao.gong@jikimo.com
e885d7b372 修改开始结束工单 2024-02-23 10:13:41 +08:00
龚启豪
5fcff90c01 Accept Merge Request #836: (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/836?initial=true
 2024-02-23 09:58:12 +08:00
马广威
8c4c8b0323 Accept Merge Request #835: (feature/制造代码优化 -> develop) 
Merge Request: 修改货位编码规则

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/835?initial=true
 2024-02-23 09:57:34 +08:00
mgw
f8101c2a16 修改货位编码规则 2024-02-23 09:57:02 +08:00
qihao.gong@jikimo.com
b7c64d9eb4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2024-02-23 09:56:16 +08:00
qihao.gong@jikimo.com
e456b811f2 修改工单开始结束接口 2024-02-23 09:56:01 +08:00
杨金灵
01c4e13198 Accept Merge Request #834: (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/834
 2024-02-22 19:41:54 +08:00
jinling.yang
7bf2316c09 优化接口和工单 2024-02-22 19:40:25 +08:00
杨金灵
e55f7c59e6 Accept Merge Request #833: (feature/修复日计划工单接口和http -> develop) 
Merge Request: 修复日计划工单接口和http

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/833?initial=true
 2024-02-22 18:54:15 +08:00
jinling.yang
5916b4a740 修复日计划工单接口和http 2024-02-22 18:52:36 +08:00
jinling.yang
a3f6946823 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-02-22 18:26:41 +08:00
jinling.yang
87cda7e641 Merge branch 'feature/修复日计划工单和工件预调接口' into develop 2024-02-22 18:24:54 +08:00
杨金灵
247b82e816 Accept Merge Request #832: (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/832?initial=true
 2024-02-22 18:24:31 +08:00
jinling.yang
4d745b48cf Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复日计划工单和工件预调接口 2024-02-22 18:23:14 +08:00
jinling.yang
fc2588140b 修复日计划工单和工件预调接口 2024-02-22 18:22:56 +08:00
禹翔辉
e619e6660e Accept Merge Request #831: (feature/刀具组接口18-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/831?initial=true
 2024-02-22 18:16:51 +08:00
yuxianghui
475b45b293 Merge branch 'feature/中控接口14-16优化' into feature/刀具组接口18-19优化 2024-02-22 18:14:56 +08:00
yuxianghui
3c4a2b58b1 1、优化刀具接口 2024-02-22 18:12:51 +08:00
杨金灵
a8fb541568 Accept Merge Request #830: (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/830
 2024-02-22 18:03:09 +08:00
jinling.yang
90c499f9c7 修复日计划工单 2024-02-22 18:00:16 +08:00
马广威
e6bef9d1ab Accept Merge Request #829: (feature/新增agv反馈接口 -> develop) 
Merge Request: 新增agv接口

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/829#mr-829-review-127286
 2024-02-22 17:18:31 +08:00
jinling.yang
5d22318f7d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增agv反馈接口 
# Conflicts:
#	sf_manufacturing/controllers/controllers.py
 2024-02-22 17:17:02 +08:00
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