扫描库位时,设置成不在库

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

@@ -7,6 +7,7 @@ import com.neotel.smfcore.common.utils.DateUtil;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.api.SmfApi;
 import com.neotel.smfcore.core.api.SmfApi;
+import com.neotel.smfcore.core.barcode.enums.BARCODE_STATUS;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.manager.IComponentManager;
 import com.neotel.smfcore.core.barcode.service.manager.IComponentManager;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
@@ -134,7 +135,10 @@ public class ManualGrPutInController {
             StoragePos pos = storagePosManager.getByBarcode(barcode.getBarcode());
             StoragePos pos = storagePosManager.getByBarcode(barcode.getBarcode());
             if (pos != null){
             if (pos != null){
                 barcode = pos.getBarcode();
                 barcode = pos.getBarcode();
+                barcode.setStatus(BARCODE_STATUS.OUT_NORMAL); //设置成 不在库
                 barcodeManager.save(barcode);
                 barcodeManager.save(barcode);
+                pos.setBarcode(barcode);
+                storagePosManager.save(pos);
             }
             }
         }
         }
 
 
@@ -282,76 +286,6 @@ public class ManualGrPutInController {
 
 
 
 
 
 
-    public synchronized ResultBean boxToPos_old(String boxStr, String posName) {
-
-        if (StringUtils.isEmpty(boxStr)) {
-            return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"料箱信息"});
-        }
-        if (StringUtils.isEmpty(posName)) {
-            return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"库位信息"});
-        }
-
-        //1.判断有没有正在执行的任务
-        List<DataLog> taskList = taskService.getAllTasks();
-        for (DataLog dataLog : taskList) {
-            if (posName.equals(dataLog.getPosName())) {
-                if (!dataLog.isFinished() && !dataLog.isCancel()) {
-                    //if (dataLog.isPutInTask()) {
-                        return ResultBean.newErrorResult(-1,"",posName+"有正在执行的任务,请确认");
-                    //}
-                }
-            }
-        }
-
-        taskList = taskService.getAllTasks();
-        for (DataLog dataLog : taskList) {
-            if (boxStr.startsWith(dataLog.getBarcode())) {
-                if (!dataLog.isFinished() && !dataLog.isCancel()) {
-                    if (dataLog.isPutInTask()) {
-                        //return ResultBean.newOkResult(dataLog);
-                        return ResultBean.newErrorResult(-1,"",boxStr+"有正在执行的入库任务,请确认");
-                    } else {
-                        log.info(boxStr + "有正在执行的出库任务,服务器更改状态为完成");
-                        dataLog.setStatus(OP_STATUS.FINISHED.name());
-                        taskService.updateFinishedTask(dataLog);
-                    }
-                }
-            }
-        }
-        //2.判断库位是否存在
-        StoragePos newPos = storagePosManager.getByPosName(posName);
-        if (newPos == null) {
-            return ResultBean.newErrorResult(-2, "smfcore.error.pos.notExist", "[{0}]库位不存在", new String[]{posName});
-        }
-        //3.库位是否存了料箱
-        if (ObjectUtil.isNotNull(newPos.getBarcode())
-                && !newPos.getBarcode().getBarcode().equals(boxStr)) {
-            return ResultBean.newErrorResult(-4, "smfcore.error.pos.hasReel", "库位[{0}]中已有物料,无法入库", new String[]{posName});
-        }
-        Barcode boxBarcode = codeResolve.resolveOneValideBarcode(boxStr);
-        // 库位置空
-        if (ObjectUtil.isNotNull(newPos.getBarcode())) {
-            newPos.setBarcode(null);
-            newPos.setUsed(false);
-        }
-
-        String oldPosName = boxBarcode.getPosName();
-        //将料箱原来的库位置空
-        StoragePos oldPos = null;
-        if (oldPosName != null) {
-            oldPos = storagePosManager.getByPosName(oldPosName);
-        }
-        if (oldPos != null && !oldPos.getPosName().equals(newPos.getPosName())) {
-            // 原先已被存储在oldPos
-            oldPos.setBarcode(null);
-            oldPos.setUsed(false);
-            storagePosManager.save(oldPos);
-        }
-        //4.生成入库任务
-        taskService.addTaskToFinished(newPos, boxBarcode, SecurityUtils.getLoginUsername());
-        return ResultBean.newOkResult("ok");
-    }
-
     @ApiOperation("完成装箱并入库")
     @ApiOperation("完成装箱并入库")
     @RequestMapping("/boxToPos")
     @RequestMapping("/boxToPos")
     @AnonymousAccess
     @AnonymousAccess