fix:bug修改

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

@@ -214,9 +214,15 @@ public class ManualGrPutInController {
         for (DataLog dataLog : taskList) {
         for (DataLog dataLog : taskList) {
             if (posName.equals(dataLog.getPosName())) {
             if (posName.equals(dataLog.getPosName())) {
                 if (!dataLog.isFinished() && !dataLog.isCancel()) {
                 if (!dataLog.isFinished() && !dataLog.isCancel()) {
-                    return ResultBean.newErrorResult(-3, "", "当前库位有任务正在执行");
+                    if (dataLog.isPutInTask()) {
+                        return ResultBean.newOkResult(dataLog);
+                    }
                 }
                 }
             }
             }
+        }
+
+        taskList = taskService.getAllTasks();
+        for (DataLog dataLog : taskList) {
             if (boxStr.startsWith(dataLog.getBarcode())) {
             if (boxStr.startsWith(dataLog.getBarcode())) {
                 if (!dataLog.isFinished() && !dataLog.isCancel()) {
                 if (!dataLog.isFinished() && !dataLog.isCancel()) {
                     if (dataLog.isPutInTask()) {
                     if (dataLog.isPutInTask()) {
@@ -243,13 +249,10 @@ public class ManualGrPutInController {
         // 库位置空
         // 库位置空
         if (ObjectUtil.isNotNull(newPos.getBarcode())) {
         if (ObjectUtil.isNotNull(newPos.getBarcode())) {
             newPos.setBarcode(null);
             newPos.setBarcode(null);
+            newPos.setUsed(false);
         }
         }
 
 
         String oldPosName = boxBarcode.getPosName();
         String oldPosName = boxBarcode.getPosName();
-        //4.生成入库任务
-        taskService.addTaskToFinished(newPos, boxBarcode, SecurityUtils.getLoginUsername());
-
-
         //将料箱原来的库位置空
         //将料箱原来的库位置空
         StoragePos oldPos = null;
         StoragePos oldPos = null;
         if (oldPosName != null) {
         if (oldPosName != null) {
@@ -261,6 +264,8 @@ public class ManualGrPutInController {
             oldPos.setUsed(false);
             oldPos.setUsed(false);
             storagePosManager.save(oldPos);
             storagePosManager.save(oldPos);
         }
         }
+        //4.生成入库任务
+        taskService.addTaskToFinished(newPos, boxBarcode, SecurityUtils.getLoginUsername());
         return ResultBean.newOkResult("ok");
         return ResultBean.newOkResult("ok");
     }
     }