锁定物料问题修改。

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

@@ -434,7 +434,15 @@ public class DataCache {
             disabledPosNameSet.add(pos.getPosName());
             disabledPosNameSet.add(pos.getPosName());
         }
         }
     }
     }
-
+    /**
+     * 锁定或解锁物料更新库位
+     */
+    public void updateUsedPosList(String cid, StoragePos pos) {
+        Map<String, StoragePos> usedPosNameList = getUsedPosList(cid);
+        usedPosNameList.remove(pos.getPosName());
+        usedPosNameList.put(pos.getPosName(),pos);
+        usedPosMap.put(cid, usedPosNameList);
+    }
     /**
     /**
      * 出库时清除使用库位列表
      * 出库时清除使用库位列表
      */
      */

src/main/java/com/neotel/smfcore/core/order/rest/OrderController.java

@@ -321,6 +321,12 @@ public class OrderController {
                 for (Map<String,StoragePos> list :
                 for (Map<String,StoragePos> list :
                         allPosLists) {
                         allPosLists) {
                     for (StoragePos pos : list.values()) {
                     for (StoragePos pos : list.values()) {
+
+                        //如果已锁定，直接跳过
+                        if(pos.isLocked()){
+                            continue;
+                        }
+
                         boolean isItemPos = false;
                         boolean isItemPos = false;
 
 
                         if (ObjectUtil.isNotEmpty(item.getRi())) {
                         if (ObjectUtil.isNotEmpty(item.getRi())) {

src/main/java/com/neotel/smfcore/core/storage/rest/LockMaterialController.java

@@ -61,6 +61,7 @@ public class LockMaterialController {
             storagePosManager.save(pos);
             storagePosManager.save(pos);
 
 
             dataCache.lockOneReel(storage.getCid(),code.getPartNumber());
             dataCache.lockOneReel(storage.getCid(),code.getPartNumber());
+            dataCache.updateUsedPosList(storage.getCid(), pos);
             log.info("锁定物料：增加锁定 "+lockId+" 位置【" + pos.getPosName() + "】【"+code.getBarcode()+"】");
             log.info("锁定物料：增加锁定 "+lockId+" 位置【" + pos.getPosName() + "】【"+code.getBarcode()+"】");
 
 
         }
         }
@@ -100,7 +101,8 @@ public class LockMaterialController {
             pos.setBarcode(code);
             pos.setBarcode(code);
             storagePosManager.save(pos);
             storagePosManager.save(pos);
 
 
-            dataCache.lockOneReel(storage.getCid(),code.getPartNumber());
+            dataCache.unLockOneReel(storage.getCid(),code.getPartNumber());
+            dataCache.updateUsedPosList(storage.getCid(), pos);
             log.info("锁定物料：解除锁定【" + storage.getName() + "_" + storage.getCid() + "】位置【" + pos.getPosName() + "】【"+code.getBarcode()+"】");
             log.info("锁定物料：解除锁定【" + storage.getName() + "_" + storage.getCid() + "】位置【" + pos.getPosName() + "】【"+code.getBarcode()+"】");
 
 
         }
         }