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

解决自动任务创建后状态异常，完成任务异常

Browse Source
This commit is contained in:
张江玮
2023-01-04 12:09:32 +08:00
parent 9887483aa1
commit 67eebd4a06
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/timing/TimingSendMaterialTask.java
View File

@@ -94,13 +94,13 @@ public class TimingSendMaterialTask extends AbstractAcsTask {
//更新任务状态为完成 //更新任务状态为完成
if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
//判断状态, //判断状态,
if (StrUtil.equals("2", jsonTask.getString("task_status"))) { // if (StrUtil.equals("2", jsonTask.getString("task_status"))) {
// 更改任务状态为完成 // // 更改任务状态为完成
jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode()); // jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode());
jsonTask.put("update_time", DateUtil.now()); // jsonTask.put("update_time", DateUtil.now());
taskTab.update(jsonTask); // taskTab.update(jsonTask);
return; // return;
} // }
//更改任务状态为完成 //更改任务状态为完成
jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode()); jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode());
@@ -111,7 +111,7 @@ public class TimingSendMaterialTask extends AbstractAcsTask {
MaterialbaseServiceImpl materialbaseService = SpringContextHolder.getBean(MaterialbaseServiceImpl.class); MaterialbaseServiceImpl materialbaseService = SpringContextHolder.getBean(MaterialbaseServiceImpl.class);
KlzhcwUtil klzhcwUtil = SpringContextHolder.getBean(KlzhcwUtil.class); KlzhcwUtil klzhcwUtil = SpringContextHolder.getBean(KlzhcwUtil.class);
MaterialbaseDto materialbaseDto = materialbaseService.findById(Long.parseLong(jsonTask.getString("material_id"))); MaterialbaseDto materialbaseDto = materialbaseService.findById(jsonTask.getLong("material_id"));
LinkedList<JSONObject> ll = MyLinkedListService.getLinkedList(); LinkedList<JSONObject> ll = MyLinkedListService.getLinkedList();
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
param.put("vehicle_type", jsonTask.getString("vehicle_type")); param.put("vehicle_type", jsonTask.getString("vehicle_type"));
@@ -182,7 +182,7 @@ public class TimingSendMaterialTask extends AbstractAcsTask {
.task_code(CodeUtil.getNewCode("TASK_CODE")) .task_code(CodeUtil.getNewCode("TASK_CODE"))
.task_name("定时任务生成空料盅区有料到困料区的任务") .task_name("定时任务生成空料盅区有料到困料区的任务")
.task_type("timing") .task_type("timing")
.task_status(TaskStatusEnum.SURE_END.getCode()) .task_status(TaskStatusEnum.START_AND_POINT.getCode())
.point_code1(point_code1) .point_code1(point_code1)
.point_code2(point_code2) .point_code2(point_code2)
.priority("1") .priority("1")

BIN
lms/nladmin-system/src/main/java/org/nl/wms/wms.xls
View File

Binary file not shown.