1.添加缺失查询条件，部分字段修改为模糊查询

api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml

@@ -131,10 +131,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}
@@ -147,10 +150,10 @@
             </if>
 
             <if test="ggxh != '' and ggxh != null">
-                AND basic_products.ggxh = #{ggxh}
+                AND basic_products.ggxh = 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}

api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml

@@ -126,11 +126,14 @@
         left join inv_warehouse_sub on inv_warehouse_sub.parentId = inv_warehouse.code
         <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}