锁定库位未清除

src/main/java/com/neotel/smfcore/custom/luxsan_sp/controller/SpAgvDeviceClientController.java

@@ -347,7 +347,7 @@ public class SpAgvDeviceClientController {
                     intoPos(opTask);
                     intoPos(opTask);
                     //清理锁定库位
                     //清理锁定库位
                     //rfid = rfid.substring(0,rfid.length()-1);
                     //rfid = rfid.substring(0,rfid.length()-1);
-                    ReelLockPosUtil.removeReelLockPosInfo(rfid);
+                    ReelLockPosUtil.removeReelLockPosInfo(opTask.getBarcode());
                 } else {
                 } else {
                     taskService.updateQueueTask(opTask);
                     taskService.updateQueueTask(opTask);
                 }
                 }

src/main/java/com/neotel/smfcore/custom/luxsan_sp/util/SpBoxUtil.java

@@ -324,10 +324,11 @@ public class SpBoxUtil {
 
 
         if(pos!=null){
         if(pos!=null){
 
 
-            log.info("料箱[" + barcode.getBarcode() + "]从库位[" + pos.getPosName() + "]中清空信息");
+            log.info("料箱[" + barcode.getBarcode() + "]从库位[" + pos.getPosName() + "]中清空信息，同时清除库位锁定");
             pos.setBarcode(null);
             pos.setBarcode(null);
             pos.setUsed(false);
             pos.setUsed(false);
             storagePosManager.save(pos);
             storagePosManager.save(pos);
+            ReelLockPosUtil.removeReelLockPosInfo(barcode.getBarcode());
         }
         }
 
 
         //从原有库位清空
         //从原有库位清空