增加DeliveryReserve处理，预留成功默认返回2010

src/main/java/com/neotel/smfcore/core/device/util/DataCache.java

@@ -811,6 +811,9 @@ public class DataCache {
         return availableStorageIds;
         return availableStorageIds;
     }
     }
     public List<String> getAvailableStorageIds(List<String> cidList) {
     public List<String> getAvailableStorageIds(List<String> cidList) {
+        if(cidList==null||cidList.size()<=0){
+            return  getAvailableStorageIds();
+        }
         List<String> availableStorageIds = new ArrayList<>();
         List<String> availableStorageIds = new ArrayList<>();
         for (Storage storage : getAllStorage().values()) {
         for (Storage storage : getAllStorage().values()) {
             if(!cidList.contains(storage)){
             if(!cidList.contains(storage)){

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

@@ -483,7 +483,7 @@ public class LiteOrderCache {
         CHECKOUT_TYPE checkoutType = dataCache.getCheckOutType();
         CHECKOUT_TYPE checkoutType = dataCache.getCheckOutType();
 
 
 
 
-        if(needCheck&&(shortageCheck(cacheOrder,outBom))) {
+        if(needCheck&&(shortageCheck(cacheOrder,outBom,cidList))) {
 
 
             return "smfcore.order.out.noTask";
             return "smfcore.order.out.noTask";
         }
         }
@@ -584,11 +584,11 @@ public class LiteOrderCache {
         return "";
         return "";
     }
     }
 
 
-    public boolean shortageCheck(LiteOrder cacheOrder, boolean outBom) {
+    public boolean shortageCheck(LiteOrder cacheOrder, boolean outBom,List<String> cidList) {
         String orderNo = cacheOrder.getOrderNo();
         String orderNo = cacheOrder.getOrderNo();
         boolean shortReel=false;
         boolean shortReel=false;
         try {
         try {
-            List<String> availableStorageIds = dataCache.getAvailableStorageIds();
+            List<String> availableStorageIds = dataCache.getAvailableStorageIds(cidList);
             CHECKOUT_TYPE checkoutType = dataCache.getCheckOutType();
             CHECKOUT_TYPE checkoutType = dataCache.getCheckOutType();
 
 
             log.info("工单[" + orderNo + "]出库前需要进行缺料检查"); //需要过滤掉刚刚查找到的库位号
             log.info("工单[" + orderNo + "]出库前需要进行缺料检查"); //需要过滤掉刚刚查找到的库位号
@@ -668,6 +668,9 @@ public class LiteOrderCache {
             liteOrderManager.save(cacheOrder);
             liteOrderManager.save(cacheOrder);
             liteOrderMap.put(cacheOrder.getOrderNo(), cacheOrder);
             liteOrderMap.put(cacheOrder.getOrderNo(), cacheOrder);
             log.info("工单[" + orderNo + "]缺料，直接关闭工单 ");
             log.info("工单[" + orderNo + "]缺料，直接关闭工单 ");
+        }else {
+
+            log.info("工单[" + orderNo + "]缺料检查完成OK ");
         }
         }
         return shortReel;
         return shortReel;
     }
     }
@@ -864,7 +867,7 @@ public class LiteOrderCache {
             return "ok";
             return "ok";
         }
         }
 
 
-        if(needCheck&&(shortageCheck(cacheOrder,outBom))) {
+        if(needCheck&&(shortageCheck(cacheOrder,outBom,cidList))) {
             return "smfcore.order.out.noTask";
             return "smfcore.order.out.noTask";
         }
         }