jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,304 Commits 134 Branches 31 Tags
61bcd72a4157365de5a72dd80b8e184e2ec56dd9
Commit Graph

501 Commits

Author SHA1 Message Date
yuxianghui
9c08021773 Merge branch 'feature/自动生成二维码' into feature/序列号添加二维码 2024-02-20 16:01:52 +08:00
杨金灵
de26109ccc Accept Merge Request #809: (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/809
 2024-02-20 14:35:03 +08:00
yuxianghui
53e5aa2017 优化刀具组接口 2024-02-20 14:32:13 +08:00
jinling.yang
cbd7b561de 产品的加工参数的权限修复 2024-02-19 17:07:42 +08:00
mgw
9c080e0cb4 权限控制增补 2024-02-19 15:26:36 +08:00
jinling.yang
c867b3c7bc 产品相关岗位权限的修复 2024-02-17 16:34:32 +08:00
jinling.yang
9bae3a4e5f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复产品权限问题 2024-02-04 16:53:28 +08:00
jinling.yang
e48c5e39ac 修复产品页面部分一对多字段的访问权限 2024-02-04 16:52:57 +08:00
qihao.gong@jikimo.com
6cdc547da5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2024-02-04 15:57:16 +08:00
qihao.gong@jikimo.com
c11dc4f9c4 修改权限相关缺陷 2024-02-04 15:56:53 +08:00
jinling.yang
0185a3bc2b 修复客户页面除销售员和采购员字段可编辑，其余不可编辑 2024-02-02 17:27:08 +08:00
jinling.yang
8c52c42074 1.修复来自业务平台的自动生产的采购单状态 
2.修复所有同步cloud的数据
 2024-02-02 15:52:06 +08:00
jinling.yang
ab9fcf97e0 1.修复工件配送扫描工件（坯料）时，同运工件显示的是坯料对应的制造订单号，修改配送时长字段类型及对应的时长方法，修复工件装夹岗不能修改配送工件 
2.修复产品中计划总监岗和调度总监岗不能访问切削速度的权限
 2024-02-01 17:37:41 +08:00
jinling.yang
51a9b55782 修改admin在同步模型的访问权限 2024-01-30 11:43:18 +08:00
jinling.yang
a088ee9ed5 1.制造模块内配置下的所有模型增加管理员（admin）权限 
2.工单上的工件配送优化验证及对应的页面上新增工件配送按钮
 2024-01-29 19:43:57 +08:00
jinling.yang
cf2aaa38fe 1.修复材料型号同步报验证问题2.优化工单的工件派送3.计划里新增生产线的优化 2024-01-26 17:46:53 +08:00
yuxianghui
f5c555ec86 注释新增接口的调用 2024-01-22 17:11:45 +08:00
杨金灵
adcd2c39fc Accept Merge Request #779: (feature/新增机台日计划,工件预调(前置三元检测),NC程序下载接口 -> develop) 
Merge Request: 新增机台日计划,工件预调(前置三元检测),NC程序下载接口

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/779
 2024-01-22 15:41:49 +08:00
马广威
72f5496905 Accept Merge Request #780: (feature/制造代码优化 -> develop) 
Merge Request: 增加刀具管理权限控制，刀具组权限控制，隐藏工单上原生按钮，修复只读权限后修改记录无权限问题等

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/780?initial=true
 2024-01-22 15:40:23 +08:00
jinling.yang
12c6959ba4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增机台日计划,工件预调(前置三元检测),NC程序下载接口 
# Conflicts:
#	sf_manufacturing/controllers/controllers.py
 2024-01-22 15:35:13 +08:00
yuxianghui
d03813db40 Merge remote-tracking branch 'origin/feature/接口及CAM用刀' into feature/CAM用刀优化及添加接口 2024-01-22 14:42:45 +08:00
yuxianghui
b5c7be8de0 1、新增机床刀具组接口，在刀具组新建和更新时调用接口；2、新增零件特采接口，在质量检测审核之后调用接口； 2024-01-19 17:26:45 +08:00
mgw
2dfd3c9128 增加刀具管理权限控制，刀具组权限控制，隐藏工单上原生按钮，修复只读权限后修改记录无权限问题等 2024-01-19 11:49:57 +08:00
qihao.gong@jikimo.com
aa810bbda2 零件质检接口 修改coding缺陷 2024-01-18 17:26:31 +08:00
jinling.yang
4f0c7ad274 1.新增机台日计划接口 
2.新工件预调(前置三元检测)接口
3.,新NC程序下载接口接口
 2024-01-16 17:25:25 +08:00
yuxianghui
d042de9e84 Merge remote-tracking branch 'origin/feature/功能刀具新增字段' into feature/夹具型号同步优化 2024-01-11 14:11:57 +08:00
yuxianghui
bc6303d1af 1、删除夹具xml中的无用代码；2、优化夹具物料同步功能 2024-01-11 14:10:49 +08:00
yuxianghui
077ce6d37f 1、删除夹具型号自动更新code值的方法；2、优化功能刀具安全库存创建功能刀具组装单方法；3、优化功能刀具列表中的能力数据的图文展示数据； 2024-01-10 17:42:59 +08:00
jinling.yang
82c0269761 1.材料型号新增获取方式和供应商的输入验证2.每齿走刀量去掉切削速度字段 2024-01-10 15:24:31 +08:00
jinling.yang
4c3e7e40cb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复采购库存销售模块问题 
# Conflicts:
#	sf_base/models/tool_base_new.py
 2024-01-09 16:55:19 +08:00
jinling.yang
f82cb462cf 1.去掉警告2.销售订单详情显示进度状态字段3.修复采购权限组没有存库模块包括以内的相关菜单的访问权限 2024-01-09 16:54:16 +08:00
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
mgw
9443a07eb4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 
# Conflicts:
#	sf_sale/security/ir.model.access.csv
 2024-01-04 08:54:12 +08:00
mgw
b9bb528db0 客户列表公司类型卡片增加税ID，计划处tree视图增加批量排程button 2024-01-03 23:03:08 +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