库存信息查询增加入库时间的查询条件

src/main/java/com/th/demo/controller/ware/StoreController.java

@@ -99,6 +99,8 @@ public class StoreController {
                               String materialName,
                              String standard,
                              String customerName,
+                             String fromDate,
+                              String toDate,
                               HttpServletRequest request) {
 
         try {
@@ -111,6 +113,8 @@ public class StoreController {
                     materialName,
                     standard,
                       customerName,
+                    fromDate,
+                    toDate,
                     userId,
                     belongId);
         } catch (Exception ex) {

src/main/java/com/th/demo/mapping/ware/StoreMapper.java

@@ -31,7 +31,7 @@ public interface StoreMapper {
 
     Store selectByOutId(String id,String noUserParam,String userId, String belongId);
 
-    List<Store> selectStore(String wareName, String stackName, String model, String materialName, String standard,   String customerName, String userId,String belongId);
+    List<Store> selectStore(String wareName, String stackName, String model, String materialName, String standard,   String customerName, String fromDate,   String toDate, String userId,String belongId);
 
     int updateForUpDownByLayer(String wareName, String stackName, String userId, String belongId, int min, int max, int i);
 

src/main/java/com/th/demo/service/impl/ware/StoreServiceImpl.java

@@ -79,10 +79,12 @@ public class StoreServiceImpl implements StoreService {
                              String materialName,
                              String standard,
                              String customerName,
+                             String fromDate,
+                             String toDate,
                              String userId,
                              String belongId) {
         PageHelper.startPage(page, rows);
-        List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,    customerName,   userId,belongId);
+        List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,    customerName,fromDate, toDate,  userId,belongId);
         PageInfo<Store> pageInfo = new PageInfo<>(list);
         result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
         return result;

src/main/java/com/th/demo/service/ware/StoreService.java

@@ -11,7 +11,7 @@ public interface StoreService {
     
     String modify(String json, String userId, String belongId);
 
-    String queryStore(int page,int rows,String wareName,String stackName,String model,String materialName,String standard,  String customerName, String userId,String belongId);
+    String queryStore(int page,int rows,String wareName,String stackName,String model,String materialName,String standard,  String customerName,String fromDate,  String toDate, String userId,String belongId);
 
     String modifyCustomer(String id,String customerNameOld,String customerNameNew);
 

src/main/resource/mapper/ware/StoreMapper.xml

@@ -438,11 +438,14 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
     and  c.name like concat('%',#{param4,jdbcType=VARCHAR},'%')
     and  c.standard like concat('%',#{param5,jdbcType=VARCHAR},'%')
     and  d.name like concat('%',#{param6,jdbcType=VARCHAR},'%')
-    and t.belong_id = #{param8,jdbcType=VARCHAR}
+    and t.belong_id = #{param10,jdbcType=VARCHAR}
     and t.cancel_flag = '0'
     and t.out_flag = '0'
+      <if test="param7 != null and param7 != '' and param8 != null and param8 != ''">
+      and t.add_time between #{param7,jdbcType=TIMESTAMP} and #{param8,jdbcType=TIMESTAMP}
+      </if>
     and t.ware_id in (
-    select m.ware_id from t_maint_userware m  where m.user_id = #{param7,jdbcType=VARCHAR}
+    select m.ware_id from t_maint_userware m  where m.user_id = #{param9,jdbcType=VARCHAR}
      )
     order by b.code,t.layer desc
   </select>