root/xinFengTianNeng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

任务单独反馈，列表更新异常会导致整体都一直下发

Browse Source
This commit is contained in:
psh
2024-07-11 18:04:08 +08:00
parent 6041d64efa
commit d00bec3f25
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
View File

@@ -72,11 +72,11 @@ public abstract class AbstractTask {
* @author ldjun * @author ldjun
* @created 2020年6月12日 下午5:52:28 * @created 2020年6月12日 下午5:52:28
*/ */
protected JSONObject renotifyAcs(SchBaseTask task) { protected void renotifyAcs(SchBaseTask task) {
Assert.notNull(task); Assert.notNull(task);
List<SchBaseTask> taskList = new ArrayList<>(); List<SchBaseTask> taskList = new ArrayList<>();
taskList.add(task); taskList.add(task);
return this.renotifyAcs(taskList); this.renotifyAcs(taskList);
} }
/** /**
@@ -85,12 +85,12 @@ public abstract class AbstractTask {
* @author ldjun * @author ldjun
* @created 2020年6月12日 下午5:52:28 * @created 2020年6月12日 下午5:52:28
*/ */
protected JSONObject renotifyAcs(List<SchBaseTask> taskList) { protected void renotifyAcs(List<SchBaseTask> taskList) {
//1、获取任务 //1、获取任务
//2、根据任务配置补全任务 //2、根据任务配置补全任务
//3、下发 //3、下发
List<AcsTaskDto> list = new ArrayList<>();
for (SchBaseTask task : taskList) { for (SchBaseTask task : taskList) {
List<AcsTaskDto> list = new ArrayList<>();
AcsTaskDto taskDto = new AcsTaskDto(); AcsTaskDto taskDto = new AcsTaskDto();
taskDto.setTask_id(task.getTask_id()); taskDto.setTask_id(task.getTask_id());
taskDto.setTask_code(task.getTask_code()); taskDto.setTask_code(task.getTask_code());
@@ -108,7 +108,6 @@ public abstract class AbstractTask {
taskDto.setVehicle_code(task.getVehicle_code()); taskDto.setVehicle_code(task.getVehicle_code());
this.setTask(task.getConfig_code(), taskDto); this.setTask(task.getConfig_code(), taskDto);
list.add(taskDto); list.add(taskDto);
}
JSONObject result = AcsUtil.notifyAcs("api/wms/task", list); JSONObject result = AcsUtil.notifyAcs("api/wms/task", list);
if (HttpStatus.OK.value() == result.getInteger("status")) { if (HttpStatus.OK.value() == result.getInteger("status")) {
for (SchBaseTask schBaseTask : taskList) { for (SchBaseTask schBaseTask : taskList) {
@@ -116,7 +115,7 @@ public abstract class AbstractTask {
taskService.update(schBaseTask); taskService.update(schBaseTask);
} }
} }
return result; }
} }
private AcsTaskDto setTask(String config_code, AcsTaskDto taskDto) { private AcsTaskDto setTask(String config_code, AcsTaskDto taskDto) {