From 0eeebf437a4ea82224e2b5c775c5dbe8ae80000c Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 17 Jun 2025 11:47:26 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=B4=A8=E6=A3=80=E5=8D=95=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=BA=E5=87=BA=E5=8E=82=E6=A3=80=E6=B5=8B=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E6=97=B6=EF=BC=8C=E9=9A=90=E8=97=8F=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8B=E7=9A=84=E4=B8=8D=E5=90=88=E6=A0=BC?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=9B2=E3=80=81=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E7=BB=84=E8=A3=85=E6=A3=80=E6=B5=8BBOM?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E6=97=B6=E8=BF=87=E6=BB=A4=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E7=9A=84=E8=BF=BD=E6=BA=AF=E7=B1=BB=E5=9E=8B=E4=B8=BA=E4=B8=8D?=
 =?UTF-8?q?=E8=BF=BD=E6=BA=AF=E7=9A=84=E4=BA=A7=E5=93=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_quality/views/quality_check_view.xml | 2 +-
 sf_tool_management/models/base.py       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/sf_quality/views/quality_check_view.xml b/sf_quality/views/quality_check_view.xml
index 953de51e..aed8ce4d 100644
--- a/sf_quality/views/quality_check_view.xml
+++ b/sf_quality/views/quality_check_view.xml
@@ -66,7 +66,7 @@
                 <attribute name="string">不合格</attribute>
             </xpath>
             <xpath expr="//header//button[@name='do_fail'][2]" position="attributes">
-                <attribute name="attrs">{'invisible': ['|',('quality_state', '!=', 'pass'),('work_state','in', ('done', 'rework'))]}</attribute>
+                <attribute name="attrs">{'invisible': ['|','|',('quality_state', '!=', 'pass'),('work_state','in', ('done', 'rework')),'&amp;',('quality_state', '=', 'pass'), ('test_type', '=', '出厂检验报告')]}</attribute>
                 <attribute name="string">不合格</attribute>
             </xpath>
 
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index ff8f4e6f..219e0f80 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -818,6 +818,7 @@ class FunctionalToolAssembly(models.Model):
 
     def _get_old_tool_material_lot(self, material_ids):
         """ 根据先进先出原则选择物料批次 """
+        material_ids = material_ids.filtered(lambda m: m.tracking != 'none')
         location_id = self.env['stock.location'].search([('name', '=', '刀具房')])
         stock_quant = self.env['stock.quant'].sudo().search(
             [('location_id', '=', location_id.id), ('product_id', 'in', material_ids.ids), ('quantity', '>', '0')],