增加mimoG2验证

src/main/java/com/neotel/smfcore/core/dashboard/box/SmdBoxController.java

@@ -56,7 +56,7 @@ public class SmdBoxController {
             return storage;
             return storage;
         }
         }
         for (Storage stor : dataCache.getAllStorage().values()) {
         for (Storage stor : dataCache.getAllStorage().values()) {
-            if (stor.isBatchStorage()) {
+            if (stor.isBatchStorage()||stor.isMimoG2()) {
                 storage = stor;
                 storage = stor;
                 return storage;
                 return storage;
             }
             }

src/main/java/com/neotel/smfcore/core/dashboard/mimo/SmdBoxMimoController.java

@@ -307,7 +307,7 @@ public class SmdBoxMimoController {
             return storage;
             return storage;
         }
         }
         for (Storage stor : dataCache.getAllStorage().values()) {
         for (Storage stor : dataCache.getAllStorage().values()) {
-            if (stor.isBatchStorage()) {
+            if (stor.isBatchStorage()||stor.isMimoG2()) {
                 storage = stor;
                 storage = stor;
                 return storage;
                 return storage;
             }
             }

src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java

@@ -369,7 +369,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
         Collection<String> operatingPosIds =taskService.excludePosIds();
         Collection<String> operatingPosIds =taskService.excludePosIds();
 
 
 //        是否有出库任务
 //        是否有出库任务
-        if (storage.isSmdDuo() || storage.isBatchStorage()) {
+        if (storage.isSmdDuo() || storage.isBatchStorage()||storage.isMimoG2()) {
             //DUO料仓和MIMO客户端缓存出库任务,入库优先
             //DUO料仓和MIMO客户端缓存出库任务,入库优先
             log.info("从" + storage.getName() + " 中为" + barcode.getBarcode() + "寻找空的仓位");
             log.info("从" + storage.getName() + " 中为" + barcode.getBarcode() + "寻找空的仓位");
             storagePos = storagePosManager.getEmptyPosByStorage(storage, barcode, operatingPosIds);
             storagePos = storagePosManager.getEmptyPosByStorage(storage, barcode, operatingPosIds);

src/main/java/com/neotel/smfcore/core/storage/service/po/Storage.java

@@ -93,6 +93,13 @@ public class Storage extends BasePo implements Serializable {
     }
     }
 
 
     /**
     /**
+     * 是否是MimoG2
+     * @return
+     */
+    public boolean isMimoG2(){
+        return DeviceType.SMD_MIMO_G2.name().equals(type);
+    }
+    /**
      * 是否是单台自动仓
      * 是否是单台自动仓
      */
      */
     public boolean isAuto(){
     public boolean isAuto(){

src/main/java/com/neotel/smfcore/custom/djk20388/DJK20388AGVController.java

@@ -106,7 +106,7 @@ public class DJK20388AGVController {
         Map<String, Storage> storages = dataCache.getAllStorage();
         Map<String, Storage> storages = dataCache.getAllStorage();
         for (Storage storage :
         for (Storage storage :
                 storages.values()) {
                 storages.values()) {
-            if (storage.isBatchStorage()) {
+            if (storage.isBatchStorage()||storage.isMimoG2()) {
                 cid = storage.getCid();
                 cid = storage.getCid();
                 break;
                 break;
             }
             }