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

add:添加空框送回按钮

Browse Source
This commit is contained in:
zhangzhiqiang
2023-08-23 18:42:25 +08:00
parent b18448e695
commit 64dcbe1e79
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashCallEmptyTask.java
View File

@@ -106,12 +106,8 @@ public class WashCallEmptyTask extends AbstractAcsTask {
public String createTask(JSONObject param) {
List<SchBaseTask> list = taskService.list(new QueryWrapper<SchBaseTask>()
.lt("task_status", StatusEnum.TASK_FINISH.getCode()).nested(
i->i.eq("point_code3", param.getString("device_code"))
.or()
.eq("point_code1", param.getString("device_code"))
)
);
.lt("task_status", StatusEnum.TASK_FINISH.getCode())
.eq("point_code3", param.getString("device_code")));
if (!CollectionUtils.isEmpty(list)){
throw new BadRequestException(String.format("设备%s存在未完成任务"+list.stream().map(SchBaseTask::getTask_id).collect(Collectors.toList()).toString(), param.getString("device_code")));
}

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashSendMaterialTask.java
View File

@@ -80,7 +80,7 @@ public class WashSendMaterialTask extends AbstractAcsTask {
.eq("point_code3", start_point_code))
);
if (!CollectionUtils.isEmpty(list)){
throw new BadRequestException(String.format("设备%s存在未完成任务"+list.stream().map(SchBaseTask::getTask_id).collect(Collectors.toList()).toString(), param.getString("device_code")));
throw new BadRequestException(String.format("设备%s存在未完成任务"+list.stream().map(SchBaseTask::getTask_code).collect(Collectors.toList()).toString(), param.getString("device_code")));
}
SchBaseTask order = taskService.getById(param.getString("task_id"));
JSONObject form = new JSONObject();