diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py index e4dfb2a8..1b1aea17 100644 --- a/sf_manufacturing/models/mrp_production.py +++ b/sf_manufacturing/models/mrp_production.py @@ -687,6 +687,9 @@ class MrpProduction(models.Model): for work_id in work_ids: if panel_sequence_list.get(work_id.name): work_id.sequence = panel_sequence_list[work_id.name] + if rec.tool_state in ['1', '2']: + rec.workorder_ids.filtered( + lambda a: a.routing_type == '装夹预调' and a.state in 'ready').compute_state() # 创建工单并进行排序 def _create_workorder(self, item): diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index ae3b307b..6f637889 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -988,6 +988,9 @@ class ResMrpWorkOrder(models.Model): # elif workorder.production_id.reservation_state != 'assigned' and workorder.state == 'ready': # workorder.state = 'waiting' + def compute_state(self): + self._compute_state() + # 重写工单开始按钮方法 def button_start(self): if self.routing_type == '装夹预调': diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py index 95ffe45e..7ae92d65 100644 --- a/sf_tool_management/wizard/wizard.py +++ b/sf_tool_management/wizard/wizard.py @@ -603,6 +603,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel): 功能刀具组装 :return: """ + logging.info('功能刀具开始组装!') # 获取组装单对象 functional_tool_assembly = self.env['sf.functional.tool.assembly'].search([ ('assembly_order_code', '=', self.assembly_order_code), @@ -649,6 +650,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel): ]) cam_plan.write({'plan_execute_status': '2'}) + logging.info('功能刀具组装完成!') + # 关闭弹出窗口 return {'type': 'ir.actions.act_window_close'} @@ -865,6 +868,7 @@ class StockPicking(models.Model): # 设置数量,并验证完成 picking_id.action_set_quantities_to_reservation() picking_id.button_validate() + logging.info(f'刀具物料调拨单状态:{picking_id.state}') def _get_name_stock1(self, picking_type_id): name = f'{picking_type_id.sequence_id.prefix}DJ/{date.today().strftime("%y")}' diff --git a/sf_warehouse/views/view.xml b/sf_warehouse/views/view.xml index 0b2c611e..fadaa58f 100644 --- a/sf_warehouse/views/view.xml +++ b/sf_warehouse/views/view.xml @@ -2,6 +2,9 @@ + + {'search_default_groupby_code':1} + stock.location.form.sf.inherit