上架和下架时,判断当前料架是否有任务

src/main/java/com/neotel/smfcore/hikvision_mobile/HikVisionController.java

@@ -113,7 +113,7 @@ public class HikVisionController {
             }
             }
             //判断是否有cid相同的
             //判断是否有cid相同的
             if (queueTask.getStorageName().equals(shelfCode) && queueTask.isPutInTask()) {
             if (queueTask.getStorageName().equals(shelfCode) && queueTask.isPutInTask()) {
-                return ApiResponse.apiResponse(reqCode, ResponseCode.ERROR.getCode(), "", "", new String[]{info.getUniqueCode()}, shelfCode + "已经有正在执行的入库任务");
+                return ApiResponse.apiResponse(reqCode, ResponseCode.REQUEST_ERROR.getCode(), "", "", new String[]{shelfCode}, shelfCode + "有正在执行中的上架任务,不可发起新的上架任务");
             }
             }
         }
         }
 
 
@@ -231,6 +231,17 @@ public class HikVisionController {
             if (barcode == null) {
             if (barcode == null) {
                 return ApiResponse.apiResponse(reqCode, ResponseCode.REQUEST_ERROR.getCode(), "", "smfcore.error.barcode.invalid", new String[]{info.getUniqueCode()}, "{0}不是有效的条码");
                 return ApiResponse.apiResponse(reqCode, ResponseCode.REQUEST_ERROR.getCode(), "", "smfcore.error.barcode.invalid", new String[]{info.getUniqueCode()}, "{0}不是有效的条码");
             }
             }
+
+            //判断是否有正在下架的任务
+            for (DataLog dataLog : taskService.getAllTasks()) {
+                if (!dataLog.isFinished()){
+                    if (info.getShelfCode().equals(dataLog.getStorageName()) && dataLog.isCheckOutTask()){
+                        return ApiResponse.apiResponse(reqCode, ResponseCode.REQUEST_ERROR.getCode(), "", "", new String[]{info.getShelfCode()}, info.getShelfCode() + "有正在执行中的下架任务,不可发起新的下架任务");
+                    }
+                }
+            }
+
+
             DataLog dataLog = new DataLog(storage, barcode, pos);
             DataLog dataLog = new DataLog(storage, barcode, pos);
             dataLog.setType(OP.CHECKOUT);
             dataLog.setType(OP.CHECKOUT);
             dataLog.setReqCode(reqCode);
             dataLog.setReqCode(reqCode);