From 6b78cb72b32fc47a3f9d06de70b75c7d4f684012 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 18 Mar 2025 11:21:56 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=B4=A8=E6=A3=80=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E5=92=8C=E6=95=B0=E9=87=8F=E5=BA=94=E7=94=A8=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_quality/models/stock.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sf_quality/models/stock.py b/sf_quality/models/stock.py
index e5039d81..add80f8a 100644
--- a/sf_quality/models/stock.py
+++ b/sf_quality/models/stock.py
@@ -5,7 +5,6 @@ class StockPicking(models.Model):
     _inherit = 'stock.picking'
 
     def button_validate(self):
-        res = super(StockPicking, self).button_validate()
         """
             出厂检验报告上传
         """
@@ -24,9 +23,7 @@ class StockPicking(models.Model):
             “警告：存在不合格产品XXXX n 件、YYYYY m件，继续调拨请点“确认”，否则请取消？”
         """
         context = self.env.context
-        if (not (not isinstance(res, bool) and res.get('type') == 'ir.actions.act_window')
-                and not context.get('again_validate')
-                and self.quality_check_ids.filtered(lambda qc: qc.quality_state == 'fail')):
+        if not context.get('again_validate') and self.quality_check_ids.filtered(lambda qc: qc.quality_state == 'fail'):
             # 回滚事务，为二次确认/取消做准备
             self.env.cr.rollback()
             quality_check_ids = self.quality_check_ids.filtered(lambda qc: qc.quality_state == 'fail')
@@ -58,4 +55,5 @@ class StockPicking(models.Model):
                     'default_fail_check_text': f'警告：存在不合格产品{fail_check_text}，继续调拨请点“确认”，否则请取消？',
                     'again_validate': True}
             }
+        res = super(StockPicking, self).button_validate()
         return res