From 19509a3ce2dc945262bead7fe094244bc8f47b66 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Thu, 17 Oct 2024 17:54:08 +0800 Subject: [PATCH 1/2] 1 --- sf_message/models/sf_message_workorder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sf_message/models/sf_message_workorder.py b/sf_message/models/sf_message_workorder.py index 9c3cb9f5..3ad17d93 100644 --- a/sf_message/models/sf_message_workorder.py +++ b/sf_message/models/sf_message_workorder.py @@ -153,6 +153,6 @@ class SFMessageWork(models.Model): getattr(item, queue_method_name)(*args) def _recover_time_warning_func(self): - workorder_done = self.env['mrp.workorder'].search([("state", "=", "done")]) + workorder_done = self.env['mrp.workorder'].search([("state", "in", ["done", "rework", "cancel"])]) workorder_overdue = workorder_done.filtered(lambda x: x.delivery_warning in ['overdue', 'warning']) workorder_overdue.write({'delivery_warning': 'normal'}) From 1dae20e0550ccb340230c46781683f069e815740 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Fri, 18 Oct 2024 09:13:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=88=B6=E9=80=A0?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E3=80=81=E5=B7=A5=E5=8D=95=E7=9A=84=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E8=AE=A1=E7=AE=97=E6=96=B9=E6=B3=95=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/models/mrp_workorder.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sf_tool_management/models/mrp_workorder.py b/sf_tool_management/models/mrp_workorder.py index d346937a..267dbe60 100644 --- a/sf_tool_management/models/mrp_workorder.py +++ b/sf_tool_management/models/mrp_workorder.py @@ -175,7 +175,9 @@ class MrpProduction(models.Model): cnc_ids = self.env['sf.cnc.processing'].sudo().search( [('workorder_id', 'in', workorder_ids.ids), ('cutting_tool_name', 'in', invalid_tool)]) if cnc_ids: - cnc_ids.write({'tool_state': '2'}) + for cnc_id in cnc_ids: + cnc_id.tool_state = '2' + # cnc_ids.write({'tool_state': '2'}) # 创建制造订单无效刀检测结果记录 for production_id in self: for processing_panel in list(set(invalid_tool_processing_panel)): @@ -204,7 +206,9 @@ class MrpProduction(models.Model): cnc_ids = self.env['sf.cnc.processing'].sudo().search( [('workorder_id', 'in', workorder_ids.ids), ('cutting_tool_name', 'in', missing_tool_1)]) if cnc_ids: - cnc_ids.write({'tool_state': '1'}) + for cnc_id in cnc_ids: + cnc_id.tool_state = '1' + # cnc_ids.write({'tool_state': '1'}) if missing_tool_2 and invalid_tool == []: logging.info(f'库存缺刀：{missing_tool_2}') # 调用CAM工单程序用刀计划创建方法