From 5297bf05d11f3c1129a972ea504c61537c927562 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 15 Jan 2025 14:36:49 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=BF=94=E5=B7=A5=E6=8C=89=E9=92=AE=E6=B7=BB=E5=8A=A0=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E6=9D=A1=E4=BB=B6=EF=BC=9B2?=
 =?UTF-8?q?=E3=80=81=E4=BC=98=E5=8C=96=E8=BF=94=E5=B7=A5=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py                 | 8 +++++---
 sf_manufacturing/views/mrp_production_addional_change.xml | 2 +-
 sf_manufacturing/wizard/rework_wizard.py                  | 7 ++++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 41db21ab..5a9ff77e 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -1248,6 +1248,8 @@ class MrpProduction(models.Model):
         cloud_programming = None
         if self.programming_state in ['已编程']:
             cloud_programming = self._cron_get_programming_state()
+        elif self.programming_state is False:
+            cloud_programming = {}
         result_ids = self.detection_result_ids.filtered(lambda dr: dr.handle_result == '待处理')
         work_id_list = []
         if result_ids:
@@ -1268,9 +1270,9 @@ class MrpProduction(models.Model):
                 'default_production_id': self.id,
                 'default_workorder_ids': workorder_ids.ids if workorder_ids.ids != [] else self.workorder_ids.ids,
                 'default_hidden_workorder_ids': ','.join(map(str, work_id_list)) if work_id_list != [] else '',
-                'default_reprogramming_num': cloud_programming['reprogramming_num'],
-                'default_programming_state': cloud_programming['programming_state'],
-                'default_is_reprogramming': True if cloud_programming['programming_state'] in ['已下发'] else False
+                'default_reprogramming_num': cloud_programming.get('reprogramming_num'),
+                'default_programming_state': cloud_programming.get('programming_state'),
+                'default_is_reprogramming': True if cloud_programming.get('programming_state') in ['已下发'] else False
             }
         }
 
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 2091f956..d71ba4a5 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -166,7 +166,7 @@
                             confirm="是否确认更新程序"
                             attrs="{'invisible': ['|',('state', '!=', 'rework'),('programming_state', '!=', '已编程未下发')]}"/>
                     <button name="button_rework" string="返工" type="object" groups="sf_base.group_sf_mrp_user"
-                            attrs="{'invisible': ['|','|',('state', '!=', 'rework') ,('programming_state', '!=', '已编程'),('is_rework', '=', True)]}"/>
+                            attrs="{'invisible': ['|','|',('state', '!=', 'rework') ,('programming_state', 'not in', ('已编程', False)),('is_rework', '=', True)]}"/>
                     <button name="button_scrap_new" string="报废" type="object"
                             groups="sf_base.group_sf_mrp_user"
                             attrs="{'invisible': ['|',('is_scrap', '=', False),('state','=','cancel')]}"/>
diff --git a/sf_manufacturing/wizard/rework_wizard.py b/sf_manufacturing/wizard/rework_wizard.py
index f1941985..ba7ed770 100644
--- a/sf_manufacturing/wizard/rework_wizard.py
+++ b/sf_manufacturing/wizard/rework_wizard.py
@@ -138,7 +138,10 @@ class ReworkWizard(models.TransientModel):
                         lambda item: (item.route_id.name in work.name and item.process_parameters_id
                                       and item.process_parameters_id == work.surface_technics_parameters_id) or
                                      (item.route_id.name == work.name and item.panel
-                                      and item.panel == work.processing_panel))
+                                      and item.panel == work.processing_panel) or
+                                     (item.route_id == work.routing_workcenter_id
+                                      and not work.processing_panel
+                                      and not work.surface_technics_parameters_id))
                     if route:
                         work_list = self.env['mrp.workorder'].json_workorder_str(self.production_id, route[0])
                         work_list[2].update({'tag_type': '重新加工', 'sequence': 0})
@@ -304,6 +307,8 @@ class ReworkWizard(models.TransientModel):
                 if self.env.user.has_group('sf_base.group_sf_order_user'):
                     panel_ids = []
                     panel_arr = production_id.product_id.model_processing_panel
+                    if panel_arr is False:
+                        break
                     for p in production_id.detection_result_ids.filtered(
                             lambda ap1: ap1.handle_result == '待处理'):
                         if p.processing_panel not in panel_arr: