jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,184 Commits 134 Branches 0 Tags
f639e59b9105adb2ad895b795bcb0e2c57a15e0f
Commit Graph

2184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yuxianghui
690c388143 解决刀具物料搜索的计算字段数据问题； 2024-02-26 11:39:25 +08:00
jinling.yang
dbdc2e1238 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-02-23 19:49:55 +08:00
马广威
6c98ea7781 Accept Merge Request #855: (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/855#mr-855-review-127671
 2024-02-23 18:38:45 +08:00
qihao.gong@jikimo.com
85f4d01cee 修改库位变更接口 2024-02-23 18:33:35 +08:00
马广威
33b456d991 Accept Merge Request #854: (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/854#mr-854-review-127659
 2024-02-23 18:20:34 +08:00
qihao.gong@jikimo.com
8c8aa63b3a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2024-02-23 18:15:45 +08:00
qihao.gong@jikimo.com
5e97f0ef2d 修改库位变更接口 2024-02-23 18:15:28 +08:00
禹翔辉
a255155b4d Accept Merge Request #853: (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/853
 2024-02-23 17:35:45 +08:00
yuxianghui
97165a0a82 Merge branch 'feature/刀具组接口18-19优化' into feature/中控接口优化1 
# Conflicts:
#	sf_warehouse/models/model.py
 2024-02-23 17:33:32 +08:00
yuxianghui
db48ef396e 1、优化中控接口14-16 2024-02-23 17:29:04 +08:00
马广威
1cd05f53b1 Accept Merge Request #852: (feature/ftp添加新的注释 -> develop) 
Merge Request: ftp添加新的注释

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/852#mr-852-review-127619
 2024-02-23 17:26:33 +08:00
jinling.yang
e126b812b6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-02-23 17:25:08 +08:00
jinling.yang
4fcbf57e97 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-02-23 17:24:58 +08:00
jinling.yang
6b2608e419 ftp添加新的注释 2024-02-23 17:24:46 +08:00
马广威
9c1365f45e Accept Merge Request #851: (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/851#mr-851-review-127615
 2024-02-23 17:21:32 +08:00
qihao.gong@jikimo.com
acf99d3e05 修改库存信息接口 2024-02-23 17:20:25 +08:00
jinling.yang
73ee29246f Merge branch 'feature/ftp添加输出' into develop 2024-02-23 16:51:08 +08:00
jinling.yang
73e4106dc9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/ftp添加输出 2024-02-23 16:50:25 +08:00
马广威
96cdc2aba8 Accept Merge Request #850: (feature/ftp添加输出 -> develop) 
Merge Request: ftp添加输出

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/850
 2024-02-23 16:48:02 +08:00
马广威
342ff9e025 Accept Merge Request #849: (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/849#mr-849-review-127596
 2024-02-23 16:47:40 +08:00
jinling.yang
c2ad923581 ftp添加输出 2024-02-23 16:46:52 +08:00
qihao.gong@jikimo.com
6a7cff656b 修改库位信息接口 2024-02-23 16:46:30 +08:00
龚启豪
7a00108852 Accept Merge Request #848: (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/848?initial=true
 2024-02-23 16:42:53 +08:00
qihao.gong@jikimo.com
e1d6726d8b 修改库区信息方法 2024-02-23 16:41:09 +08:00
杨金灵
dcd0f5f892 Accept Merge Request #847: (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/847?initial=true
 2024-02-23 16:33:21 +08:00
龚启豪
40fdc1f804 Accept Merge Request #846: (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/846
 2024-02-23 16:33:19 +08:00
jinling.yang
33e88eb9cc 修复质检接口 2024-02-23 16:31:56 +08:00
qihao.gong@jikimo.com
8b8c8ebd26 修改获取库区接口 2024-02-23 16:29:23 +08:00
杨金灵
bfe7005962 Accept Merge Request #845: (feature/优化ftp -> develop) 
Merge Request: 优化ftp

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/845?initial=true
 2024-02-23 16:18:57 +08:00
jinling.yang
45fa6931d7 新增下拉检测文件 2024-02-23 16:16:49 +08:00
杨金灵
6f82feddeb Accept Merge Request #844: (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/844?initial=true
 2024-02-23 16:03:32 +08:00
jinling.yang
998900955d 修复质检接口 2024-02-23 16:01:19 +08:00
龚启豪
1c2b50a343 Accept Merge Request #843: (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/843?initial=true
 2024-02-23 15:34:37 +08:00
杨金灵
49d77c736e Accept Merge Request #842: (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/842
 2024-02-23 15:33:59 +08:00
jinling.yang
6711543567 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化检测文件 2024-02-23 15:33:24 +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
jinling.yang
2e62915b41 通过质检接口的质检文件路径获取 2024-02-23 15:29:21 +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