From ce79016befc8d870397ad0c41c47fb7f7d804d05 Mon Sep 17 00:00:00 2001 From: liaodanlong Date: Sun, 27 Apr 2025 17:20:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=B7=A5=E6=9C=AA=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=BC=96=E7=A8=8B=EF=BC=8C=E6=96=B0=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E5=A4=8D=E5=88=B6=E7=A8=8B=E5=BA=8F=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/wizard/rework_wizard.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sf_manufacturing/wizard/rework_wizard.py b/sf_manufacturing/wizard/rework_wizard.py index 0ce52f41..b6b657c1 100644 --- a/sf_manufacturing/wizard/rework_wizard.py +++ b/sf_manufacturing/wizard/rework_wizard.py @@ -211,13 +211,13 @@ class ReworkWizard(models.TransientModel): if self.reprogramming_num >= 1 and self.programming_state == '已编程': for panel_name in panels: self.production_id.get_new_program(panel_name) - if self.reprogramming_num >= 0 and self.programming_state == '已编程': + if self.reprogramming_num >= 0 and self.programming_state == '已下发': # ============= 处理CNC加工加工工单的 CNC程序和cmm程序 信息============= - for cnc_work in new_work_ids.filtered(lambda wk: wk.name == 'CNC加工'): + for cnc_work in new_work_ids.filtered(lambda wk: wk.name == 'CNC加工' or wk.name == '人工线下加工'): ret = {'programming_list': []} old_cnc_rework = max(self.production_id.workorder_ids.filtered( lambda crw: crw.processing_panel == cnc_work.processing_panel - and crw.state == 'rework' and crw.routing_type == 'CNC加工'), + and crw.state == 'rework' and (crw.routing_type == 'CNC加工' or crw.routing_type == '人工线下加工')), key=lambda w: w.create_date ) # 获取当前工单的CNC程序和cmm程序 @@ -259,7 +259,7 @@ class ReworkWizard(models.TransientModel): new_cnc_workorder = self.production_id.workorder_ids.filtered( lambda ap1: ap1.processing_panel == cnc_work.processing_panel and ap1.state not in ( - 'rework', 'done') and ap1.routing_type == 'CNC加工' + 'rework', 'done') and (ap1.routing_type == 'CNC加工' or ap1.routing_type == '人工线下加工') ) if not new_cnc_workorder.cnc_ids: new_cnc_workorder.write({