功能优化

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -557,17 +557,22 @@ public class StoragePosController {
             return ResultBean.newErrorResult(-1, "", "未找到可以出库的物料");
             return ResultBean.newErrorResult(-1, "", "未找到可以出库的物料");
         }
         }
 
 
+        boolean hasTask = false;
         for (StoragePos pos : storagePosList) {
         for (StoragePos pos : storagePosList) {
 
 
+            Barcode barcode = pos.getBarcode();
+
             //排除正在执行的库位
             //排除正在执行的库位
-            Collection<String> excludePosIds = taskService.excludePosIds();
-            if (excludePosIds != null && !excludePosIds.isEmpty() && excludePosIds.contains(pos.getId())) {
-                log.info("库位：" + pos.getPosName() + "正在执行，跳过");
-                continue;
+            List<DataLog> allTasks = taskService.getAllTasks();
+            for (DataLog task : allTasks) {
+                if (pos.getPosName().equals(task.getPosName())){
+                    if (!task.isCancel() && !task.isFinished()){
+                        log.info(barcode.getBarcode()+"库位：" + pos.getPosName() + "正在执行，跳过");
+                        continue;
+                    }
+                }
             }
             }
 
 
-            Barcode barcode = pos.getBarcode();
-
             //判断有没有输入箱子号
             //判断有没有输入箱子号
             if (StringUtils.isNotEmpty(box) && !box.equals(barcode.getBarcode())) {
             if (StringUtils.isNotEmpty(box) && !box.equals(barcode.getBarcode())) {
                 continue;
                 continue;
@@ -679,8 +684,12 @@ public class StoragePosController {
                 task.setBoxPosName(pos.getPosName());
                 task.setBoxPosName(pos.getPosName());
                 task.setCartonId(barcode.getCartonId());
                 task.setCartonId(barcode.getCartonId());
                 taskService.updateQueueTask(task);
                 taskService.updateQueueTask(task);
+                hasTask = true;
             }
             }
         }
         }
+        if (!hasTask){
+            return ResultBean.newErrorResult(-1,"","未找到可以出库的任务");
+        }
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
     }
     }
 
 

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -710,9 +710,11 @@ public class TaskService {
         Collection<DataLog> allTasks = taskMap.values();
         Collection<DataLog> allTasks = taskMap.values();
         Collection<String> operatingPosIds = ReelLockPosUtil.getAllLockPosIds();
         Collection<String> operatingPosIds = ReelLockPosUtil.getAllLockPosIds();
         for (DataLog task : allTasks) {
         for (DataLog task : allTasks) {
-            String posId = task.getPosId();
-            if (!Strings.isNullOrEmpty(posId)) {
-                operatingPosIds.add(task.getPosId());
+            if (!task.isCancel() && !task.isFinished()) {
+                String posId = task.getPosId();
+                if (!Strings.isNullOrEmpty(posId)) {
+                    operatingPosIds.add(task.getPosId());
+                }
             }
             }
         }
         }
         return operatingPosIds;
         return operatingPosIds;

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

@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.DateUtil;
 import com.neotel.smfcore.common.utils.DateUtil;
+import com.neotel.smfcore.common.utils.ReelLockPosUtil;
 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;
@@ -417,6 +418,7 @@ public class ManualGrPutInController {
 
 
             pos.setBarcode(null);
             pos.setBarcode(null);
             taskService.addTaskToFinished(pos,boxBarcode,"手动入库");
             taskService.addTaskToFinished(pos,boxBarcode,"手动入库");
+            ReelLockPosUtil.removeReelLockPosInfo(barcode.getBarcode());
             return ResultBean.newOkResult("");
             return ResultBean.newOkResult("");
         }
         }
         return ResultBean.newErrorResult(-1,"","请选择手动入库");
         return ResultBean.newErrorResult(-1,"","请选择手动入库");