重复分配库位修改

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

@@ -219,7 +219,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
                 }
                 }
             }
             }
 
 
-            ReelLockPosUtil.removeReelLockPosInfo(barcodeSave.getBarcode());
+            //ReelLockPosUtil.removeReelLockPosInfo(barcodeSave.getBarcode());
             return taskService.addPutInTaskToExecute(storage, barcodeSave, storagePos);
             return taskService.addPutInTaskToExecute(storage, barcodeSave, storagePos);
         }
         }
     }
     }

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -133,19 +133,6 @@ public class DeviceController {
         lineMsg = "";
         lineMsg = "";
         log.info("流水线[" + cids + "]获取[" + rfid + "][" + code + "]的入库库位");
         log.info("流水线[" + cids + "]获取[" + rfid + "][" + code + "]的入库库位");
 
 
-        //判断锁定库位,是否超过1小时,如果超过,则解绑
-        Collection<ReelLockPosInfo> copyList = new ArrayList<>();
-        Collection<ReelLockPosInfo> allReelLockPosInfo = ReelLockPosUtil.getAllReelLockPosInfo();
-        for (ReelLockPosInfo lockPosInfo : allReelLockPosInfo) {
-            copyList.add(lockPosInfo);
-        }
-
-        for (ReelLockPosInfo lockPosInfo : copyList) {
-            if (System.currentTimeMillis() - lockPosInfo.getCreateDate().getTime() >= 1000 * 60 * 60) {
-                ReelLockPosUtil.removeReelLockPosInfo(lockPosInfo.getBarcode());
-            }
-        }
-
         Map<String, Object> resultMap = Maps.newHashMap();
         Map<String, Object> resultMap = Maps.newHashMap();
 
 
         if (dataCache.getCache(Constants.CACHE_StopOut)) {
         if (dataCache.getCache(Constants.CACHE_StopOut)) {
@@ -366,6 +353,18 @@ public class DeviceController {
         } else {
         } else {
             lineMsg = okMsg;
             lineMsg = okMsg;
         };
         };
+        //判断锁定库位,是否超过1小时,如果超过,则解绑
+        Collection<ReelLockPosInfo> copyList = new ArrayList<>();
+        Collection<ReelLockPosInfo> allReelLockPosInfo = ReelLockPosUtil.getAllReelLockPosInfo();
+        for (ReelLockPosInfo lockPosInfo : allReelLockPosInfo) {
+            copyList.add(lockPosInfo);
+        }
+
+        for (ReelLockPosInfo lockPosInfo : copyList) {
+            if (System.currentTimeMillis() - lockPosInfo.getCreateDate().getTime() >= 1000 * 60 * 60) {
+                ReelLockPosUtil.removeReelLockPosInfo(lockPosInfo.getBarcode());
+            }
+        }
         return resultMap;
         return resultMap;
     }
     }
 
 

src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/rest/InventoryController.java

@@ -567,7 +567,7 @@ public class InventoryController {
             int partitionNum = BoxUtil.getPartitionNum(partition, subCodeList);
             int partitionNum = BoxUtil.getPartitionNum(partition, subCodeList);
             data.setAmout(partitionNum);
             data.setAmout(partitionNum);
             //创建人
             //创建人
-            //data.setCreator(SecurityUtils.getCurrentUsername());
+            data.setCreator(SecurityUtils.getCurrentUsername());
             //盘点批次
             //盘点批次
             data.setInventoryBatch(inventoryBatch);
             data.setInventoryBatch(inventoryBatch);
             inventoryDataManager.save(data);
             inventoryDataManager.save(data);