1.排除虚拟仓 入料机构入库

2.呼叫空箱排除虚拟仓

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java

@@ -430,9 +430,14 @@ public class CDeviceController {
         List<DataLog> dataLogList = taskService.getAllTasks();
         List<DataLog> dataLogList = taskService.getAllTasks();
         for (DataLog dataLog : dataLogList) {
         for (DataLog dataLog : dataLogList) {
             if (dataLog.isWait() && dataLog.isCheckOutTask()) {
             if (dataLog.isWait() && dataLog.isCheckOutTask()) {
+                //判断是不是虚拟仓
+                String storageId = dataLog.getStorageId();
+                Storage storage = dataCache.getStorageById(storageId);
+                if (storage != null && !storage.isVirtual()){
                     needSendList.add(dataLog);
                     needSendList.add(dataLog);
                 }
                 }
             }
             }
+        }
 
 
         return needSendList;
         return needSendList;
     }
     }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/util/BoxHandleUtil.java

@@ -189,6 +189,15 @@ public class BoxHandleUtil {
         c.and("barcode.status").is(BARCODE_STATUS.IN_STORE);
         c.and("barcode.status").is(BARCODE_STATUS.IN_STORE);
         c.and("barcode.barcode").in(boxList);
         c.and("barcode.barcode").in(boxList);
 
 
+        List<String> storageIdList = new ArrayList<>();
+        for (Storage storage : dataCache.getAllStorage().values()) {
+            if (!storage.isVirtual()){
+                storageIdList.add(storage.getId());
+            }
+        }
+
+        c.and("storageId").in(storageIdList);
+
         if (needBinCodeList != null && !needBinCodeList.isEmpty()) {
         if (needBinCodeList != null && !needBinCodeList.isEmpty()) {
 
 
             List<Criteria> criteriaList = new ArrayList<>();
             List<Criteria> criteriaList = new ArrayList<>();
@@ -340,9 +349,11 @@ public class BoxHandleUtil {
         List<String> cidList = new ArrayList<>();
         List<String> cidList = new ArrayList<>();
         List<Storage> storageList = new ArrayList<>();
         List<Storage> storageList = new ArrayList<>();
         for (Storage storage : dataCache.getAllStorage().values()) {
         for (Storage storage : dataCache.getAllStorage().values()) {
+            if (!storage.isVirtual()) {
                 storageList.add(storage);
                 storageList.add(storage);
                 cidList.add(storage.getCid());
                 cidList.add(storage.getCid());
             }
             }
+        }
 
 
         pos = taskService.findEmptyPosForPutIn(storageList, boxBarcode, "", "");
         pos = taskService.findEmptyPosForPutIn(storageList, boxBarcode, "", "");
         if (pos == null) {
         if (pos == null) {