opt:优化ACS频繁反馈任务状态校验

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java

@@ -89,7 +89,7 @@ public class DjqTask extends AbstractAcsTask {
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
-        if (TaskUtil.checkParams(schBaseTask, THIS_CLASS)) return;
+        if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskObj.getString("task_id"))
                 .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
@@ -97,6 +97,7 @@ public class DjqTask extends AbstractAcsTask {
                 .set(SchBaseTask::getUpdate_time, DateUtil.now());
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
+            if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.EXECUTING.getCode())) return;
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
         if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
@@ -235,7 +236,7 @@ public class DjqTask extends AbstractAcsTask {
     public void forceFinish(String taskId) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskId), false);
-        if (TaskUtil.checkParams(schBaseTask,THIS_CLASS)) return;
+        if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         updateTaskStatus(JSONObject.parseObject(JSON.toJSONString(schBaseTask)), TaskStatusEnum.FINISHED.getCode());
     }
 

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqToKzjhcwTask.java

@@ -18,7 +18,6 @@ import org.nl.b_lms.sch.task.service.IschBaseTaskService;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.common.enums.PackageInfoIvtEnum;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.common.utils.TaskUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.wms.sch.AcsTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
@@ -85,7 +84,7 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
-        if (TaskUtil.checkParams(schBaseTask,THIS_CLASS)) return;
+         if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskObj.getString("task_id"))
                 .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
@@ -93,6 +92,7 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
                 .set(SchBaseTask::getUpdate_time, DateUtil.now());
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
+            if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.EXECUTING.getCode())) return;
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
             if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
@@ -190,7 +190,7 @@ public class DjqToKzjhcwTask extends AbstractAcsTask {
     public void forceFinish(String taskId) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskId), false);
-        if (TaskUtil.checkParams(schBaseTask,THIS_CLASS)) return;
+        if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         updateTaskStatus(JSONObject.parseObject(JSON.toJSONString(schBaseTask)), TaskStatusEnum.FINISHED.getCode());
     }
 

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java

@@ -83,7 +83,7 @@ public class GzqTask extends AbstractAcsTask {
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
-        if (TaskUtil.checkParams(schBaseTask,THIS_CLASS)) return;
+         if (TaskUtil.checkParams(schBaseTask, THIS_CLASS,TaskStatusEnum.FINISHED.getCode())) return;
         LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskObj.getString("task_id"))
                 .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
@@ -91,6 +91,7 @@ public class GzqTask extends AbstractAcsTask {
                 .set(SchBaseTask::getUpdate_time, DateUtil.now());
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
+            if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.EXECUTING.getCode())) return;
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
             if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
@@ -188,7 +189,7 @@ public class GzqTask extends AbstractAcsTask {
     public void forceFinish(String taskId) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskId), false);
-        if (TaskUtil.checkParams(schBaseTask,THIS_CLASS)) return;
+         if (TaskUtil.checkParams(schBaseTask, THIS_CLASS,TaskStatusEnum.FINISHED.getCode())) return;
         updateTaskStatus(JSONObject.parseObject(JSON.toJSONString(schBaseTask)), TaskStatusEnum.FINISHED.getCode());
     }
 

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqToKzjhcwTask.java

@@ -18,7 +18,6 @@ import org.nl.b_lms.sch.task.service.IschBaseTaskService;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.common.enums.PackageInfoIvtEnum;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.common.utils.TaskUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.wms.sch.AcsTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
@@ -87,7 +86,7 @@ public class GzqToKzjhcwTask extends AbstractAcsTask {
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
-        if (TaskUtil.checkParams(schBaseTask, THIS_CLASS)) return;
+         if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskObj.getString("task_id"))
                 .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
@@ -95,6 +94,7 @@ public class GzqToKzjhcwTask extends AbstractAcsTask {
                 .set(SchBaseTask::getUpdate_time, DateUtil.now());
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
+            if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.EXECUTING.getCode())) return;
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
             if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
@@ -192,7 +192,7 @@ public class GzqToKzjhcwTask extends AbstractAcsTask {
     public void forceFinish(String taskId) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskId), false);
-        if (TaskUtil.checkParams(schBaseTask,THIS_CLASS)) return;
+        if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         updateTaskStatus(JSONObject.parseObject(JSON.toJSONString(schBaseTask)), TaskStatusEnum.FINISHED.getCode());
     }
 

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java

@@ -7,7 +7,6 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -23,7 +22,6 @@ import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.common.enums.ContainerLevelEnum;
 import org.nl.common.enums.PackageInfoIvtEnum;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.common.utils.TaskUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.wms.sch.AcsTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
@@ -111,7 +109,7 @@ public class MzhcwTask extends AbstractAcsTask {
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
-        if (TaskUtil.checkParams(schBaseTask,THIS_CLASS)) return;
+         if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskObj.getString("task_id"))
                 .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
@@ -120,6 +118,7 @@ public class MzhcwTask extends AbstractAcsTask {
         // 执行中
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
+            if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.EXECUTING.getCode())) return;
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
         // 完成
@@ -351,7 +350,7 @@ public class MzhcwTask extends AbstractAcsTask {
     public void forceFinish(String taskId) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskId), false);
-        if (TaskUtil.checkParams(schBaseTask,THIS_CLASS)) return;
+        if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         updateTaskStatus(JSONObject.parseObject(JSON.toJSONString(schBaseTask)), TaskStatusEnum.FINISHED.getCode());
     }
 

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendDjqKzjTask.java

@@ -81,7 +81,7 @@ public class SendDjqKzjTask extends AbstractAcsTask {
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
-        if (TaskUtil.checkParams(schBaseTask, THIS_CLASS)) return;
+         if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskObj.getString("task_id"))
                 .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
@@ -89,6 +89,8 @@ public class SendDjqKzjTask extends AbstractAcsTask {
                 .set(SchBaseTask::getUpdate_time, DateUtil.now());
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
+            if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.EXECUTING.getCode())) return;
+            if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.EXECUTING.getCode())) return;
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
         if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
@@ -169,7 +171,7 @@ public class SendDjqKzjTask extends AbstractAcsTask {
     public void forceFinish(String taskId) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskId), false);
-        if (TaskUtil.checkParams(schBaseTask,THIS_CLASS)) return;
+        if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         updateTaskStatus(JSONObject.parseObject(JSON.toJSONString(schBaseTask)), TaskStatusEnum.FINISHED.getCode());
     }
 

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendGzqKzjTask.java

@@ -81,7 +81,7 @@ public class SendGzqKzjTask extends AbstractAcsTask {
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
-        if (TaskUtil.checkParams(schBaseTask, THIS_CLASS)) return;
+         if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskObj.getString("task_id"))
                 .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
@@ -89,6 +89,7 @@ public class SendGzqKzjTask extends AbstractAcsTask {
                 .set(SchBaseTask::getUpdate_time, DateUtil.now());
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
+            if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.EXECUTING.getCode())) return;
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
         if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
@@ -169,7 +170,7 @@ public class SendGzqKzjTask extends AbstractAcsTask {
     public void forceFinish(String taskId) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskId), false);
-        if (TaskUtil.checkParams(schBaseTask,THIS_CLASS)) return;
+        if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         updateTaskStatus(JSONObject.parseObject(JSON.toJSONString(schBaseTask)), TaskStatusEnum.FINISHED.getCode());
     }
 

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java

@@ -7,10 +7,8 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt;
 import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService;
 import org.nl.b_lms.sch.task.dao.SchBaseTask;
 import org.nl.b_lms.sch.task.dto.SchBaseTaskVO;
@@ -18,7 +16,6 @@ import org.nl.b_lms.sch.task.service.IschBaseTaskService;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.common.enums.PackageInfoIvtEnum;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.common.utils.TaskUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.wms.sch.AcsTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
@@ -85,17 +82,18 @@ public class SsxDjwTask extends AbstractAcsTask {
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
-        if (TaskUtil.checkParams(schBaseTask,THIS_CLASS)) return;
+        if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
-              LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
+        LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskObj.getString("task_id"))
                 .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
                 .set(SchBaseTask::getUpdate_optname, SecurityUtils.getCurrentUsername())
                 .set(SchBaseTask::getUpdate_time, DateUtil.now());
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
+            if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.EXECUTING.getCode())) return;
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
-            if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
+        if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
             log.info("任务编号为:"+schBaseTask.getTask_code()+"的任务完成接口在"+schBaseTask.getUpdate_time()+"被调用---------------------------------------------");
             //1.更改任务状态为完成
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode());
@@ -186,7 +184,7 @@ public class SsxDjwTask extends AbstractAcsTask {
     public void forceFinish(String taskId) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskId), false);
-        if (TaskUtil.checkParams(schBaseTask,THIS_CLASS)) return;
+        if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         updateTaskStatus(JSONObject.parseObject(JSON.toJSONString(schBaseTask)), TaskStatusEnum.FINISHED.getCode());
     }
 

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java

@@ -98,7 +98,7 @@ public class ZxDjwTask extends AbstractAcsTask {
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
-        if (TaskUtil.checkParams(schBaseTask, THIS_CLASS)) return;
+         if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskObj.getString("task_id"))
                 .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
@@ -106,6 +106,7 @@ public class ZxDjwTask extends AbstractAcsTask {
                 .set(SchBaseTask::getUpdate_time, DateUtil.now());
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
+            if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.EXECUTING.getCode())) return;
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
         if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
@@ -214,7 +215,7 @@ public class ZxDjwTask extends AbstractAcsTask {
     public void forceFinish(String taskId) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskId), false);
-        if (TaskUtil.checkParams(schBaseTask,THIS_CLASS)) return;
+        if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         updateTaskStatus(JSONObject.parseObject(JSON.toJSONString(schBaseTask)), TaskStatusEnum.FINISHED.getCode());
     }
 

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java

@@ -109,7 +109,7 @@ public class ZxqTask extends AbstractAcsTask {
     @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>().eq(SchBaseTask::getTask_id, taskObj.getString("task_id")), false);
-        if (TaskUtil.checkParams(schBaseTask, THIS_CLASS)) return;
+         if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         LambdaUpdateWrapper<SchBaseTask> updateWrapper = new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskObj.getString("task_id"))
                 .set(SchBaseTask::getUpdate_optid, SecurityUtils.getCurrentUserId())
@@ -117,6 +117,7 @@ public class ZxqTask extends AbstractAcsTask {
                 .set(SchBaseTask::getUpdate_time, DateUtil.now());
         if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
             // 更新任务状态为执行中
+            if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.EXECUTING.getCode())) return;
             updateWrapper.set(SchBaseTask::getTask_status, TaskStatusEnum.EXECUTING.getCode());
         }
         if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
@@ -343,7 +344,7 @@ public class ZxqTask extends AbstractAcsTask {
     public void forceFinish(String taskId) {
         SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_id, taskId), false);
-        if (TaskUtil.checkParams(schBaseTask,THIS_CLASS)) return;
+        if (TaskUtil.checkParams(schBaseTask, THIS_CLASS, TaskStatusEnum.FINISHED.getCode())) return;
         updateTaskStatus(JSONObject.parseObject(JSON.toJSONString(schBaseTask)), TaskStatusEnum.FINISHED.getCode());
     }
 

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java

@@ -56,7 +56,7 @@ public class AutoSendDjqToGzq {
                 }
                 //管制区有空位且过滤未完成任务
                 List<BstIvtPackageinfoivt> gzqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), "");
-                //todo 新增NG卷放置临时管制区107108，只取空不补空
+                //todo 新增NG卷放置临时管制区135136，只取空不补空
                 List<BstIvtPackageinfoivt> ivtLists =
                         gzqPackageinfoivtList.stream()
                                 .filter(r -> r.getPoint_code().equals("ZXQ_135") || r.getPoint_code().equals("ZXQ_136"))

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java

@@ -55,7 +55,7 @@ public class AutoSendGzqToDjq {
                 String pointCode3;
                 String pointCode4;
                 List<BstIvtPackageinfoivt> gzqIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), PackageInfoIvtEnum.SORT_TYPE.code("降序"), "");
-                //todo 新增NG卷放置临时管制区107108，只取空不补空
+                //todo 新增NG卷放置临时管制区135136，只取空不补空
                 List<BstIvtPackageinfoivt> ivtLists =
                         gzqIvtList.stream()
                                 .filter(r -> r.getPoint_code().equals("ZXQ_135") || r.getPoint_code().equals("ZXQ_136"))
@@ -64,10 +64,6 @@ public class AutoSendGzqToDjq {
                     pointCode3 = gzqIvtList.get(0).getPoint_code();
                     if (StringUtils.isNotBlank(pointCode3)) {
                         List<BstIvtPackageinfoivt> packageList;
-
-
-
-
                         packageList = packageinfoivtService.checkEndPointTask(
                                 PackageInfoIvtEnum.POINT_STATUS.code("待检区"),
                                 PackageInfoIvtEnum.IVT_STATUS.code("空"),

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java

@@ -78,7 +78,7 @@ public class AutoSendVehicleToDjq {
                 //                } else {
                 //                    pointCode2 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));
                 //                }
-                //todo 新增NG卷放置临时管制区107108，只取空不补空
+                //todo 新增NG卷放置临时管制区135136，只取空不补空
                 pointCode2 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));
                 //去装箱区搬运空载具
                 if (pointCode2 != null) {
@@ -108,7 +108,7 @@ public class AutoSendVehicleToDjq {
         if (taskType.equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)"))) {
             packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), "");
             if (CollectionUtils.isEmpty(packageList)) {
-                //todo 新增NG卷放置临时管制区107108，只取空不补空
+                //todo 新增NG卷放置临时管制区135136，只取空不补空
                 packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), "");
                 packageList = packageList.stream()
                         .filter(r -> !r.getPoint_code().equals("ZXQ_135") && !r.getPoint_code().equals("ZXQ_136"))

lms/nladmin-system/src/main/java/org/nl/wms/util/TaskUtil.java

@@ -29,11 +29,11 @@ public class TaskUtil {
     /**
      * 任务类参数校验
      */
-    public static boolean checkParams(SchBaseTask schBaseTask, String taskType) {
+    public static boolean checkParams(SchBaseTask schBaseTask, String taskType, String taskStatus) {
         if (schBaseTask == null) {
             throw new BadRequestException("任务类型为：" + taskType + "完成接口任务号为空！");
         }
-        if (schBaseTask.getTask_status().equals(TaskStatusEnum.FINISHED.getCode())) {
+        if (schBaseTask.getTask_status().equals(taskStatus)) {
             return true;
         }
         //        if (StringUtils.isBlank(schBaseTask.getVehicle_code())) {