diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvPreProductRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvPreProductRequest.java
index a1214ac9f..3817162fb 100644
--- a/src/main/java/com/glxp/api/req/inv/FilterInvPreProductRequest.java
+++ b/src/main/java/com/glxp/api/req/inv/FilterInvPreProductRequest.java
@@ -111,4 +111,6 @@ public class FilterInvPreProductRequest extends ListPageRequest {
 
     private String diCode;
     private Integer filterNoInv;
+
+    private String keyWords;
 }
diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvPreinProductRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvPreinProductRequest.java
index 8a25e6b6a..85cb5dde9 100644
--- a/src/main/java/com/glxp/api/req/inv/FilterInvPreinProductRequest.java
+++ b/src/main/java/com/glxp/api/req/inv/FilterInvPreinProductRequest.java
@@ -117,4 +117,6 @@ public class FilterInvPreinProductRequest extends ListPageRequest {
 
     private Integer filterNoInv;
 
+    private String keyWords;
+
 }
diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java
index 9104b0cf6..69f8f591a 100644
--- a/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java
+++ b/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java
@@ -147,4 +147,8 @@ public class FilterInvProductRequest extends ListPageRequest {
      */
     private Integer productsType = 1;//默认是耗材
 
+    private String keyWords;
+    private String bzgg;
+    private String prepnSpec;
+
 }
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
index 13a73d147..06780de7a 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
@@ -133,8 +133,9 @@
                 or bp.zczbhhzbapzbh LIKE concat('%', #{keyWords}, '%')
                 or bp.manufactory LIKE concat('%', #{keyWords}, '%')
                 or bp.ylqxzcrbarywmc LIKE concat('%', #{keyWords}, '%')
-                or b1.name like concat('%', #{keyWords}, '%'))
-                or aw.name like concat('%', #{keyWords}, '%')
+                or b1.name like concat('%', #{keyWords}, '%')
+                or aw.name like concat('%', #{keyWords}, '%'))
+
             </if>
         </where>
         group by a2.id
diff --git a/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml
index a9298f6fd..d5935cb10 100644
--- a/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml
@@ -85,6 +85,16 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="keyWords != '' and keyWords != null">
+                AND (
+                bp.cpmctymc like concat('%', #{keyWords}, '%')
+                or ipp.nameCode like concat('%', #{keyWords}, '%')
+                or bp.ggxh like concat('%', #{keyWords}, '%')
+                or ipp.batchNo like concat('%', #{keyWords}, '%')
+                or bp.zczbhhzbapzbh like concat('%', #{keyWords}, '%')
+                or bp.ylqxzcrbarmc  like concat('%', #{keyWords}, '%')
+                )
+            </if>
         </where>
         group by ipp.id
     </select>
@@ -305,6 +315,16 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="keyWords != '' and keyWords != null">
+                AND (
+                bp.cpmctymc like concat('%', #{keyWords}, '%')
+                or ipp.nameCode like concat('%', #{keyWords}, '%')
+                or bp.ggxh like concat('%', #{keyWords}, '%')
+                or ipp.batchNo like concat('%', #{keyWords}, '%')
+                or bp.zczbhhzbapzbh like concat('%', #{keyWords}, '%')
+                or bp.ylqxzcrbarmc  like concat('%', #{keyWords}, '%')
+                )
+            </if>
         </where>
         GROUP BY ipp.relId, ipp.batchNo
         order by ipp.updateTime desc
diff --git a/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml
index 9b687383b..79a5bba9b 100644
--- a/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml
@@ -85,6 +85,16 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="keyWords != '' and keyWords != null">
+                AND (
+                bp.cpmctymc like concat('%', #{keyWords}, '%')
+                or ipp.nameCode like concat('%', #{keyWords}, '%')
+                or bp.ggxh like concat('%', #{keyWords}, '%')
+                or ipp.batchNo like concat('%', #{keyWords}, '%')
+                or bp.zczbhhzbapzbh like concat('%', #{keyWords}, '%')
+                or bp.ylqxzcrbarmc  like concat('%', #{keyWords}, '%')
+                )
+            </if>
         </where>
         group by ipp.id
     </select>
@@ -305,6 +315,16 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="keyWords != '' and keyWords != null">
+                AND (
+                bp.cpmctymc like concat('%', #{keyWords}, '%')
+                or ipp.nameCode like concat('%', #{keyWords}, '%')
+                or bp.ggxh like concat('%', #{keyWords}, '%')
+                or ipp.batchNo like concat('%', #{keyWords}, '%')
+                or bp.zczbhhzbapzbh like concat('%', #{keyWords}, '%')
+                or bp.ylqxzcrbarmc  like concat('%', #{keyWords}, '%')
+                )
+            </if>
         </where>
         GROUP BY ipp.relId, ipp.batchNo
         order by ipp.updateTime desc
diff --git a/src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml b/src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml
index 5c086ab1c..4fe5b0a03 100644
--- a/src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml
@@ -65,6 +65,12 @@
             <if test="ggxh != null and ggxh != ''">
                 AND bp.ggxh like concat('%', #{ggxh}, '%')
             </if>
+            <if test="bzgg != null and bzgg != ''">
+                AND bp.bzgg like concat('%', #{bzgg}, '%')
+            </if>
+            <if test="prepnSpec != null and prepnSpec != ''">
+                AND bp.prepnSpec like concat('%', #{prepnSpec}, '%')
+            </if>
             <if test="batchNo != null and batchNo != ''">
                 AND ipp.batchNo like concat('%', #{batchNo}, '%')
             </if>
@@ -75,7 +81,10 @@
                 AND ipp.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}, '%')
@@ -99,6 +108,18 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="keyWords != '' and keyWords != null">
+                AND (
+                bp.cpmctymc like concat('%', #{keyWords}, '%')
+                or ipp.nameCode like concat('%', #{keyWords}, '%')
+                or bp.ggxh like  concat('%', #{keyWords}, '%')
+                or bp.bzgg like  concat('%', #{keyWords}, '%')
+                or bp.prepnSpec LIKE concat('%', #{keyWords}, '%')
+                or ipp.batchNo like concat('%', #{keyWords}, '%')
+                or bp.zczbhhzbapzbh LIKE concat('%', #{keyWords}, '%')
+                or bp.manufactory LIKE concat('%', #{keyWords}, '%')
+                or bp.ylqxzcrbarywmc LIKE concat('%', #{keyWords}, '%'))
+            </if>
         </where>
         GROUP BY ipp.relIdFk, ipp.batchNo
         order by ipp.updateTime desc
diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
index d151e55fd..cf4c7cf1c 100644
--- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
@@ -85,7 +85,10 @@
                 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}, '%')
@@ -124,12 +127,30 @@
             <if test="attributeType != '' and attributeType != null">
                 AND basic_udirel.attributeType = #{attributeType}
             </if>
+            <if test="bzgg != null and bzgg != ''">
+                AND bp.bzgg like concat('%', #{bzgg}, '%')
+            </if>
+            <if test="prepnSpec != null and prepnSpec != ''">
+                AND bp.prepnSpec like concat('%', #{prepnSpec}, '%')
+            </if>
             <if test="invCodes != null and invCodes.size() != 0">
                 AND ip.invCode in
                 <foreach collection="invCodes" item="item" index="index" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
             </if>
+            <if test="keyWords != '' and keyWords != null">
+                AND (
+                bp.cpmctymc like concat('%', #{keyWords}, '%')
+                or ip.nameCode like concat('%', #{keyWords}, '%')
+                or bp.ggxh like  concat('%', #{keyWords}, '%')
+                or bp.bzgg like  concat('%', #{keyWords}, '%')
+                or bp.prepnSpec LIKE concat('%', #{keyWords}, '%')
+                or ip.batchNo like concat('%', #{keyWords}, '%')
+                or bp.zczbhhzbapzbh LIKE concat('%', #{keyWords}, '%')
+                or bp.manufactory LIKE concat('%', #{keyWords}, '%')
+                or bp.ylqxzcrbarywmc LIKE concat('%', #{keyWords}, '%'))
+            </if>
         </where>
         GROUP BY ip.relIdFk, ip.batchNo, ip.supId, ip.price
         order by ip.updateTime desc