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

2359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
禹翔辉
7897e6e55b Accept Merge Request #948: (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/948
 2024-04-17 15:02:52 +08:00
yuxianghui
259f12a11f Merge branch 'feature/功能刀具组装流程测试及优化' into feature/功能刀具组装流程优化完成 2024-04-17 14:57:39 +08:00
yuxianghui
c6b1c5e047 1、删除功能刀具列表模型的刀具名称计算方法，改为创建记录时给数据；2、功能刀具组装单弹窗添加根据旧刀具名称自动选择新刀具的名称；优化没有序列号的刀具物料的库存位移方法，并在刀具物料出库同时货位物料数减一；关闭弹窗创建刀具组、功能刀具名称记录功能； 2024-04-17 14:55:45 +08:00
杨金灵
38c89a4167 Accept Merge Request #947: (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/947?initial=true
 2024-04-17 14:21:49 +08:00
jinling.yang
59683790b7 优化页面展示 2024-04-17 14:19:38 +08:00
jinling.yang
f04cbac8d9 1.去掉上色和特征识别方法, 
2.转换模型需自动识别模型长宽高
3.优化页面：下拉框关闭创建
4.权限修改为不可编辑
 2024-04-17 13:19:07 +08:00
yuxianghui
36db60812e Merge branch 'feature/功能刀具组装优化' into feature/功能刀具组装流程测试及优化 2024-04-16 17:23:55 +08:00
yuxianghui
3c47553be6 1、添加销售总监和采购总监对夹具的可读权限；2、工单的tree视图添加制造订单字段 2024-04-16 17:22:16 +08:00
jinling.yang
c535808d5f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-04-16 16:22:50 +08:00
马广威
d1e9254996 Accept Merge Request #946: (feature/制造代码优化 -> develop) 
Merge Request: 修改测点位置匹配，优化错误抛出方式

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/946?initial=true
 2024-04-15 21:15:28 +08:00
mgw
028eb18dd8 修改测点位置匹配，优化错误抛出方式 2024-04-15 21:14:12 +08:00
黄焱
c4ddd067e7 Accept Merge Request #945: (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/945?initial=true
 2024-04-15 17:22:01 +08:00
黄焱
48cba4274b 修改因添加表格必填而出现报错问题 2024-04-15 17:04:43 +08:00
mgw
9df62129b7 控制按钮显隐逻辑 2024-04-15 13:39:58 +08:00
马广威
65330b083b Accept Merge Request #944: (feature/制造代码优化 -> develop) 
Merge Request: 前置三次元检测数据读取功能初步完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/944?initial=true
 2024-04-15 11:40:57 +08:00
mgw
543f1a8e9b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 2024-04-15 11:39:35 +08:00
mgw
19156f5944 优化代码健壮性，解决部分硬编码问题 2024-04-15 11:39:10 +08:00
mgw
9ac3ef7c93 前置三次元检测数据读取 2024-04-15 11:16:33 +08:00
禹翔辉
3f9eb762f9 Accept Merge Request #943: (feature/刀具定时同步到cloud -> develop) 
Merge Request: 添加刀具信息定时同步到cloud功能

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/943?initial=true
 2024-04-15 10:25:15 +08:00
yuxianghui
ef0e09ba4b 1、优化没有刀具信息记录时同步报错问题 2024-04-15 10:22:19 +08:00
yuxianghui
eb2db1dfdd 1、添加定时同步刀具物料和功能刀具相关的信息到cloud的功能；2、添加同步所以刀具物料和所以功能刀具相关记录同步接口； 2024-04-12 17:30:59 +08:00
yuxianghui
180db6b91e 1、调整功能刀具清单模型的菜单代码位置，解决依赖冲突问题；2、产品采购时，添加一个订单同时采购多个相同产品的校验；3、优化刀柄采购入库时，自动生成的序列号规则； 2024-04-12 16:15:02 +08:00
yuxianghui
482dbb9baa Merge branch 'feature/优化组装单模型' into feature/功能刀具组装优化 2024-04-12 10:22:26 +08:00
yuxianghui
4391a4e145 1、功能刀具清单模型添加功能刀具名称重名检验，2、功能刀具安全库存模型添加根据所选功能刀具名称自动带出类型、刀具组、直径、R角信息；3、优化刀具物料搜索模型，物料数量字段改为存储字段，根据对应产品的各个位置的库存数量自动计算刀具物料的总数等值； 2024-04-11 17:34:15 +08:00
yuxianghui
010fbb23b0 1、优化工单扫描绑定托盘的验证条件，只有在工单已完成时不能再扫描绑定托盘；2、优化中控的刀具组接口，改为传输功能刀具清单的刀具组数据；3、优化功能刀具组装单模型的刀柄信息，删除刀柄货位字段，添加刀柄Rfid字段，根据货位带出刀柄信息改为根据序列号带出；5、优化功能刀具组装单弹窗，删除刀柄货位字段添加刀柄Rfid字段，删除刀柄的扫货位录入信息的代码；夹头货位改为非必填；添加组装后刀具组字段，添加根据所选的功能刀具名称，自动带出功能刀具的类型、刀具组、直径、刀尖R角、最大寿命值、总长度、伸出长、避空长信息，且可修改；6、优化调整功能刀具组装单弹窗的布局； 2024-04-11 15:11:50 +08:00
yuxianghui
7f6444cc89 1、优化功能刀具组装模型，重构刀具物料的组成结构；2、优化刀具物料查询模型，重构刀具物流库存统计方法；3、优化功能刀具组装流程，重构刀具物料出库方法；4、重构扫码录入刀具物料数据方法；5、优化功能刀具列表模型； 2024-04-10 17:32:35 +08:00
马广威
b5767970a4 Accept Merge Request #942: (feature/制造代码优化 -> develop) 
Merge Request: 开完库存处新增需求基本完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/942?initial=true
 2024-04-09 20:43:57 +08:00
mgw
422e4bda6c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 
# Conflicts:
#	sf_warehouse/models/model.py
 2024-04-09 20:42:15 +08:00
马广威
29790b7760 Accept Merge Request #941: (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/941#mr-941-review-140567
 2024-04-09 20:16:09 +08:00
mgw
310a2de34f 开完库存处新增需求基本完成 2024-04-09 20:14:44 +08:00
yuxianghui
12a54d1f2a Merge branch 'feature/新增功能刀具清单' into feature/优化组装单模型 2024-04-09 17:29:13 +08:00
yuxianghui
f19a1a282a 1、优化扫描录入刀具物料方法， 2024-04-09 17:27:37 +08:00
jinling.yang
cc7a72d6f4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-04-09 17:25:16 +08:00
jinling.yang
1681e9e4da Merge branch 'feature/修复刀具物料同步' into develop 2024-04-09 17:24:55 +08:00
杨金灵
cf3514e407 Accept Merge Request #940: (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/940?initial=true
 2024-04-09 17:24:36 +08:00
jinling.yang
abdb636176 1.补充agv优化代码 
2.修复刀具物料同步
 2024-04-09 17:10:53 +08:00
yuxianghui
85649daef6 1、功能刀具清单模型添加功能刀具类型、加工材料、寿命字段；2、删除供应商的地址和email必填；3、优化功能刀具组装单模型，新增五种物料的货位字段，修改继承关系，添加根据货位获取刀具物料信息功能； 2024-04-09 16:53:15 +08:00
jinling.yang
8eee9d9173 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/new 2024-04-09 16:47:56 +08:00
jinling.yang
c104ecf24b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-04-09 16:47:12 +08:00
mgw
961b4f8e2d 库存需求修改1 2024-04-09 15:21:47 +08:00
yuxianghui
0a4c86f601 功能刀具清单添加刀具组字段 2024-04-09 13:38:13 +08:00
禹翔辉
9e5843c4a8 Accept Merge Request #938: (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/938?initial=true
 2024-04-09 11:18:47 +08:00
yuxianghui
e9bca64f20 Merge branch 'feature/工单扫描绑定Rfid优化' into feature/新增功能刀具清单 2024-04-09 10:48:57 +08:00
yuxianghui
34ea140941 1、新增功能刀具清单模型，及其tree视图、权限；2、功能刀具安全库存模型和功能刀具组装单模型新增功能刀具名称关联功能刀具清单，优化功能刀具组装流程生成功能刀具安全库存信息的流程 2024-04-09 10:46:08 +08:00
黄焱
0dc94fa69b Accept Merge Request #937: (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/937?initial=true
 2024-04-08 17:19:01 +08:00
黄焱
4c9fbab471 修改制造模块子页面样式问题 2024-04-08 17:17:27 +08:00
jinling.yang
51685ba68b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-04-08 16:51:54 +08:00
jinling.yang
04de8fe9de Merge branch 'feature/优化Rfid绑定工单' into develop 2024-04-08 16:51:32 +08:00
杨金灵
bb29db2ff5 Accept Merge Request #936: (feature/优化Rfid绑定工单 -> 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/936?initial=true
 2024-04-08 16:51:13 +08:00
jinling.yang
3f86dd48ec Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化Rfid绑定工单 
# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py
#	sf_manufacturing/models/product_template.py
#	sf_manufacturing/views/mrp_workorder_view.xml
 2024-04-08 16:47:16 +08:00