Merge branch 'master' of http://106.15.194.121:8083/sunke/smf-core

src/main/java/com/neotel/smfcore/custom/keboda1335/KebodaController.java

@@ -94,7 +94,7 @@ public class KebodaController {
         String okMsg = "";
         String okMsg = "";
         String errorMsg = "";
         String errorMsg = "";
 
 
-        List<String> needRemoveReelLockPosIdList = new ArrayList<>();
+//        List<String> needRemoveReelLockPosIdList = new ArrayList<>();
 
 
         if (Strings.isNullOrEmpty(cids)) {
         if (Strings.isNullOrEmpty(cids)) {
             resultMap.put("result", "101");
             resultMap.put("result", "101");
@@ -171,7 +171,13 @@ public class KebodaController {
 
 
 
 
                     StoragePos pos = null;
                     StoragePos pos = null;
+                    int loopCount=0;
+
                     while (pos == null){
                     while (pos == null){
+                        loopCount++;
+                        if(loopCount>=10 ){
+                            log.info(barcode.getBarcode()+"已循环查找10次 直接跳出循环");
+                        }
                         pos = taskService.findEmptyPosForPutIn(storageList, barcode, rfid, lastPosId);
                         pos = taskService.findEmptyPosForPutIn(storageList, barcode, rfid, lastPosId);
                         if (pos == null){
                         if (pos == null){
                             break;
                             break;
@@ -186,14 +192,16 @@ public class KebodaController {
                             StoragePos storagePos = storagePosManager.getByPosName(posName);
                             StoragePos storagePos = storagePosManager.getByPosName(posName);
                             if (storagePos != null){
                             if (storagePos != null){
                                 if (storagePos.getBarcode() != null){
                                 if (storagePos.getBarcode() != null){
-                                    log.info(posName+"有物料信息,重新查找库位");
+                                    log.info(posName+"有物料信息,重新查找库位,清除条码["+barcode.getBarcode()+"]锁定库位");
+                                    ReelLockPosUtil.removeReelLockPosInfo(barcode.getBarcode());
+
                                     ReelLockPosInfo reelLocInfo = new ReelLockPosInfo();
                                     ReelLockPosInfo reelLocInfo = new ReelLockPosInfo();
                                     reelLocInfo.setBarcode(pos.getId());
                                     reelLocInfo.setBarcode(pos.getId());
                                     reelLocInfo.setCid(dataCache.getStorageById(pos.getStorageId()).getCid());
                                     reelLocInfo.setCid(dataCache.getStorageById(pos.getStorageId()).getCid());
                                     reelLocInfo.setLockPosName(pos.getPosName());
                                     reelLocInfo.setLockPosName(pos.getPosName());
                                     reelLocInfo.setLockPosId(pos.getId());
                                     reelLocInfo.setLockPosId(pos.getId());
                                     ReelLockPosUtil.addReelLockPosInfo(reelLocInfo,cidList);
                                     ReelLockPosUtil.addReelLockPosInfo(reelLocInfo,cidList);
-                                    needRemoveReelLockPosIdList.add(pos.getId());
+//                                    needRemoveReelLockPosIdList.add(pos.getId());
                                     pos = null;
                                     pos = null;
                                 }
                                 }
                             }
                             }
@@ -309,11 +317,11 @@ public class KebodaController {
             DeviceMessageUtil.lastLineMsg = null;
             DeviceMessageUtil.lastLineMsg = null;
         }
         }
 
 
-        if (needRemoveReelLockPosIdList != null && !needRemoveReelLockPosIdList.isEmpty()) {
-            for (String posId : needRemoveReelLockPosIdList) {
-                ReelLockPosUtil.removeReelLockPosInfo(posId);
-            }
-        }
+//        if (needRemoveReelLockPosIdList != null && !needRemoveReelLockPosIdList.isEmpty()) {
+//            for (String posId : needRemoveReelLockPosIdList) {
+//                ReelLockPosUtil.removeReelLockPosInfo(posId);
+//            }
+//        }
 
 
         return resultMap;
         return resultMap;
     }
     }