fix:bug修改

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/manual/ManualGrPutInController.java

@@ -240,19 +240,22 @@ public class ManualGrPutInController {
             return ResultBean.newErrorResult(-4, "smfcore.error.pos.hasReel", "库位[{0}]中已有物料,无法入库", new String[]{posName});
             return ResultBean.newErrorResult(-4, "smfcore.error.pos.hasReel", "库位[{0}]中已有物料,无法入库", new String[]{posName});
         }
         }
         Barcode boxBarcode = codeResolve.resolveOneValideBarcode(boxStr);
         Barcode boxBarcode = codeResolve.resolveOneValideBarcode(boxStr);
+        // 库位置空
+        if (ObjectUtil.isNotNull(newPos.getBarcode())) {
+            newPos.setBarcode(null);
+        }
 
 
-
+        String oldPosName = boxBarcode.getPosName();
         //4.生成入库任务
         //4.生成入库任务
         taskService.addTaskToFinished(newPos, boxBarcode, SecurityUtils.getLoginUsername());
         taskService.addTaskToFinished(newPos, boxBarcode, SecurityUtils.getLoginUsername());
 
 
 
 
         //将料箱原来的库位置空
         //将料箱原来的库位置空
-        String oldPosName = boxBarcode.getPosName();
         StoragePos oldPos = null;
         StoragePos oldPos = null;
         if (oldPosName != null) {
         if (oldPosName != null) {
             oldPos = storagePosManager.getByPosName(oldPosName);
             oldPos = storagePosManager.getByPosName(oldPosName);
         }
         }
-        if (oldPos != null) {
+        if (oldPos != null && !oldPos.getPosName().equals(newPos.getPosName())) {
             // 原先已被存储在oldPos
             // 原先已被存储在oldPos
             oldPos.setBarcode(null);
             oldPos.setBarcode(null);
             oldPos.setUsed(false);
             oldPos.setUsed(false);