From 2996fbaee724d48a782f8fe9fd8995cef92350d5 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Sat, 25 Jun 2022 12:46:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E9=A2=84=E9=AA=8C=E6=94=B6=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=9F=A5=E8=AF=A2=EF=BC=8C=E8=A7=84=E6=A0=BC=E5=9E=8B?=
 =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mybatis/mapper/inventory/InvPreInProductDao.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
index eb1fdd6..b138016 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
@@ -150,7 +150,7 @@
             </if>
 
             <if test="ggxh != '' and ggxh != null">
-                AND basic_products.ggxh = #{ggxh}
+                AND basic_products.ggxh like concat('%',#{ggxh},'%')
             </if>
             <if test="batchNo != '' and batchNo != null">
                 AND inv_prein_product.batchNo = #{batchNo}

From 6b1690ec2e19efedd5aa2476a7ebd3a8cab38d2b Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Sat, 25 Jun 2022 13:13:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E7=BC=BA=E5=A4=B1?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=A8=A1=E7=B3=8A?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/inventory/InvPreInProductDao.xml      | 9 ++++++---
 .../resources/mybatis/mapper/inventory/InvProductDao.xml | 5 ++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
index b138016..616d9f4 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
@@ -134,10 +134,13 @@
         <where>
             basic_products.diType=1
             <if test="cpmctymc != '' and cpmctymc != null">
-                AND basic_products.cpmctymc = #{cpmctymc}
+                AND basic_products.cpmctymc like concat('%',#{cpmctymc},'%')
+            </if>
+            <if test="productsName != null and productsName != ''">
+                AND basic_products.cpmctymc like concat('%',#{productsName},'%')
             </if>
             <if test="nameCode != '' and nameCode != null">
-                AND basic_products.nameCode = #{nameCode}
+                AND basic_products.nameCode like concat('%',#{nameCode},'%')
             </if>
             <if test="relIdFk != '' and relIdFk != null">
                 AND inv_prein_product.relIdFk = #{relIdFk}
@@ -153,7 +156,7 @@
                 AND basic_products.ggxh like concat('%',#{ggxh},'%')
             </if>
             <if test="batchNo != '' and batchNo != null">
-                AND inv_prein_product.batchNo = #{batchNo}
+                AND inv_prein_product.batchNo like concat('%',#{batchNo},'%')
             </if>
             <if test="productionDate != '' and productionDate != null">
                 AND inv_prein_product.productionDate = #{productionDate}
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
index 9ee5fdb..adf7946 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
@@ -130,11 +130,14 @@
         left join inv_warehouse_sub on inv_warehouse_sub.code = inv_product.invWarehouseCode
         <where>
             basic_products.diType=1
+            <if test="cpmctymc != null and cpmctymc != ''">
+                AND basic_products.cpmctymc like concat('%',#{cpmctymc},'%')
+            </if>
             <if test="productsName != '' and productsName != null">
                 AND inv_product.productsName like concat('%',#{productsName},'%')
             </if>
             <if test="nameCode != '' and nameCode != null">
-                AND inv_product.nameCode = #{nameCode}
+                AND inv_product.nameCode like concat('%', #{nameCode}, '%')
             </if>
             <if test="relIdFk != '' and relIdFk != null">
                 AND inv_product.relIdFk = #{relIdFk}