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

2280 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
杨金灵
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
yuxianghui
decb6c7792 禁用功能刀具安全库存的刀具组字段创建新记录的功能 2024-03-26 15:16:26 +08:00
jinling.yang
b83e5575dc Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-03-26 14:19:40 +08:00
jinling.yang
a003987111 Merge branch 'feature/优化agv配置和客户' into develop 2024-03-26 14:19:13 +08:00
杨金灵
db2052a019 Accept Merge Request #918: (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/918
 2024-03-26 14:18:56 +08:00
jinling.yang
ca06d11d79 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-03-26 14:11:25 +08:00
jinling.yang
e63eed3405 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化agv配置和客户 2024-03-26 14:11:11 +08:00
jinling.yang
d05c0951eb 1.agv配置参数新增地码 
2.bpm分配工厂时的客户(业务平台)的必填信息（税，邮箱，号码）赋值
3.报价页面的客户改为不可新建
 2024-03-26 14:10:51 +08:00
禹翔辉
0500a2dd02 Accept Merge Request #917: (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/917?initial=true
 2024-03-25 16:55:37 +08:00
yuxianghui
37ea48dbee Merge branch 'feature/夹具物料搜索' into feature/零件特采接口优化 2024-03-25 16:51:04 +08:00
yuxianghui
48cd8399f4 1、优化中控零件特采接口，2、将刀具管理的功能刀具所有rfid改为Rfid 2024-03-25 16:49:49 +08:00
马广威
ee3c0d702d Accept Merge Request #916: (feature/制造代码优化 -> develop) 
Merge Request: 修复员工模块js问题、能力特征哭js问题、设备处问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/916?initial=true
 2024-03-25 16:19:22 +08:00
mgw
1212ea0930 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 
# Conflicts:
#	jikimo_frontend/static/src/js/custom_form_status_indicator.js
 2024-03-25 16:18:42 +08:00
mgw
ed8c39d005 修复员工模块js问题、能力特征哭js问题、设备处问题 2024-03-25 16:17:19 +08:00
黄焱
fe4782eecf Accept Merge Request #915: (feature/前端样式修改 -> develop) 
Merge Request: 修改field错误问题

Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/915?initial=true
 2024-03-25 09:10:37 +08:00
黄焱
57bfec02eb 修改field错误问题 2024-03-25 09:07:45 +08:00
马广威
53c4b01a74 Accept Merge Request #914: (feature/制造代码优化 -> develop) 
Merge Request: odoo标签打印及去除odoo相关标识

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/914?initial=true
 2024-03-20 17:34:56 +08:00
mgw
5b535fae18 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 2024-03-20 17:33:58 +08:00
mgw
ba79b358a9 调整打印机模型结构 2024-03-20 17:32:17 +08:00
mgw
c788392b36 打印配置初步优化并测试成功，自测流程成功 2024-03-20 16:58:57 +08:00
禹翔辉
d3819e818b Accept Merge Request #913: (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/913
 2024-03-20 16:38:43 +08:00
yuxianghui
0725b7a7ba Merge branch 'feature/功能刀具组装优化' into feature/夹具物料搜索 2024-03-20 16:36:00 +08:00
yuxianghui
a07563e166 1、新增夹具物料搜索模型，完成tree视图和form视图；2、新增夹具物料序列号、夹具物料搜索模型注册到cloud的接口，优化刀具物料序列号注册接口及流程；3、删除刀具物料搜索模型的无关字段； 2024-03-20 16:34:11 +08:00
mgw
2407d2cfc7 移除系统中odoo相关标识、信息 2024-03-20 16:15:00 +08:00