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

191 Commits

Author SHA1 Message Date
qihao.gong@jikimo.com
c336230287 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2024-01-09 14:17:50 +08:00
jinling.yang
cc9e6fa3d1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复采购按钮显示及产品字段问题 2024-01-09 12:01:47 +08:00
jinling.yang
3c3ffa1ebc 1.修复采购订单确认按钮显示问题2.修复涉及适合冷却方式字段的相关模型内该字段的过滤查询条件3.修改产品的适合刀柄型号字段类型4.修改销售订单的输入验证 2024-01-09 12:01:20 +08:00
qihao.gong@jikimo.com
e6c77e7b35 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 
# Conflicts:
#	sf_manufacturing/models/product_template.py
 2024-01-09 10:38:40 +08:00
yuxianghui
afdfde245a Merge remote-tracking branch 'origin/feature/产品添加夹具型号信息' into feature/功能刀具新增字段 
# Conflicts:
#	sf_manufacturing/models/product_template.py
 2024-01-09 10:33:16 +08:00
qihao.gong@jikimo.com
3742a3b163 修改自动完成制造订单得方法，完工产品捡取需变成就绪状态 2024-01-08 17:51:16 +08:00
qihao.gong@jikimo.com
631d59f95e 处理本地报错 2024-01-08 16:18:15 +08:00
jinling.yang
f8c6c766cb 优化刀具模版和刀具标准库 2024-01-08 15:44:16 +08:00
jinling.yang
3f448bc6da Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化刀具基本参数同步 
# Conflicts:
#	sf_dlm_management/views/product_template_management_view.xml
 2024-01-08 10:08:50 +08:00
yuxianghui
d1c10f56d1 1、sf_base新增刀具组模型；2、所以功能刀具相关模型添加刀具组对象字段（进行中）； 2024-01-05 17:33:06 +08:00
jinling.yang
edf4699e9e 1.新增每日同步切削速度和每齿走刀量及切削宽度和深度的接口 
2.优化产品模版
 2024-01-05 17:30:13 +08:00
yuxianghui
e5bf0d8205 Merge remote-tracking branch 'origin/feature/夹具型号同步' into feature/产品添加夹具型号信息 2024-01-05 14:43:48 +08:00
龚启豪
5b9b700372 Accept Merge Request #749: (feature/修改机床参数bug -> develop) 
Merge Request: 修改获取cnc从工单到制造订单

Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/749
 2024-01-05 14:03:31 +08:00
qihao.gong@jikimo.com
c81dc99aef 修改获取CNC程序从工单到制造订单 2024-01-05 11:23:27 +08:00
yuxianghui
57f5d138e8 1、修改夹装单元数修改成装夹单元数；2、重构产品的夹具物料信息(进行中)；3、完善夹具物料的同步功能； 2024-01-04 17:44:22 +08:00
jinling.yang
da8cbe4cce 1.修改刀具标准库同步6个物料的方法 
2.刀具基础参数的刃数和刀片的刃数两个字段新增选项，新增active字段，xml中修改适配刀片型号字段
 2024-01-03 17:41:44 +08:00
yuxianghui
ce69127250 1、夹具型号同步(进行中)；2、删除功能刀具组装的功能刀具切削类型字段； 2024-01-03 17:31:16 +08:00
jinling.yang
7f050b62f9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化刀具基本参数同步 2024-01-03 14:39:20 +08:00
yuxianghui
73c3e06900 1、修改所以夹具物料信息转接板夹具为转接板(锁板)夹具；2、优化功能刀具安全库存触发生成功能刀具组装单时重复触发的问题；3、设置功能刀具安全库存模型相关字段只有在创建的时候可以修改，其他时候是只读；4、优化功能刀具组装单组装完成后功能刀具入库位置不是刀具房的问题； 2024-01-02 17:25:49 +08:00
jinling.yang
1cf5cd41b4 1.刀具基本参数新增适配夹头尺寸字段，2.优化采购订单确认订单方法 2023-12-29 09:31:41 +08:00
yuxianghui
b2bb2e33de 1、新增夹具物料基本参数模型，重构工厂的夹具型号模型，重新优化夹具物料form视图；2、优化刀具标准库模型，优化切削速度模型，优化每齿走刀量模型，新增切削宽度和深度模型，新增坡铣角度模型；3、优化功能刀具安全库存最低安全库存可以高于最高库存的bug； 2023-12-28 17:06:34 +08:00
jinling.yang
a9c2d1aa5c 1.新增刀具物料参数的同步接口及方法 
2.修改刀具物料参数的适配刀片型号及适配刀柄型号字段类型及新增刀柄长度，刀柄直径，法兰直径，动平衡等级，适配夹头型号,适用锁紧螺母型号,编码字段
 2023-12-28 16:27:40 +08:00
龚启豪
34d0e989d6 Accept Merge Request #726: (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/726?initial=true
 2023-12-21 17:38:15 +08:00
yuxianghui
363463e31d 1、新增安装时自动配置刀具房位置，重新配置了刀具组装入库的作业类型，增加名称为刀具组装入库的参考序列配置；2、功能刀具所以的装刀长改为总长度；3、机床换刀申请和刀具组装单弹窗界面做字段必填控制，对新刀隐藏切削相关字段；4、刀具组装单弹窗增加一些字段的数值自动填写和计算； 2023-12-19 17:31:37 +08:00
qihao.gong@jikimo.com
ef2f7d3ecb 修改机床设备参数，处理同步bug，以及机床设备视图布局 2023-12-15 17:28:42 +08:00
qihao.gong@jikimo.com
2391c08485 修改i机床接口同步以及参数 2023-12-14 17:33:28 +08:00
龚启豪
61c3b16a69 Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug 2023-12-06 11:35:01 +08:00
qihao.gong@jikimo.com
893aa2111c 处理coding报错 2023-11-29 17:34:15 +08:00
qihao.gong@jikimo.com
5b1d347fd4 增加设备模块权限角色，优化coding代码扫描警告 2023-11-28 17:23:49 +08:00
jinling.yang
07be7c3074 1.同步刀具标准库接口修改刀片形状，柄部类型，刀尖特征，压紧方式 2023-11-28 17:08:56 +08:00
jinling.yang
ed5f47cc31 1.修改刀具标准库刀片形状，柄部类型，压紧方式，刀尖特征，字段类型及对应控件显示 
2.修改产品页面：刀片形状，柄部类型，压紧方式，刀尖特征，字段类型及对应控件显示
 2023-11-27 17:34:23 +08:00
jinling.yang
e9be2e9c43 优化代码格式 2023-11-23 17:38:30 +08:00
jinling.yang
6ec6094c5e 1.新增销售和计划权限组2.优化代码格式 2023-11-21 16:10:05 +08:00
杨金灵
31f07c5156 Accept Merge Request #675: (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/675
 2023-11-20 17:05:06 +08:00
qihao.gong@jikimo.com
6fc735063a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 
# Conflicts:
#	sf_manufacturing/models/stock.py
 2023-11-20 15:41:50 +08:00
jinling.yang
6912160232 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品验证 
# Conflicts:
#	sf_manufacturing/models/stock.py
#	sf_wxwork_approval/models/model.py
 2023-11-20 15:11:43 +08:00
jinling.yang
7ceaadb9c4 修复引入库 2023-11-20 15:04:39 +08:00
qihao.gong@jikimo.com
1da7a0195d 根据odoo规则修改py文件中得import顺序 2023-11-20 14:59:06 +08:00
mgw
718b1f9edf 优化代码结构 2023-11-20 13:23:37 +08:00
jinling.yang
f36c2ac096 产品优化 2023-11-16 17:35:04 +08:00
jinling.yang
4f898dd8ce 去掉注释，硬度的字段类型改为整数型 2023-11-08 17:29:38 +08:00
jinling.yang
3a1acb0f5a 整合所有模块依赖 2023-11-08 17:13:18 +08:00
jinling.yang
686c049e52 修复刀具标准库 2023-11-03 10:42:09 +08:00
jinling.yang
36270477d5 修复同步刀具标准库 2023-11-02 17:17:34 +08:00
jinling.yang
108cb96ca5 修复刀具产品及同步刀具标准库 2023-11-01 17:45:54 +08:00
jinling.yang
2a9c5276ab 优化刀具产品 2023-10-30 17:32:16 +08:00
jinling.yang
5ffe2ce0e2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） 
# Conflicts:
#	sf_maintenance/views/maintenance_views.xml
 2023-10-30 10:48:13 +08:00
qihao.gong@jikimo.com
47a408d034 制造标准改成执行标准 2023-10-27 10:31:10 +08:00
jinling.yang
9fffcd4f04 新增规格改变事件 2023-10-25 17:37:17 +08:00
jinling.yang
39f97131a2 1.去掉不要的代码2,.产品页面新增规格字段 2023-10-25 15:07:29 +08:00