From 3793ba4a9b6be8faa6df0d4a76c06763ac03f873 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 29 十月 2025 15:06:04 +0800
Subject: [PATCH] 外购成品报检相关问题调整

---
 inspect-server/src/main/resources/mapper/InsSampleMapper.xml |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 94effbe..9f9164c 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -192,7 +192,9 @@
         ira.url,
         ira.url_s,
         ira.temp_url_pdf,
-        iiq.is_copper
+        iiq.is_copper,
+        iiq.is_split_order,
+        iiq.update_batch_no
         FROM
         ins_order io
         LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
@@ -463,7 +465,8 @@
             ifs.id inventoryQuantityId,
             ifs.buy_unit_meas buyUnitMeas,
             io.test_quantity testQuantity,
-            ifs.buy_unit_meas buyUnitMeas
+            ifs.buy_unit_meas buyUnitMeas,
+            ifs.declare_date declareDate
         FROM
             ifs_inventory_quantity ifs
                 LEFT JOIN ins_order io ON ifs.id = io.ifs_inventory_id
@@ -555,9 +558,6 @@
         <if test="repetitionTag != null and repetitionTag != ''">
             and ip.repetition_tag = #{repetitionTag}
         </if>
-        <if test="isDisqualification != null and isDisqualification != ''">
-            and ip.ins_result = 0
-        </if>
         order by sort asc
     </select>
 
@@ -572,9 +572,6 @@
         and ins_fibers_id is null
         and standard_method_list_id is not null
         and ip.raw_material_tag = #{rawMaterialTag}
-        <if test="isDisqualification != null and isDisqualification != ''">
-            and ip.ins_result = 0
-        </if>
         order by sort asc
     </select>
 

--
Gitblit v1.9.3