jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/刀具页面存档权限设置' into feature/制造订单状态优化

Browse Source
This commit is contained in:
yuxianghui
2024-10-16 17:02:18 +08:00
parent 42b5a32708 a21b4302d4
commit 43f8aec70a
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_tool_management/models/base.py
View File

@@ -687,7 +687,7 @@ class FunctionalToolAssembly(models.Model):
sf_cam_work_order_program_knife_plan_id = fields.Many2one('sf.cam.work.order.program.knife.plan', sf_cam_work_order_program_knife_plan_id = fields.Many2one('sf.cam.work.order.program.knife.plan',
'CAM工单程序用刀计划', readonly=True) 'CAM工单程序用刀计划', readonly=True)
active = fields.Boolean(string='已归档', default=True, groups='base.user_root') active = fields.Boolean(string='已归档', default=True)
code = fields.Char('功能刀具编码', compute='_compute_code') code = fields.Char('功能刀具编码', compute='_compute_code')

2
sf_tool_management/models/functional_tool.py
View File

@@ -554,7 +554,7 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
sf_functional_tool_entity_ids = fields.One2many('sf.functional.cutting.tool.entity', 'safe_inventory_id', sf_functional_tool_entity_ids = fields.One2many('sf.functional.cutting.tool.entity', 'safe_inventory_id',
string='功能刀具信息') string='功能刀具信息')
active = fields.Boolean(string='已归档', default=True, groups='base.user_root') active = fields.Boolean(string='已归档', default=True)
@api.depends('functional_name_id', 'functional_name_id.diameter', 'functional_name_id.angle', @api.depends('functional_name_id', 'functional_name_id.diameter', 'functional_name_id.angle',
'functional_name_id.functional_cutting_tool_model_id') 'functional_name_id.functional_cutting_tool_model_id')

4
sf_tool_management/models/mrp_workorder.py
View File

@@ -194,8 +194,8 @@ class MrpProduction(models.Model):
# 自动调用重新获取编程的方法 # 自动调用重新获取编程的方法
logging.info('cnc用刀校验到无效刀自动调用重新编程方法：update_programming_state()') logging.info('cnc用刀校验到无效刀自动调用重新编程方法：update_programming_state()')
self[0].update_programming_state() self[0].update_programming_state()
# 修改制造订单 编程状态变为“编程中” # 修改制造订单 编程状态变为“编程中” 制造订单状态为‘返工’
self.write({'programming_state': '编程中', 'work_state': '编程中'}) self.write({'programming_state': '编程中', 'work_state': '编程中', 'state': 'rework'})
if missing_tool_1: if missing_tool_1:
# 修改 修改cnc程序的‘刀具状态’ 为 ‘缺刀’ # 修改 修改cnc程序的‘刀具状态’ 为 ‘缺刀’
cnc_ids = self.env['sf.cnc.processing'].sudo().search( cnc_ids = self.env['sf.cnc.processing'].sudo().search(