From 6c258b0a54b7f846d5fe0fe49012916d667b4250 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 13 Nov 2024 11:35:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/quality/QcCheckReportIncomeMapper.xml    | 2 +-
 .../resources/mapper/quality/QcCheckTaskWarehousingMapper.xml | 4 ++--
 .../src/main/resources/mapper/wms/BaseProductMapper.xml       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml
index 2a278379..be28b322 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml
@@ -75,7 +75,7 @@
             <if test="materialName != null  and materialName != ''">and qct.material_name like concat('%',#{materialName}, '%')</if>
             <if test="supplierCode != null  and supplierCode != ''">and qct.supplier_code = #{supplierCode}</if>
             <if test="supplierName != null  and supplierName != ''">and qct.supplier_name like concat('%',#{supplierName}, '%')</if>
-            <if test="checkLoc != null  and checkLoc != ''">and qct.check_loc = #{checkLoc}</if>
+            <if test="checkLoc != null  and checkLoc != ''">and qct.check_loc like concat('%', #{checkLoc}, '%')</if>
             <if test="checkStatus != null  and checkStatus != ''">and qct.check_status = #{checkStatus}</if>
             <if test="checkManCode != null  and checkManCode != ''">and qct.check_man_code = #{checkManCode}</if>
             <if test="checkManName != null  and checkManName != ''">and qct.check_man_name like concat('%',#{checkManName}, '%')</if>
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml
index a92460ac..843a9b02 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml
@@ -60,8 +60,8 @@
         left join qc_check_type q on q.id = qct.check_type
         left join pro_order_workorder pow on pow.workorder_code = qct.order_no
         <where>
-            <if test="checkNo != null  and checkNo != ''">and qct.check_no = #{checkNo}</if>
-            <if test="incomeBatchNo != null  and incomeBatchNo != ''">and qct.income_batch_no = #{incomeBatchNo}</if>
+            <if test="checkNo != null  and checkNo != ''">and qct.check_no like concat('%', #{checkNo}, '%')</if>
+            <if test="incomeBatchNo != null  and incomeBatchNo != ''">and qct.income_batch_no like concat('%', #{incomeBatchNo}, '%')</if>
             <if test="orderNo != null  and orderNo != ''">and qct.order_no = #{orderNo}</if>
             <if test="workorderCodeSap != null  and workorderCodeSap != ''">and pow.workorder_code_sap like concat('%',#{workorderCodeSap}, '%')</if>
             <if test="materialCode != null  and materialCode != ''">and qct.material_code like concat('%',#{materialCode}, '%') </if>
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml
index 0df2de90..da601737 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml
@@ -152,7 +152,7 @@
             <if test="reportRate != null  and reportRate != ''">and bp.report_rate = #{reportRate}</if>
             <if test="mvgr5 != null  and mvgr5 != ''">and bp.mvgr5 like concat('%', #{mvgr5},'%') </if>
             <if test="cpkType != null  and cpkType != ''">and bpa.cpk_type =#{cpkType} </if>
-            and bp.del_flag = '0'
+            and bp.del_flag = '0' and bp.product_code not like '00000000%'
         </where>
         order by bp.product_code asc
     </select>