From e9152bae00b01fc80000d44f726f337084215748 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 21 五月 2025 10:19:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 202 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 166 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index d467c61..1d3c71e 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -1,20 +1,26 @@
package com.zy.asrs.task;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.alibaba.fastjson.JSON;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.core.exception.CoolException;
+import com.zy.asrs.domain.dto.NotifyCustomDataDto;
+import com.zy.asrs.domain.enums.NotifyMsgType;
import com.zy.asrs.domain.enums.TaskStatusType;
-import com.zy.asrs.entity.CommandInfo;
-import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.entity.param.TaskStatusFeedbackParam;
-import com.zy.asrs.service.CommandInfoService;
-import com.zy.asrs.service.TaskWrkService;
-import com.zy.asrs.utils.PostMesDataUtils;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.TaskWrkLogServiceImpl;
+import com.zy.asrs.utils.NotifyUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import java.util.List;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
/**
* 瀹氭椂灏嗕换鍔�(瀹屾垚銆佸彇娑�)杞垚鏃ュ織
@@ -26,46 +32,170 @@
@Autowired
private TaskWrkService taskWrkService;
@Autowired
- private CommandInfoService commandInfoService;
+ private TaskWrkLogServiceImpl wrkLogService;
@Value("${wms.url}")
private String wmsUrl;
- @Value("${wms.movePath}")
- private String movePath;
+ @Value("${wms.inboundTaskApplyPath}")
+ private String inboundTaskApplyPath;
+ @Value("${wms.TaskExecCallback}")
+ private String TaskExecCallback;
+ @Autowired
+ private NotifyUtils notifyUtils;
+ @Autowired
+ private LocMastService locMastService;
@Scheduled(cron = "0/3 * * * * ? ")
- public void execute() {
+ public void execute() throws IOException {
for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
- TaskStatusFeedbackParam taskStatusFeedbackParam = new TaskStatusFeedbackParam(taskWrk);
- if (taskWrk.getStatus().equals(TaskStatusType.COMPLETE.id)) {//瀹屾垚
- taskStatusFeedbackParam.setTaskStatus("done");
- new PostMesDataUtils().postMesData("瀹屾垚涓婃姤",wmsUrl,movePath,taskWrk);
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:ss:mm");
+ HashMap<String, Object> headParam = new HashMap<>();
+ headParam.put("taskNo", taskWrk.getTaskNo());
+ headParam.put("barcode", taskWrk.getBarcode());
+ headParam.put("reportTime", format.format(new Date()));
+
+ NotifyMsgType notifyMsgType = null;
+ if (taskWrk.getStatus().equals(TaskStatusType.OVER.id) || taskWrk.getStatus().equals(TaskStatusType.MANUAL_OVER.id)) {//瀹屾垚
+ headParam.put("status", TaskStatusType.OVER.id);
+ headParam.put("ioType", 1);
+ notifyMsgType = NotifyMsgType.TASK_COMPLETE;
+
+ if (taskWrk.getIoType() == 1) {//鍏ュ簱浠诲姟瀹屾垚搴撲綅涓篎
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ if (locMast == null) {
+ throw new CoolException("娌℃湁鎵惧埌璇ュ簱浣�" + taskWrk.getTargetPoint());
+ }
+
+ if (!locMast.getLocSts().equals("S")) {
+ throw new CoolException(taskWrk.getTaskNo() + "搴撲綅涓嶅浜嶴.鍏ュ簱棰勭害");
+ }
+
+ locMast.setLocSts("F");
+ locMast.setModiTime(new Date());
+ locMast.setBarcode(taskWrk.getBarcode());
+ locMastService.updateById(locMast);
+ } else if (taskWrk.getIoType() == 2) {//鍑哄簱浠诲姟瀹屾垚搴撲綅涓篛
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ if (locMast == null) {
+ throw new CoolException("娌℃湁鎵惧埌璇ュ簱浣�" + taskWrk.getStartPoint());
+ }
+
+ if (!locMast.getLocSts().equals("R")) {
+ throw new CoolException(taskWrk.getTaskNo() + "搴撲綅涓嶅浜嶳.鍑哄簱棰勭害");
+ }
+
+ locMast.setLocSts("O");
+ locMast.setModiTime(new Date());
+ locMast.setBarcode("");
+ locMastService.updateById(locMast);
+ } else if (taskWrk.getIoType() == 3) {//绉诲簱
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ if (locMast == null) {
+ throw new CoolException("娌℃湁鎵惧埌璇ュ簱浣�" + taskWrk.getStartPoint());
+ }
+
+ if (!locMast.getLocSts().equals("R")) {
+ throw new CoolException(taskWrk.getTaskNo() + "搴撲綅涓嶅浜嶳.鍑哄簱棰勭害");
+ }
+
+ LocMast locMastTarget = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ if (locMastTarget == null) {
+ throw new CoolException("娌℃湁鎵惧埌璇ュ簱浣�" + taskWrk.getTargetPoint());
+ }
+
+ if (!locMastTarget.getLocSts().equals("S")) {
+ throw new CoolException(taskWrk.getTaskNo() + "搴撲綅涓嶅浜嶴.鍏ュ簱棰勭害");
+ }
+
+ locMastTarget.setLocSts("F");
+ locMastTarget.setModiTime(new Date());
+ locMastTarget.setBarcode(taskWrk.getBarcode());
+ locMastService.updateById(locMastTarget);
+
+ locMast.setLocSts("O");
+ locMast.setModiTime(new Date());
+ locMast.setBarcode("");
+ locMastService.updateById(locMast);
+ }
+
} else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
- taskStatusFeedbackParam.setTaskStatus("cancelled");
- new PostMesDataUtils().postMesData("鍙栨秷浠诲姟瀹屾垚",wmsUrl,movePath,taskWrk);
+ headParam.put("status", TaskStatusType.CANCEL.id);
+ headParam.put("ioType", 2);
+ notifyMsgType = NotifyMsgType.TASK_CANCEL;
+
+ if (taskWrk.getIoType() == 1) {//鍏ュ簱浠诲姟
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ if (locMast == null) {
+ throw new CoolException("娌℃湁鎵惧埌璇ュ簱浣�" + taskWrk.getTargetPoint());
+ }
+
+ if (!locMast.getLocSts().equals("S")) {
+ throw new CoolException(taskWrk.getTaskNo() + "搴撲綅涓嶅浜嶴.鍏ュ簱棰勭害");
+ }
+
+ locMast.setLocSts("O");
+ locMast.setModiTime(new Date());
+ locMast.setBarcode("");
+ locMastService.updateById(locMast);
+ } else if (taskWrk.getIoType() == 2) {//鍑哄簱浠诲姟
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ if (locMast == null) {
+ throw new CoolException("娌℃湁鎵惧埌璇ュ簱浣�" + taskWrk.getStartPoint());
+ }
+
+ if (!locMast.getLocSts().equals("R")) {
+ throw new CoolException(taskWrk.getTaskNo() + "搴撲綅涓嶅浜嶳.鍑哄簱棰勭害");
+ }
+
+ locMast.setLocSts("F");
+ locMast.setModiTime(new Date());
+ locMast.setBarcode(taskWrk.getBarcode());
+ locMastService.updateById(locMast);
+ } else if (taskWrk.getIoType() == 3) {//绉诲簱
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ if (locMast == null) {
+ throw new CoolException("娌℃湁鎵惧埌璇ュ簱浣�" + taskWrk.getStartPoint());
+ }
+
+ if (!locMast.getLocSts().equals("R")) {
+ throw new CoolException(taskWrk.getTaskNo() + "搴撲綅涓嶅浜嶳.鍑哄簱棰勭害");
+ }
+
+ LocMast locMastTarget = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ if (locMastTarget == null) {
+ throw new CoolException("娌℃湁鎵惧埌璇ュ簱浣�" + taskWrk.getTargetPoint());
+ }
+
+ if (!locMastTarget.getLocSts().equals("S")) {
+ throw new CoolException(taskWrk.getTaskNo() + "搴撲綅涓嶅浜嶴.鍏ュ簱棰勭害");
+ }
+
+ locMastTarget.setLocSts("O");
+ locMastTarget.setModiTime(new Date());
+ locMastTarget.setBarcode("");
+ locMastService.updateById(locMastTarget);
+
+ locMast.setLocSts("F");
+ locMast.setModiTime(new Date());
+ locMast.setBarcode(taskWrk.getBarcode());
+ locMastService.updateById(locMast);
+ }
}
- if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) > 0) {
- //浠诲姟宸茬粡杞棩蹇楋紝灏嗚浠诲姟涓嬮潰鐨勬寚浠よ浆鏃ュ織
- commandInfoService.saveToHistory(taskWrk.getTaskNo());
+ 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, JSON.toJSONString(taskWrk), true, customDataDto);
- //鍒犻櫎浠诲姟
- taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
- //鍒犻櫎鎸囦护
- commandInfoService.delete(new EntityWrapper<CommandInfo>().eq("task_no", taskWrk.getTaskNo()));
+ TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
+ if (!wrkLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+ }
+ if (!taskWrkService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
}
}
- }
-
- //娓呯悊鎵嬪姩鍛戒护
- @Scheduled(cron = "0/3 * * * * ? ")
- public void ManualCommandClean() {
- List<CommandInfo> commandInfos = commandInfoService.selectCompleteManualCommand();
- for (CommandInfo commandInfo : commandInfos) {
- //鎸囦护杞棩蹇�
- commandInfoService.saveToHistory(commandInfo.getId());
- }
-
}
}
--
Gitblit v1.9.1