呆滞物料天数修改。呆滞物料和过期物料搜索修改。

src/main/java/com/neotel/smfcore/core/barcode/service/po/Barcode.java

@@ -318,7 +318,8 @@ public class Barcode extends BasePo implements Serializable {
     public void updateSluggishTime(int sluggishDay ){
     public void updateSluggishTime(int sluggishDay ){
         if(sluggishDay>0){
         if(sluggishDay>0){
             long maxTime = sluggishDay * 24  * 60 * 60 * 1000;
             long maxTime = sluggishDay * 24  * 60 * 60 * 1000;
-            setSluggishTime(  new Date(putInTime + maxTime));
+            //使用最后一次入库时间+天数
+            setSluggishTime(  new Date(putInDate.getTime() + maxTime));
         }else{
         }else{
             setSluggishTime(null);
             setSluggishTime(null);
         }
         }

src/main/java/com/neotel/smfcore/core/storage/rest/MaterialStockController.java

@@ -94,9 +94,12 @@ public class MaterialStockController {
         }
         }
         Query query = QueryHelp.getQuery(criteria);
         Query query = QueryHelp.getQuery(criteria);
         Criteria baseCriteria = Criteria.where("used").is(true);
         Criteria baseCriteria = Criteria.where("used").is(true);
-
-        //需要查询已经超过过期日期的物料
-        baseCriteria.and("barcode.expireDate").lte(new Date());
+        if (criteria.getExpireDate() != null && criteria.getExpireDate().getFrom() != null && criteria.getExpireDate().getTo() != null) {
+            //根据过滤时间查询
+        } else {
+            //需要查询已经超过过期日期的物料
+            baseCriteria.and("barcode.expireDate").lte(new Date());
+        }
 //        baseCriteria.and("barcode.sluggishTime").gte(new Date());
 //        baseCriteria.and("barcode.sluggishTime").gte(new Date());
 
 
         query.addCriteria(baseCriteria);
         query.addCriteria(baseCriteria);
@@ -116,8 +119,12 @@ public class MaterialStockController {
         Query query = QueryHelp.getQuery(criteria);
         Query query = QueryHelp.getQuery(criteria);
         Criteria baseCriteria = Criteria.where("used").is(true);
         Criteria baseCriteria = Criteria.where("used").is(true);
 
 
-        //需要查询已经过呆滞日期的物料
-        baseCriteria.and("barcode.sluggishTime").exists(true).lte(new Date());
+        if (criteria.getSluggishTime() != null && criteria.getSluggishTime().getFrom() != null && criteria.getSluggishTime().getTo() != null) {
+                //根据过滤时间查询
+        } else {
+            //需要查询已经过呆滞日期的物料
+            baseCriteria.and("barcode.sluggishTime").exists(true).lte(new Date());
+        }
 //        baseCriteria.and("barcode.sluggishTime").gte(new Date());
 //        baseCriteria.and("barcode.sluggishTime").gte(new Date());
 
 
         query.addCriteria(baseCriteria);
         query.addCriteria(baseCriteria);

src/main/java/com/neotel/smfcore/core/storage/rest/query/StoragePosFindCriteria.java

@@ -18,17 +18,21 @@ public class StoragePosFindCriteria {
     private String blurry;
     private String blurry;
 
 
     @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "barcode.putInDate")
     @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "barcode.putInDate")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private BetweenData<Date> updateDate;
     private BetweenData<Date> updateDate;
 
 
     @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "barcode.putInDate")
     @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "barcode.putInDate")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private BetweenData<Date> putInDate;
     private BetweenData<Date> putInDate;
 
 
     @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "barcode.expireDate")
     @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "barcode.expireDate")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private BetweenData<Date> expireDate;
     private BetweenData<Date> expireDate;
 
 
+    @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "barcode.sluggishTime")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private BetweenData<Date> sluggishTime;
+
 
 
 
 
     @QueryCondition
     @QueryCondition

src/main/java/com/neotel/smfcore/core/system/rest/SettingsController.java

@@ -181,7 +181,8 @@ public class SettingsController {
                 if(orderSetting.getOrderDir().toLowerCase().startsWith("smb")){
                 if(orderSetting.getOrderDir().toLowerCase().startsWith("smb")){
 
 
                 }else{
                 }else{
-                    throw new ValidateException("smfcore.enterCorrectFolder", "请输入正确的文件夹" );
+                    return ResultBean.newErrorResult(-1,"smfcore.enterCorrectFolder","请输入正确的文件夹");
+//                    throw new ValidateException("smfcore.enterCorrectFolder", "请输入正确的文件夹" );
                 }
                 }
             }
             }
         }
         }