From fa4f0111f1f4293cc6dc26c94e3198322fdb6ad2 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 23 四月 2025 08:43:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index c299dc2..dc30951 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -48,17 +48,21 @@
for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
HashMap<String, Object> headParam = new HashMap<>();
headParam.put("TaskNo", taskWrk.getTaskNo());
+
+ NotifyMsgType notifyMsgType = null;
if (taskWrk.getStatus().equals(TaskStatusType.OVER.id) || taskWrk.getStatus() == 7) {//瀹屾垚
headParam.put("Result", 1);//瀹屾垚
+ notifyMsgType = NotifyMsgType.TASK_COMPLETE;
} else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
headParam.put("Result", 2);//鍙栨秷
+ notifyMsgType = NotifyMsgType.TASK_CANCEL;
}
NotifyCustomDataDto customDataDto = new NotifyCustomDataDto();
customDataDto.setUri(wmsUrl);
customDataDto.setPath(TaskExecCallback);
customDataDto.setData(JSON.toJSONString(headParam));
- notifyUtils.notify("task", 1, String.valueOf(taskWrk.getWrkNo()), taskWrk.getTaskNo(), NotifyMsgType.TASK_COMPLETE, JSON.toJSONString(taskWrk), true, customDataDto);
+ notifyUtils.notify("task", 1, String.valueOf(taskWrk.getWrkNo()), taskWrk.getTaskNo(), notifyMsgType, JSON.toJSONString(taskWrk), true, customDataDto);
TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
if (!wrkLogService.insert(taskWrkLog)) {
--
Gitblit v1.9.1