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

537 Commits

Author SHA1 Message Date
jinling.yang
d4c786ff1e 1.选择规则，带出对应型号图片 2024-03-18 14:46:49 +08:00
jinling.yang
1a702512e5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化坯料和修复质量标准 2024-03-15 17:00:05 +08:00
jinling.yang
d5a1a82c72 1.优化分配工厂时材料型号获取方式为采购和外协时未有供应商返回提示 
2.修复质量标准去掉审核按钮显示
 2024-03-15 16:59:51 +08:00
马广威
5e3aff31e0 Accept Merge Request #903: (feature/制造代码优化 -> develop) 
Merge Request: 待排程状态隐藏tab页

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/903?initial=true
 2024-03-15 16:03:24 +08:00
mgw
d1eba51f61 待排程状态隐藏tab页 2024-03-15 16:02:54 +08:00
jinling.yang
4765e34c09 1.优化表面工艺可选参数 
2.修复质量警报质量总监没有制造订单访问权限
 2024-03-15 10:48:01 +08:00
jinling.yang
9120ebe6f7 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复部分bug 2024-03-14 15:46:03 +08:00
jinling.yang
02f1805505 修复部分bug 2024-03-14 15:45:40 +08:00
mgw
70218f29ac Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 
# Conflicts:
#	zpl_print/models/common.py
 2024-03-14 14:24:26 +08:00
mgw
59677c0304 修改zpl相关等 2024-03-14 14:22:50 +08:00
jinling.yang
86ec97bad1 修复刀具产品模版 2024-03-14 11:54:10 +08:00
jinling.yang
5e0b4aa509 优化产品页面 2024-03-13 17:34:35 +08:00
jinling.yang
0c44bba5f2 优化刀具产品 2024-03-12 17:32:40 +08:00
jinling.yang
0289e2f9ff Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化agv接口 2024-03-11 17:30:46 +08:00
jinling.yang
b24355dd67 1.优化产品页面 
2.优化agv回调接口且新增agv参数配置
3.优化工件配送
 2024-03-11 17:30:32 +08:00
马广威
e3b8b0a43d Accept Merge Request #891: (feature/制造代码优化 -> develop) 
Merge Request: 修改工单显隐控制逻辑，优化代码

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/891?initial=true
 2024-03-11 11:26:19 +08:00
mgw
8a800e909f 修改工单显隐控制逻辑 2024-03-11 10:56:03 +08:00
mgw
0f2e6b165c 因接口触发按钮，无法触发按钮切换事件。经沟通，暂时隐藏手动触发开始等按钮的功能。 2024-03-08 21:46:26 +08:00
马广威
f2213bd5f4 Accept Merge Request #885: (feature/制造代码优化 -> develop) 
Merge Request: 修改工单状态

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/885?initial=true
 2024-03-05 11:37:56 +08:00
mgw
fcbe33714e 修改工单状态 2024-03-05 11:37:21 +08:00
yuxianghui
dceaf7fe8d Merge branch 'feature/刀具添加归档功能' into feature/功能优化 2024-03-04 17:13:42 +08:00
yuxianghui
9d2bad977c 1、产品模型的产品类别字段添加必填标记；2、制造订单的工单添加RFID码(已解除)字段，当工单解除装夹时保存RFID码到RFID码(已解除)字段进行展示；3、功能刀具列表的当前位置字段改为Selection类型，并优化自动计算功能刀具当前位置的方法；4、获取机床刀库信息时，对新装刀的功能刀具进行库存位移刀制造前(机内刀库)；5、优化功能刀具组装时扫码自动录入RFID码功能； 2024-03-04 17:10:41 +08:00
mgw
3c0649392e 优化代码 2024-03-04 11:52:04 +08:00
mgw
ec54c8e014 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 2024-03-04 09:45:55 +08:00
mgw
b7be5251b8 处理采购订单按钮展示的问题 2024-03-04 09:45:19 +08:00
qihao.gong@jikimo.com
7e4a3251c8 增加必填标识 2024-03-01 15:43:03 +08:00
jinling.yang
51c6b7ef9b 修复日计划工单接口 2024-02-29 17:16:27 +08:00
jinling.yang
abdc522f9f 修复分配工厂创建订单和质检接口 2024-02-29 14:42:10 +08:00
jinling.yang
d270eaefd0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复质检接口 2024-02-29 10:35:38 +08:00
jinling.yang
5dd89d3afc 修复质检接口 2024-02-29 10:34:18 +08:00
马广威
556e6ba261 Accept Merge Request #872: (feature/修改机床参数bug -> develop) 
Merge Request: 修改设备oee自动生成，设备刀库编码规则

Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/872#mr-872-review-128778
 2024-02-28 17:15:56 +08:00
qihao.gong@jikimo.com
75354c67db 修改设备oee自动生成，设备刀库编码规则 2024-02-28 17:14:42 +08:00
yuxianghui
17b167f1de Merge branch 'feature/必填字段添加红星样式' into feature/刀具物料序列号优化 2024-02-28 16:53:43 +08:00
yuxianghui
6937d59b9f 1、优化采购刀具物料时刀具物料的序列号生成规则 2024-02-28 16:52:27 +08:00
jinling.yang
c89f3623f6 修复质检接口 2024-02-28 16:45:50 +08:00
jinling.yang
7d96963b60 修复cnc程序排序 2024-02-28 16:03:26 +08:00
jinling.yang
0538763059 1.修复及优化质检接口2.质量检查新增检测报告和检测结果2个字段 2024-02-28 15:53:46 +08:00
黄焱
f2c8bd7333 修改*样式，增加扫码枪判断 2024-02-27 17:57:00 +08:00
mgw
586216fa01 代码优化 2024-02-27 17:33:08 +08:00
mgw
27c83f7d3c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 2024-02-27 15:49:34 +08:00
mgw
fdddf19d13 增加中控接口返回对工单、计划单属性的改变（状态，时间等） 2024-02-27 11:42:59 +08:00
龚启豪
d684dfe8d0 Accept Merge Request #862: (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/862?initial=true
 2024-02-27 10:52:51 +08:00
qihao.gong@jikimo.com
e22e4801c1 修改工单布局 2024-02-27 10:51:50 +08:00
yuxianghui
7f50a3f1d3 Merge branch 'feature/刀具物料搜索计算方法优化' into feature/工单rfid解绑 2024-02-26 17:19:45 +08:00
yuxianghui
c9825805db 1、解除装夹工单时解除RFID码和工单的绑定关系 2024-02-26 17:10:34 +08:00
jinling.yang
2a39320fc3 优化获取cnc程序的判断条件 2024-02-26 16:37:54 +08:00
jinling.yang
267667b3f5 优化cnc程序， 2024-02-26 16:34:26 +08:00
qihao.gong@jikimo.com
85f4d01cee 修改库位变更接口 2024-02-23 18:33:35 +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