1.出库不完成bug修改

2.日志打印有问题的库位

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

@@ -383,6 +383,7 @@ public class NLPShelfHandler extends BaseDeviceHandler{
                                     break;
                                     break;
                                 }
                                 }
                             } catch (Exception e) {
                             } catch (Exception e) {
+                                log.error(e.getMessage());
                                 log.error("库位:" + noReelPosName+"出库出错",e.getMessage());
                                 log.error("库位:" + noReelPosName+"出库出错",e.getMessage());
                                 break;
                                 break;
                             }
                             }

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -5,10 +5,7 @@ import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Maps;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
-import com.neotel.smfcore.common.utils.Constants;
-import com.neotel.smfcore.common.utils.ReelLockPosUtil;
-import com.neotel.smfcore.common.utils.SecurityUtils;
-import com.neotel.smfcore.common.utils.StorageConstants;
+import com.neotel.smfcore.common.utils.*;
 import com.neotel.smfcore.core.barcode.enums.COMPONENT_TYPE;
 import com.neotel.smfcore.core.barcode.enums.COMPONENT_TYPE;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
@@ -333,8 +330,10 @@ public class TaskService {
      */
      */
     public DataLog findExecutingTask(String cid, String posName) {
     public DataLog findExecutingTask(String cid, String posName) {
         for (DataLog task : taskMap.values()) {
         for (DataLog task : taskMap.values()) {
-            if (task.getCid().equals(cid) && task.getPosName().equals(posName)) {
-                return task;
+            if (StringUtils.isNotBlank(task.getPosName())){
+                if (task.getCid().equals(cid) && task.getPosName().equals(posName)) {
+                    return task;
+                }
             }
             }
         }
         }
         return null;
         return null;

src/main/java/com/neotel/smfcore/hikvision_mobile/HikVisionController.java

@@ -516,6 +516,7 @@ public class HikVisionController {
         if (deviceData != null && deviceData.size() == 2) {
         if (deviceData != null && deviceData.size() == 2) {
             List<String> hasReelPosErrorList = deviceData.get(0);
             List<String> hasReelPosErrorList = deviceData.get(0);
             if (hasReelPosErrorList != null && !hasReelPosErrorList.isEmpty()) {
             if (hasReelPosErrorList != null && !hasReelPosErrorList.isEmpty()) {
+                log.info("hasReelPosErrorList-----"+JSON.toJSONString(hasReelPosErrorList));
                 Query query = new Query(Criteria.where("posName").in(hasReelPosErrorList.toArray()));
                 Query query = new Query(Criteria.where("posName").in(hasReelPosErrorList.toArray()));
                 List<StoragePos> posList = storagePosManager.findByQuery(query);
                 List<StoragePos> posList = storagePosManager.findByQuery(query);
                 for (StoragePos pos : posList) {
                 for (StoragePos pos : posList) {
@@ -531,7 +532,7 @@ public class HikVisionController {
                             return true;
                             return true;
                         }
                         }
                     } else {
                     } else {
-                        log.info(posName+"对应的货架位异常");
+                        log.info(pos.getPosName()+"对应的货架位异常");
                         return true;
                         return true;
                     }
                     }
                 }
                 }
@@ -539,7 +540,8 @@ public class HikVisionController {
 
 
             List<String> noReelPosErrorList = deviceData.get(1);
             List<String> noReelPosErrorList = deviceData.get(1);
             if (noReelPosErrorList != null && !noReelPosErrorList.isEmpty()) {
             if (noReelPosErrorList != null && !noReelPosErrorList.isEmpty()) {
-                Query query = new Query(Criteria.where("posName").in(hasReelPosErrorList.toArray()));
+                log.info("noReelPosErrorList-----"+JSON.toJSONString(noReelPosErrorList));
+                Query query = new Query(Criteria.where("posName").in(noReelPosErrorList.toArray()));
                 List<StoragePos> posList = storagePosManager.findByQuery(query);
                 List<StoragePos> posList = storagePosManager.findByQuery(query);
                 for (StoragePos pos : posList) {
                 for (StoragePos pos : posList) {
                     if (!pos.isEnabled()) {
                     if (!pos.isEnabled()) {
@@ -554,7 +556,7 @@ public class HikVisionController {
                             return true;
                             return true;
                         }
                         }
                     } else {
                     } else {
-                        log.info(posName+"对应的货架位异常");
+                        log.info(pos.getPosName()+"对应的货架位异常");
                         return true;
                         return true;
                     }
                     }
                 }
                 }