1.移库位置不更新

2.获取库位时,相同cid锁定的 直接返回库位信息

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

@@ -1011,6 +1011,8 @@ public class DeviceController {
 
 
 
 
         //生成一条入库任务
         //生成一条入库任务
+        barcode.setPosName(targetPos.getPosName());
+        barcodeManager.save(barcode);
         DataLog targetPosTask = new DataLog(storage, barcode, targetPos);
         DataLog targetPosTask = new DataLog(storage, barcode, targetPos);
         targetPosTask.setOperator("admin-move");
         targetPosTask.setOperator("admin-move");
         targetPosTask.setType(OP.PUT_IN);
         targetPosTask.setType(OP.PUT_IN);

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

 package com.neotel.smfcore.custom.keboda1335;
 package com.neotel.smfcore.custom.keboda1335;
 
 
+import com.alibaba.fastjson.JSON;
 import com.google.common.base.Strings;
 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;
@@ -169,7 +170,23 @@ public class KebodaController {
                         }
                         }
                     }
                     }
 
 
-
+                    //如果两个cid相同的话,直接返回原库位号,不移除锁定信息
+                    for (String cid : cidList) {
+                        ReelLockPosInfo reelLockPosInfo = ReelLockPosUtil.getLockPosInfoByCode(barcode.getBarcode());
+                        if (reelLockPosInfo != null){
+                            String lockCid = reelLockPosInfo.getCid();
+                            if (cid.equals(lockCid)){
+                                String lockPosName = reelLockPosInfo.getLockPosName();
+                                resultMap.put("result", "0");
+                                resultMap.put("msg", "");
+                                resultMap.put("pos", lockPosName);
+                                resultMap.put("barcode", barcode.getBarcode());
+                                resultMap.put("cid", cid);
+                                log.info("当前库位锁定的cid相同,直接返回客户端,返回结果为:"+ JSON.toJSONString(resultMap));
+                                return resultMap;
+                            }
+                        }
+                    }
 
 
                     //先移除被锁定的库位
                     //先移除被锁定的库位
                     ReelLockPosUtil.removeReelLockPosInfo(barcode.getBarcode());
                     ReelLockPosUtil.removeReelLockPosInfo(barcode.getBarcode());