工单出库,注释去掉

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

@@ -11,6 +11,7 @@ import com.neotel.smfcore.core.barcode.service.manager.IComponentManager;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Component;
 import com.neotel.smfcore.core.barcode.service.po.Component;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
+import com.neotel.smfcore.core.device.bean.StatusBean;
 import com.neotel.smfcore.core.inList.util.InListCache;
 import com.neotel.smfcore.core.inList.util.InListCache;
 import com.neotel.smfcore.core.language.service.bean.LanguageInfo;
 import com.neotel.smfcore.core.language.service.bean.LanguageInfo;
 import com.neotel.smfcore.core.language.util.MessageUtils;
 import com.neotel.smfcore.core.language.util.MessageUtils;
@@ -26,6 +27,7 @@ import com.neotel.smfcore.core.system.service.dao.ICacheItemDao;
 import com.neotel.smfcore.core.system.service.dao.ISettingsDao;
 import com.neotel.smfcore.core.system.service.dao.ISettingsDao;
 import com.neotel.smfcore.core.system.service.po.CacheItem;
 import com.neotel.smfcore.core.system.service.po.CacheItem;
 import com.neotel.smfcore.core.system.service.po.Settings;
 import com.neotel.smfcore.core.system.service.po.Settings;
+import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -662,10 +664,10 @@ public class DataCache {
     public List<String> getAvailableStorageIds(){
     public List<String> getAvailableStorageIds(){
         List<String> availableStorageIds = new ArrayList<>();
         List<String> availableStorageIds = new ArrayList<>();
         for (Storage storage : getAllStorage().values()) {
         for (Storage storage : getAllStorage().values()) {
-            /*StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());
+            StatusBean bean = DevicesStatusUtil.getStatusBean(storage.getCid());
             if (bean == null || bean.timeOut() || !bean.isAvailable()) {
             if (bean == null || bean.timeOut() || !bean.isAvailable()) {
                 continue;
                 continue;
-            }*/
+            }
             availableStorageIds.add(storage.getId());
             availableStorageIds.add(storage.getId());
         }
         }
         return availableStorageIds;
         return availableStorageIds;

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

@@ -422,9 +422,9 @@ public class LiteOrderCache {
             }
             }
             //判断当前料仓,状态是否正常
             //判断当前料仓,状态是否正常
             StatusBean statusBean = DevicesStatusUtil.getStatusBean(storage.getCid());
             StatusBean statusBean = DevicesStatusUtil.getStatusBean(storage.getCid());
-            /*if (statusBean == null || statusBean.getStatus() != BOX_STATUS.READY) {
+            if (statusBean == null || statusBean.getStatus() != BOX_STATUS.READY) {
                 continue;
                 continue;
-            }*/
+            }
             List<DataLog> allTasksByCid = taskService.getAllTasksByCid(storage.getCid());
             List<DataLog> allTasksByCid = taskService.getAllTasksByCid(storage.getCid());
             for (DataLog task : allTasksByCid) {
             for (DataLog task : allTasksByCid) {
                 /*if (!task.isFinished()
                 /*if (!task.isFinished()