From 25aab1576d4f464714f2b4f682ba168b80f05e31 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Thu, 5 Jun 2025 11:11:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=94=E5=B7=A5=E8=A3=85=E5=A4=B9?= =?UTF-8?q?=E9=A2=84=E8=B0=83=E5=B7=A5=E5=8D=95=E6=97=B6=EF=BC=8C=E6=B8=85?= =?UTF-8?q?=E9=99=A4=E5=90=8C=E4=B8=80=E4=B8=AA=E9=9D=A2=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E7=9A=84rfid=EF=BC=8C=E5=B9=B6=E4=B8=94=E4=BF=9D=E7=95=99?= =?UTF-8?q?=E8=BF=94=E5=B7=A5=E5=B7=A5=E5=8D=95=E7=9A=84rfid=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/wizard/rework_wizard.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sf_manufacturing/wizard/rework_wizard.py b/sf_manufacturing/wizard/rework_wizard.py index cb739830..a29b3aaa 100644 --- a/sf_manufacturing/wizard/rework_wizard.py +++ b/sf_manufacturing/wizard/rework_wizard.py @@ -131,14 +131,20 @@ class ReworkWizard(models.TransientModel): # 'rfid_code_old': order.rfid_code, # 'rfid_code': False # }) - if clamp_workorder_ids: - for clamp_workorder_id in clamp_workorder_ids: - self.production_id.workorder_ids.filtered(lambda wk: ( - wk.processing_panel == clamp_workorder_id.processing_panel)).write( - {'rfid_code_old': clamp_workorder_id.rfid_code, - 'rfid_code': None}) # 返工工单状态设置为【返工】 rework_workorder_ids.write({'state': 'rework'}) + if clamp_workorder_ids: + for clamp_workorder_id in clamp_workorder_ids: + # 清除返工的装夹预调工单以及其他同面返工工单的RFID并保存rfid记录 + self.production_id.workorder_ids.filtered(lambda wk: ( + wk.processing_panel == clamp_workorder_id.processing_panel + and wk.state == 'rework' and wk.rfid_code)).write( + {'rfid_code_old': clamp_workorder_id.rfid_code, 'rfid_code': None}) + # 清除返工的装夹预调工单同面的非返工工单的RFID + self.production_id.workorder_ids.filtered(lambda wk: ( + wk.processing_panel == clamp_workorder_id.processing_paneland and wk.state != 'rework')).write( + {'rfid_code_old': None, 'rfid_code': None}) + # 查询返工工单对应的工艺设计记录，并调用方法拼接数据，用于创建新的工单 workorders_values = [] for work in rework_workorder_ids: From 1082384d007cd2512d34c4194b5c343fd99c7720 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Thu, 5 Jun 2025 11:18:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B8=85=E9=99=A4=E8=BF=94=E5=B7=A5?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=9A=84rfid=EF=BC=8C=E5=B9=B6=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/wizard/rework_wizard.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sf_manufacturing/wizard/rework_wizard.py b/sf_manufacturing/wizard/rework_wizard.py index a29b3aaa..cfd57b68 100644 --- a/sf_manufacturing/wizard/rework_wizard.py +++ b/sf_manufacturing/wizard/rework_wizard.py @@ -144,7 +144,9 @@ class ReworkWizard(models.TransientModel): self.production_id.workorder_ids.filtered(lambda wk: ( wk.processing_panel == clamp_workorder_id.processing_paneland and wk.state != 'rework')).write( {'rfid_code_old': None, 'rfid_code': None}) - + # 清除其他返工工单的RFID + for work in rework_workorder_ids.filtered(lambda wk: wk.rfid_code): + work.write({'rfid_code_old': work.rfid_code, 'rfid_code': None}) # 查询返工工单对应的工艺设计记录，并调用方法拼接数据，用于创建新的工单 workorders_values = [] for work in rework_workorder_ids: