1.给CTU发送出入库任务,排除虚拟仓

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

@@ -57,6 +57,10 @@ public class CtuDeviceController {
         for (DataLog dataLog : allTasks) {
         for (DataLog dataLog : allTasks) {
             if (dataLog.isPutInTask()) {
             if (dataLog.isPutInTask()) {
                 if (dataLog.isWait() || dataLog.isExecuting()) {
                 if (dataLog.isWait() || dataLog.isExecuting()) {
+
+                    String storageId = dataLog.getStorageId();
+                    Storage storage = dataCache.getStorageById(storageId);
+                    if (storage != null && !storage.isVirtual()) {
                         CtuTask ctuTask = new CtuTask();
                         CtuTask ctuTask = new CtuTask();
                         ctuTask.setId(dataLog.getId());
                         ctuTask.setId(dataLog.getId());
                         ctuTask.setBoxCode(dataLog.getBarcode());
                         ctuTask.setBoxCode(dataLog.getBarcode());
@@ -70,6 +74,7 @@ public class CtuDeviceController {
                     }
                     }
                 }
                 }
             }
             }
+        }
         return ResultBean.newOkResult(lineToShelfTaskList);
         return ResultBean.newOkResult(lineToShelfTaskList);
     }
     }
 
 
@@ -86,6 +91,10 @@ public class CtuDeviceController {
             }
             }
             if (dataLog.isCheckOutTask()) {
             if (dataLog.isCheckOutTask()) {
                 if (dataLog.isWait() || dataLog.isExecuting()) {
                 if (dataLog.isWait() || dataLog.isExecuting()) {
+
+                    String storageId = dataLog.getStorageId();
+                    Storage storage = dataCache.getStorageById(storageId);
+                    if (storage != null && !storage.isVirtual()) {
                         CtuTask ctuTask = new CtuTask();
                         CtuTask ctuTask = new CtuTask();
                         ctuTask.setId(dataLog.getId());
                         ctuTask.setId(dataLog.getId());
                         ctuTask.setBoxCode(dataLog.getBarcode());
                         ctuTask.setBoxCode(dataLog.getBarcode());
@@ -103,6 +112,7 @@ public class CtuDeviceController {
                     }
                     }
                 }
                 }
             }
             }
+        }
         return ResultBean.newOkResult(shelfToLineTaskList);
         return ResultBean.newOkResult(shelfToLineTaskList);
     }
     }