diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 2e90f76f..237d5b91 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -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', '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') diff --git a/sf_tool_management/models/functional_tool.py b/sf_tool_management/models/functional_tool.py index 6cfaee2d..e8523cd3 100644 --- a/sf_tool_management/models/functional_tool.py +++ b/sf_tool_management/models/functional_tool.py @@ -554,7 +554,7 @@ class RealTimeDistributionOfFunctionalTools(models.Model): sf_functional_tool_entity_ids = fields.One2many('sf.functional.cutting.tool.entity', 'safe_inventory_id', 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', 'functional_name_id.functional_cutting_tool_model_id') diff --git a/sf_tool_management/models/mrp_workorder.py b/sf_tool_management/models/mrp_workorder.py index 96198cbb..9326b511 100644 --- a/sf_tool_management/models/mrp_workorder.py +++ b/sf_tool_management/models/mrp_workorder.py @@ -194,8 +194,8 @@ class MrpProduction(models.Model): # 自动调用重新获取编程的方法 logging.info('cnc用刀校验到无效刀自动调用重新编程方法: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: # 修改 修改cnc程序的‘刀具状态’ 为 ‘缺刀’ cnc_ids = self.env['sf.cnc.processing'].sudo().search(