From 06759375888a8d9c7dce3c33c7b103b2c7cfe71f Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 31 Jul 2024 17:00:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=B6=E9=80=A0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_production.py        | 16 ++++++++--------
 .../views/mrp_production_addional_change.xml     |  2 ++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index e4dfb2a8..f78688e1 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -815,17 +815,17 @@ class MrpProduction(models.Model):
     def do_update_program(self):
         program_production = self
         if len(program_production) >= 1:
-            same_product_id = None
-            is_not_same_product = 0
+            # same_product_id = None
+            # is_not_same_product = 0
             for item in program_production:
-                if same_product_id is None:
-                    same_product_id = item.product_id
-                if item.product_id != same_product_id:
-                    is_not_same_product += 1
+                # if same_product_id is None:
+                #     same_product_id = item.product_id
+                # if item.product_id != same_product_id:
+                #     is_not_same_product += 1
                 if item.state != "rework" and item.programming_state != "已编程未下发":
                     raise UserError("请选择状态为返工且已编程未下发的制造订单")
-            if is_not_same_product >= 1:
-                raise UserError("您选择的记录中含有其他产品的制造订单，请选择同一产品的制造订单")
+            # if is_not_same_product >= 1:
+            #     raise UserError("您选择的记录中含有其他产品的制造订单，请选择同一产品的制造订单")
         grouped_program_ids = {k: list(g) for k, g in groupby(program_production, key=lambda x: x.programming_no)}
         program_to_production_names = {}
         for programming_no, program_production in grouped_program_ids.items():
diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index fdbec99f..745b0082 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -465,6 +465,8 @@
                     <separator/>
                     <filter string="返工且已编程" name="filter_rework_programmed"
                             domain="[('state', '=', 'rework'),('programming_state', '=', '已编程')]"/>
+                    <filter string="返工且已编程未下发" name="filter_rework_programmed_not_delivered"
+                            domain="[('state', '=', 'rework'),('programming_state', '=', '已编程未下发')]"/>
                     <separator/>
                     <filter name="filter_programming" string="编程中"
                             domain="[('programming_state', '=', '编程中')]"/>