11/15 供应商药品库存查询

src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java

@@ -112,4 +112,9 @@ public class FilterInvProductRequest extends ListPageRequest {
      */
     private Integer productsType = 1;
 
+    private String keyWords;
+    private String prepnSpec;
+
+
+
 }

src/main/resources/mybatis/mapper/inv/invProductDao.xml

@@ -54,7 +54,9 @@
                 AND bp.productsType = #{productsType}
             </if>
             <if test="ggxh != null and ggxh != ''">
-                AND bp.ggxh like concat('%', #{ggxh}, '%')
+                AND (
+                bp.ggxh like concat('%', #{ggxh}, '%')
+                or bp.bzgg like concat('%', #{ggxh}, '%'))
             </if>
             <if test="batchNo != null and batchNo != ''">
                 AND ip.batchNo like concat('%', #{batchNo}, '%')
@@ -66,11 +68,16 @@
                 AND ip.expireDate = #{expireDate}
             </if>
             <if test="ylqxzcrbarmc != null and ylqxzcrbarmc != ''">
-                AND bp.ylqxzcrbarmc like concat('%', #{ylqxzcrbarmc}, '%')
+                AND (
+                bp.ylqxzcrbarmc like concat('%', #{ylqxzcrbarmc}, '%')
+                or bp.manufactory like concat('%', #{ylqxzcrbarmc}, '%'))
             </if>
             <if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
                 AND bp.zczbhhzbapzbh like concat('%', #{zczbhhzbapzbh}, '%')
             </if>
+            <if test="prepnSpec != null and prepnSpec != ''">
+                AND bp.prepnSpec like concat('%', #{prepnSpec}, '%')
+            </if>
             <if test="customerId != null and customerId != ''">
                 AND ip.customerId = #{customerId}
             </if>
@@ -101,6 +108,17 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="keyWords != '' and keyWords != null">
+                AND (
+                bp.nameCode like concat('%', #{keyWords}, '%')
+                or bp.cpmctymc like concat('%', #{keyWords}, '%')
+                or bp.bzgg like concat('%', #{keyWords}, '%')
+                or bp.ggxh like concat('%', #{keyWords}, '%')
+                or ip.batchNo like concat('%', #{keyWords}, '%')
+                or bp.prepnSpec like concat('%', #{keyWords}, '%')
+                or bp.ylqxzcrbarmc like concat('%', #{keyWords}, '%')
+                or bp.manufactory LIKE concat('%', #{keyWords}, '%'))
+            </if>
         </where>
         GROUP BY ip.relIdFk, ip.batchNo, ip.supId, ip.price
         order by ip.updateTime desc