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

2303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yuxianghui
34ea140941 1、新增功能刀具清单模型，及其tree视图、权限；2、功能刀具安全库存模型和功能刀具组装单模型新增功能刀具名称关联功能刀具清单，优化功能刀具组装流程生成功能刀具安全库存信息的流程 2024-04-09 10:46:08 +08:00
yuxianghui
6bddc4c262 Merge branch 'feature/功能刀具组装功能优化' into feature/工单扫描绑定Rfid优化 2024-04-08 14:45:05 +08:00
yuxianghui
4faeda11b8 1、优化工单扫托盘Rfid绑定Rfid码录入信息时，工单的开始等按键消失的问题 2024-04-08 14:43:46 +08:00
禹翔辉
3a484682fa Accept Merge Request #934: (feature/功能刀具组装功能优化 -> develop) 
Merge Request: 1、处理刀具物料注册时搜索不到的问题；2、功能刀具组装时，当没有选择物料的时候功能刀具编码不显示数据；添加最大寿命值、报警值、有效长、避空长的必填验证；

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/934?initial=true
 2024-04-07 16:46:26 +08:00
yuxianghui
556c3cb4bb Merge branch 'feature/工单扫Rfid绑定托盘' into feature/功能刀具组装功能优化 2024-04-07 15:37:52 +08:00
yuxianghui
000280e53a no message 2024-04-07 15:36:05 +08:00
yuxianghui
4dd733c466 1、处理刀具物料注册时搜索不到的问题；2、功能刀具组装时，当没有选择物料的时候功能刀具编码不显示数据；添加最大寿命值、报警值、有效长、避空长的必填验证； 2024-04-07 15:35:47 +08:00
禹翔辉
92e522905c Accept Merge Request #933: (feature/工单扫Rfid绑定托盘 -> develop) 
Merge Request: 暂时关闭工单扫Rfid绑定托盘的Rfid重复验证

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/933?initial=true
 2024-04-03 17:27:03 +08:00
yuxianghui
2ef832c17e 暂时关闭工单扫Rfid绑定托盘的Rfid重复验证 2024-04-03 17:23:57 +08:00
禹翔辉
7fd92e44b3 Accept Merge Request #932: (feature/工单扫Rfid绑定托盘 -> develop) 
Merge Request: 托盘物料添加Rfid码，工单扫Rfid绑定托盘

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/932?initial=true
 2024-04-03 16:59:55 +08:00
yuxianghui
392784041c Merge branch 'feature/刀具物料采购生成序列号优化' into feature/工单扫Rfid绑定托盘 2024-04-03 16:54:10 +08:00
yuxianghui
02e5972272 1、新增装夹预调工单扫拖盘Rfid绑定托盘；2、删除工单的Rfid字段的customRFID样式；3、修改序列号模型的Rfid字段的隐藏条件；4、优化刀柄、托盘物料采购时绑定Rfid的判断条件 2024-04-03 16:52:16 +08:00
禹翔辉
eb3583222c Accept Merge Request #931: (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/931
 2024-04-02 16:43:21 +08:00
yuxianghui
aac5195b4d 当产品的刀具物料不是刀柄时，隐藏对应序列号模型的Rfid字段 2024-04-02 16:38:19 +08:00
禹翔辉
715119d250 Accept Merge Request #930: (feature/刀具物料采购生成序列号优化 -> develop) 
Merge Request: 1、优化产品采购刀具物料生成的序列号出现不连续的问题；2、采购刀柄物料时，在入库验证环节增加Rfid是否全部录入检验。

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/930?initial=true
 2024-04-02 16:16:25 +08:00
yuxianghui
9ed3930a1b Merge branch 'feature/刀柄入库录入Rfid' into feature/刀具物料采购生成序列号优化 2024-04-02 16:03:35 +08:00
yuxianghui
2580e0c795 1、优化产品采购刀具物料生成的序列号出现不连续的问题；2、采购刀柄物料时，在入库验证环节增加Rfid是否全部录入检验。 2024-04-02 15:36:28 +08:00
禹翔辉
827e056dc8 Accept Merge Request #928: (feature/刀柄入库录入Rfid -> develop) 
Merge Request: 添加刀柄采购入库时录入Rfid功能；添加功能刀具组装时，扫Rfid带出刀柄、夹头信息，并填写功能刀具Rfid码

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/928
 2024-04-01 17:14:03 +08:00
yuxianghui
02e4987281 优化选取适用夹头方法 2024-04-01 17:12:47 +08:00
yuxianghui
e89b8ac65c Merge branch 'feature/功能刀具安全库存注册' into feature/刀柄入库录入Rfid 2024-04-01 16:56:56 +08:00
yuxianghui
f0b972e705 1、优化刀柄物料产品适用夹头型号没有数据的问题，优化刀具标准库基本参数同步接口；2、优化功能刀具组装时，只需扫入刀柄的Rfid，将自动带出刀柄信息，并根据刀柄适用夹头型号和适配夹头尺寸随机带出一个可用夹头物料信息，同时将刀柄的Rfid码填入功能刀具的Rfid码。3、优化刀柄物料采购入库时的验证的判断条件； 2024-04-01 16:56:15 +08:00
马广威
5c220af28c Accept Merge Request #927: (feature/制造代码优化 -> develop) 
Merge Request: 修复自定义角色打印无权限的问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/927?initial=true
 2024-04-01 14:56:35 +08:00
mgw
82947a909e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 2024-04-01 14:55:31 +08:00
mgw
18dcb79116 修复自定义角色打印无权限的问题 2024-04-01 14:55:10 +08:00
yuxianghui
48809cd654 1、序列号模型对象添加rfid字段且rfid仅在产品为刀柄时展示，序列号模型添加规格字段，且添加自动根据对应产品类型不同计算出其值，产品为夹具时看板展示其规格的值；2、在采购入库流程，录入序列号的过程界面添加录入rfid字段，当产品是刀柄时需录入刀柄的rfid，并在验证通过后刀柄的序列号中带有rfid码； 2024-03-29 17:37:02 +08:00
杨金灵
5b3ee99bf3 Accept Merge Request #926: (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/926?initial=true
 2024-03-29 16:55:31 +08:00
jinling.yang
be975ea901 文件匹配添加注释 2024-03-29 16:52:05 +08:00
jinling.yang
1451539bb4 释放注释代码 2024-03-29 16:48:44 +08:00
jinling.yang
154e7de8a4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化下发编程单的同时拉取CMM程序 2024-03-29 16:47:18 +08:00
禹翔辉
d21b25467b Accept Merge Request #925: (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/925?initial=true
 2024-03-28 17:34:29 +08:00
yuxianghui
71b7b07949 Merge branch 'feature/表面工艺添加类别筛选' into feature/功能刀具安全库存注册 2024-03-28 17:31:42 +08:00
yuxianghui
4115bbb05e 1、优化功能刀具安全库存信息更新时没有及时注册的问题 2024-03-28 17:30:16 +08:00
禹翔辉
c380d99a26 Accept Merge Request #924: (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/924
 2024-03-28 10:39:15 +08:00
yuxianghui
a0d50edc84 Merge branch 'feature/夹具管理' into feature/表面工艺添加类别筛选 2024-03-28 10:36:29 +08:00
yuxianghui
2aa29e5cbf 1、表面工艺添加按类型筛选功能；2、夹具产品的类型、规格添加必填 2024-03-28 10:35:08 +08:00
杨金灵
32907109ef Accept Merge Request #923: (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/923?initial=true
 2024-03-27 17:30:24 +08:00
jinling.yang
303fcfaabd 查询源位置的条件=改为ilike 2024-03-27 17:28:48 +08:00
jinling.yang
f767433a96 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-03-27 17:26:37 +08:00
jinling.yang
3eae506e48 注释occ代码 2024-03-27 17:26:27 +08:00
jinling.yang
0ddefacda7 注释OCC代码 2024-03-27 17:26:14 +08:00
禹翔辉
42a748e0f8 Accept Merge Request #922: (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/922?initial=true
 2024-03-27 11:52:45 +08:00
yuxianghui
63263e3509 修改刀具管理权限 2024-03-27 11:49:42 +08:00
yuxianghui
aaf782b4a1 Merge branch 'feature/刀具管理' into feature/夹具管理 
# Conflicts:
#	sf_tool_management/security/ir.model.access.csv
 2024-03-27 11:47:28 +08:00
yuxianghui
ce069e8b50 1、制造模块新增夹具管理菜单，将夹具物料查询菜单移到夹具管理菜单下，设置夹具管理菜单为工件装夹岗可见； 2024-03-27 11:39:07 +08:00
马广威
609ea62d0d Accept Merge Request #921: (feature/制造代码优化 -> develop) 
Merge Request: 控制cnc只能看到cnc产线；增加必填标识

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/921?initial=true
 2024-03-27 10:35:29 +08:00
mgw
f7f9cf1e43 控制cnc只能看到cnc产线；增加必填标识 2024-03-27 10:26:46 +08:00
马广威
75eb359c5a Accept Merge Request #920: (feature/制造代码优化 -> develop) 
Merge Request: 优化翻译、排序、权限问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/920
 2024-03-26 20:40:07 +08:00
mgw
7906ff2836 优化翻译、排序、权限问题 2024-03-26 18:09:23 +08:00
禹翔辉
5e97747ec1 Accept Merge Request #919: (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/919?initial=true
 2024-03-26 15:20:18 +08:00
yuxianghui
ead758d34c Merge branch 'feature/零件特采接口优化' into feature/功能刀具安全库存优化 2024-03-26 15:17:49 +08:00