diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java
index d153271e..562e5198 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/CheckOrderUtils.java
@@ -259,15 +259,15 @@ public class CheckOrderUtils {
                     if (vailOrderEntity.getGoodsid().equals(udiRelevanceResponse.getThirdId4() + ""))
                         return null;
                 }
-                return "产品ID不匹配！";
+                return vailOrderEntity.getCoName() + "产品ID不匹配！";
             }
 
 
         } else {
-            return "产品ID不匹配！";
+            return vailOrderEntity.getCoName() + "产品ID不匹配！";
         }
 
-        return "产品信息未找到！";
+        return vailOrderEntity.getCoName() + "产品信息未找到！";
     }
 
     public String checkBatchNo(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) {
@@ -279,7 +279,7 @@ public class CheckOrderUtils {
         } else {
             return myErpOrder.getCoName() + "批次号不匹配！";
         }
-        return "批次号不匹配！";
+        return myErpOrder.getCoName() + "批次号不匹配！";
     }
 
     public String checkProductDate(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) {
@@ -291,7 +291,7 @@ public class CheckOrderUtils {
         } else {
             return myErpOrder.getCoName() + "生产日期不匹配！";
         }
-        return "生产日期不匹配！";
+        return myErpOrder.getCoName() + "生产日期不匹配！";
     }
 
 
@@ -304,7 +304,7 @@ public class CheckOrderUtils {
         } else {
             return myErpOrder.getCoName() + "失效日期不匹配！";
         }
-        return "失效日期不匹配！";
+        return myErpOrder.getCoName() + "失效日期不匹配！";
     }
 
 
@@ -317,7 +317,7 @@ public class CheckOrderUtils {
         } else {
             return myErpOrder.getCoName() + "仓位号不匹配！";
         }
-        return "仓位号不匹配！";
+        return myErpOrder.getCoName() + "仓位号不匹配！";
     }
 
     public String checkCount(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) {
diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java
index 5d28d9d7..a9de4711 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java
@@ -39,6 +39,9 @@ public class StockOrderFilterRequest extends ListPageRequest {
     private boolean entrustEnd;
     private String localAction;
 
+    private String startDate; //起始日期
+    private String endDate; //结束日期
+
 
     private String orderId;
 }
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml
index 6ef649c4..b3cead74 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml
@@ -355,7 +355,8 @@
         bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,thirdProductNo,addType,deviceRecordKey,isUseDy,thirdProductName,
         cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
         ,diType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,
-        ybbm,spmc,cphhhbh,cpms,cpbsbmtxmc,isNewest,updateTime
+        ybbm,spmc,cphhhbh,cpms,cpbsbmtxmc,isNewest,updateTime,cplx,hchzsb
+,sfwblztlcp,cgzmraqxgxx,sfbjwycxsy,zdcfsycs,sfwwjbz,syqsfxyjxmj,qtxxdwzlj,mjfs
         )
         values
             (
@@ -396,7 +397,18 @@
         #{cpms},
         #{cpbsbmtxmc},
         #{isNewest},
-        #{updateTime}
+        #{updateTime},
+        #{hchzsb},
+        #{cplx},
+        #{hchzsb},
+        #{sfwblztlcp},
+        #{cgzmraqxgxx},
+        #{sfbjwycxsy},
+        #{zdcfsycs},
+        #{sfwwjbz},
+        #{syqsfxyjxmj},
+        #{qtxxdwzlj},
+        #{mjfs}
         )
     </insert>
 
@@ -409,7 +421,8 @@
         bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,thirdProductNo,addType,deviceRecordKey,isUseDy,thirdProductName,
         cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
         ,diType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,
-        ybbm,spmc,cphhhbh,cpms,cpbsbmtxmc,isNewest,updateTime
+        ybbm,spmc,cphhhbh,cpms,cpbsbmtxmc,isNewest,updateTime,cplx,hchzsb
+        ,sfwblztlcp,cgzmraqxgxx,sfbjwycxsy,zdcfsycs,sfwwjbz,syqsfxyjxmj,qtxxdwzlj,mjfs
         ) values
 
         <foreach collection="datas" item="item" index="index"
@@ -454,7 +467,8 @@
             #{item.cpms},
             #{item.cpbsbmtxmc},
             #{item.isNewest},
-            #{item.updateTime}
+            #{item.updateTime},#{item.cplx},#{item.hchzsb},#{item.sfwblztlcp},#{item.cgzmraqxgxx},#{item.sfbjwycxsy},#{item.zdcfsycs}
+            ,#{item.sfwwjbz},#{item.syqsfxyjxmj},#{item.qtxxdwzlj},#{item.mjfs}
             )
         </foreach>
     </insert>
@@ -502,7 +516,17 @@
             <if test="diType != null">diType=#{diType},</if>
             <if test="isNewest != null">isNewest=#{isNewest},</if>
             <if test="updateTime != null">updateTime=#{updateTime},</if>
-
+            <if test="cplx != null">cplx=#{cplx},</if>
+            <if test="hchzsb != null">hchzsb=#{hchzsb},</if>
+            <if test="sfwblztlcp != null">sfwblztlcp=#{sfwblztlcp},</if>
+            <if test="cgzmraqxgxx != null">cgzmraqxgxx=#{cgzmraqxgxx},</if>
+            <if test="sfbjwycxsy != null">sfbjwycxsy=#{sfbjwycxsy},</if>
+            <if test="zdcfsycs != null">zdcfsycs=#{zdcfsycs},</if>
+            <if test="sfwwjbz != null">sfwwjbz=#{sfwwjbz},</if>
+            <if test="syqsfxyjxmj != null">syqsfxyjxmj=#{syqsfxyjxmj},
+            </if>
+            <if test="qtxxdwzlj != null">qtxxdwzlj=#{qtxxdwzlj},</if>
+            <if test="mjfs != null">mjfs=#{mjfs},</if>
         </set>
         WHERE id = #{id}
     </update>
@@ -521,6 +545,18 @@
             <if test="cpbsbmtxmc != null">cpbsbmtxmc=#{cpbsbmtxmc},</if>
             <if test="isNewest != null">isNewest=#{isNewest},</if>
             <if test="updateTime != null">updateTime=#{updateTime},</if>
+            <if test="cplx != null">cplx=#{cplx},</if>
+            <if test="hchzsb != null">hchzsb=#{hchzsb},
+            </if>
+            <if test="sfwblztlcp != null">sfwblztlcp=#{sfwblztlcp},</if>
+            <if test="cgzmraqxgxx != null">cgzmraqxgxx=#{cgzmraqxgxx},</if>
+            <if test="sfbjwycxsy != null">sfbjwycxsy=#{sfbjwycxsy},</if>
+            <if test="zdcfsycs != null">zdcfsycs=#{zdcfsycs},</if>
+            <if test="sfwwjbz != null">sfwwjbz=#{sfwwjbz},</if>
+            <if test="syqsfxyjxmj != null">syqsfxyjxmj=#{syqsfxyjxmj},
+            </if>
+            <if test="qtxxdwzlj != null">qtxxdwzlj=#{qtxxdwzlj},</if>
+            <if test="mjfs != null">mjfs=#{mjfs},</if>
         </set>
         WHERE uuid = #{uuid}
     </update>
diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
index 626ad355..d014f790 100644
--- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
@@ -203,6 +203,15 @@
             <if test="endTime!=null and endTime!=''">
                 <![CDATA[  and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endTime}, '%Y-%m-%d')    ]]>
             </if>
+
+
+            <if test="startDate!=null and startDate!=''">
+                <![CDATA[   and DATE_FORMAT(billdate, '%Y-%m-%d')>=  DATE_FORMAT(#{startDate}, '%Y-%m-%d')   ]]>
+            </if>
+            <if test="endDate!=null and endDate!=''">
+                <![CDATA[  and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endDate}, '%Y-%m-%d')    ]]>
+            </if>
+
             <if test="userId!=null">
                 and inv_warehouse_user.userId =#{userId}
             </if>