From 3b05bf431881ef6ca7bb3218a63f16bff38094c1 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 4 Apr 2023 14:03:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/common/enums/AcsTaskEnum.java | 3 +++ .../main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java | 2 ++ .../org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java | 2 ++ .../nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java | 2 ++ .../java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java | 2 ++ .../nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java | 2 ++ 6 files changed, 13 insertions(+) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java index 8001f00c..b0da6b54 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java @@ -50,6 +50,9 @@ public enum AcsTaskEnum { TASK_TYPE_PLOTTER_FILL_THE_BLANK_BOX("010302","刻字补空框"), TASK_TYPE_WARP_CALL_MATERIAL("010401","包装叫料"), TASK_TYPE_WARP_SEND_BLANK_BOX("010402","包装送空框"), + + TASK_FINISHED_TYPE_AUTO("1", "自动完成任务"), + TASK_FINISHED_TYPE_MANUAL("2", "手动完成任务"), ; private String code; private String desc; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java index bea9dab1..be053bbc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java @@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.common.enums.AcsTaskEnum; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; @@ -199,6 +200,7 @@ public class TaskServiceImpl implements TaskService { JSONObject res = new JSONObject(); res.put("task_id", task_id); res.put("task_status", "2"); + res.put("finished_type", AcsTaskEnum.TASK_FINISHED_TYPE_MANUAL.getCode()); // 手动完成 finish.add(res); acsToWmsService.receiveTaskStatusAcs(JSON.toJSONString(finish)); break; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java index 2ce74f61..c0c01fbb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java @@ -68,6 +68,8 @@ public class PlotterCallEmptyTask extends AbstractAcsTask { // 2任务完成 taskObj.put("task_status", StatusEnum.TASK_FINISH.getCode()); taskObj.put("update_time", DateUtil.now()); + taskObj.put("finished_type", ObjectUtil.isNotEmpty(task.getString("finished_type"))? + task.getString("finished_type"):AcsTaskEnum.TASK_FINISHED_TYPE_AUTO.getCode()); taskTab.update(taskObj); } else { /** diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java index c61be5fd..669418ca 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java @@ -67,6 +67,8 @@ public class WrapCallMaterialTask extends AbstractAcsTask { // 2任务完成 taskObj.put("task_status", StatusEnum.TASK_FINISH.getCode()); taskObj.put("update_time", DateUtil.now()); + taskObj.put("finished_type", ObjectUtil.isNotEmpty(task.getString("finished_type"))? + task.getString("finished_type"):AcsTaskEnum.TASK_FINISHED_TYPE_AUTO.getCode()); taskTab.update(taskObj); } else { /** diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java index 780fc415..31d96a38 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java @@ -67,6 +67,8 @@ public class WrapSendEmptyTask extends AbstractAcsTask { // 2任务完成 taskObj.put("task_status", StatusEnum.TASK_FINISH.getCode()); taskObj.put("update_time", DateUtil.now()); + taskObj.put("finished_type", ObjectUtil.isNotEmpty(task.getString("finished_type"))? + task.getString("finished_type"):AcsTaskEnum.TASK_FINISHED_TYPE_AUTO.getCode()); taskTab.update(taskObj); } else { /** diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java index 80f0359b..a302d1c8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java @@ -68,6 +68,8 @@ public class PlotterSendMaterialTask extends AbstractAcsTask { // 2任务完成 taskObj.put("task_status", StatusEnum.TASK_FINISH.getCode()); taskObj.put("update_time", DateUtil.now()); + taskObj.put("finished_type", ObjectUtil.isNotEmpty(task.getString("finished_type"))? + task.getString("finished_type"):AcsTaskEnum.TASK_FINISHED_TYPE_AUTO.getCode()); taskTab.update(taskObj); } else { /**