1.锁定库位尺寸不对的 直接移除

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

@@ -177,13 +177,25 @@ public class KebodaController {
                             String lockCid = reelLockPosInfo.getCid();
                             String lockCid = reelLockPosInfo.getCid();
                             if (cid.equals(lockCid)){
                             if (cid.equals(lockCid)){
                                 String lockPosName = reelLockPosInfo.getLockPosName();
                                 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;
+                                //判断锁定的库位尺寸和barcode 尺寸是否一样,如果不一样,则重新找个库位
+                                boolean hasRemoveLock = false;
+                                StoragePos pos = storagePosManager.getByPosName(lockPosName);
+                                if (pos != null){
+                                    if (pos.getW() != barcode.getPlateSize() || pos.getH() != barcode.getHeight()){
+                                        ReelLockPosUtil.removeReelLockPosInfo(barcode.getBarcode());
+                                        hasRemoveLock = true;
+                                    }
+                                }
+
+                                if (!hasRemoveLock) {
+                                    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;
+                                }
                             }
                             }
                         }
                         }
                     }
                     }