1.UID查询输入数量区间报错修改

2.安全库存计算错误问题修改。
3.齐套缺料数量修改。

src/main/java/com/neotel/smfcore/core/order/OrderPnCache.java

@@ -91,7 +91,7 @@ public class OrderPnCache {
         if(orderPnInfoMap!=null&&orderPnInfoMap.size()>0){
         if(orderPnInfoMap!=null&&orderPnInfoMap.size()>0){
             long timeSpans=System.currentTimeMillis()-lastUpdateDate.getTime();
             long timeSpans=System.currentTimeMillis()-lastUpdateDate.getTime();
             int m=(int)(timeSpans/1000/60);
             int m=(int)(timeSpans/1000/60);
-            if(m<10){
+            if(m<5){
                 return false;
                 return false;
             }
             }
         }
         }
@@ -128,7 +128,7 @@ public class OrderPnCache {
 
 
 
 
         //查询总库存
         //查询总库存
-        Map<String, InventoryItem> inventoryItemMap = dataCache.getAllInventory(new ArrayList<>(), "");
+        Map<String, InventoryItem> inventoryItemMap = dataCache.getAllInventory(null, "");
         List<String> pnList = new ArrayList<>(needPnMap.keySet());
         List<String> pnList = new ArrayList<>(needPnMap.keySet());
 
 
         for (String pn : pnList
         for (String pn : pnList

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

@@ -179,7 +179,7 @@ public class MaterialStockController {
 //                    int needReel = com.getMinStoreNum() / dto.getAmount();
 //                    int needReel = com.getMinStoreNum() / dto.getAmount();
 //                    dto.setSupplementReel(needReel);
 //                    dto.setSupplementReel(needReel);
 //                }
 //                }
-                dto.setSupplementReel(com.getMinStoreNum() - dto.getStockReel());
+                dto.setSupplementReel(com.getSafetyStoreNum() - dto.getStockReel());
             }
             }
             if (needSupplement) {
             if (needSupplement) {
                 if (dto.getSupplementReel() > 0) {
                 if (dto.getSupplementReel() > 0) {

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

@@ -274,7 +274,7 @@ public class StoragePosController {
         return new ResponseEntity<>(HttpStatus.OK);
         return new ResponseEntity<>(HttpStatus.OK);
     }
     }
 
 
-    private Query getPosFindCriteria(StoragePosFindCriteria criteria){
+    private Query getPosFindCriteria(StoragePosFindCriteria criteria) {
         if (ObjectUtil.isNotEmpty(criteria.getStorageId()) && criteria.getStorageId().equals("0")) {
         if (ObjectUtil.isNotEmpty(criteria.getStorageId()) && criteria.getStorageId().equals("0")) {
             criteria.setStorageId(null);
             criteria.setStorageId(null);
         }
         }
@@ -296,11 +296,11 @@ public class StoragePosController {
             }
             }
         }
         }
 
 
-        if(criteria.getMinAmount()!=null){
+        if (criteria.getMinAmount() != null && criteria.getMaxAmount() != null) {
+            baseCriteria.and("barcode.amount").gte(criteria.getMinAmount()).lte(criteria.getMaxAmount());
+        } else if (criteria.getMinAmount() != null) {
             baseCriteria.and("barcode.amount").gte(criteria.getMinAmount());
             baseCriteria.and("barcode.amount").gte(criteria.getMinAmount());
-        }
-
-        if(criteria.getMaxAmount()!=null){
+        } else if (criteria.getMaxAmount() != null) {
             baseCriteria.and("barcode.amount").lte(criteria.getMaxAmount());
             baseCriteria.and("barcode.amount").lte(criteria.getMaxAmount());
         }
         }