From e3e341f6891e08a3942b8002e5e04af1131442ae Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 26 五月 2025 11:15:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 212 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 153 insertions(+), 59 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 1e53034..0480b0f 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -1,17 +1,16 @@
package com.zy.asrs.task;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+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.*;
-import com.zy.asrs.entity.param.TaskOverToWms;
-import com.zy.asrs.entity.param.TaskStatusFeedbackParam;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.TaskWrkLogServiceImpl;
-import com.zy.asrs.utils.PostMesDataUtils;
-import com.zy.common.utils.HttpHandler;
+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;
@@ -19,10 +18,9 @@
import org.springframework.stereotype.Component;
import java.io.IOException;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
/**
* 瀹氭椂灏嗕换鍔�(瀹屾垚銆佸彇娑�)杞垚鏃ュ織
@@ -34,72 +32,168 @@
@Autowired
private TaskWrkService taskWrkService;
@Autowired
- private CommandInfoService commandInfoService;
- @Autowired
- private ApiLogService apiLogService;
- @Autowired
- private BasDevpService basDevpService;
-
- @Autowired
- private StaDescService staDescService;
- @Autowired
- private LocMastService locMastService;
- @Autowired
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;
- @Value("${wms.taskStatusFeedbackPath}")
- private String taskStatusFeedbackPath;
+ @Autowired
+ private NotifyUtils notifyUtils;
+ @Autowired
+ private LocMastService locMastService;
@Scheduled(cron = "0/3 * * * * ? ")
public void execute() throws IOException {
-
for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:ss:mm");
HashMap<String, Object> headParam = new HashMap<>();
- if (taskWrk.getStatus().equals(TaskStatusType.OVER.id) || taskWrk.getStatus() == 7) {//瀹屾垚
- headParam.put("Result", 1);
+ 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", taskWrk.getIoType());
+ 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)) {
- headParam.put("Result", 2);
+ headParam.put("status", TaskStatusType.CANCEL.id);
+ headParam.put("ioType", taskWrk.getIoType());
+ 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);
+ }
}
- String response = "";
- Boolean bool = false;
- try {
- headParam.put("TaskNo", taskWrk.getTaskNo());
- log.info("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms={}", taskWrk);
- response = new HttpHandler.Builder()
- // .setHeaders(headParam)
- .setUri(wmsUrl)
- .setPath(TaskExecCallback)
- .setJson(JSON.toJSONString(headParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
- if (!wrkLogService.insert(taskWrkLog)) {
- throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
- }
- if (!taskWrkService.deleteById(taskWrk)) {
- throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
- }
- bool = true;
- } catch (Exception e) {
- log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶辫触{},杩斿洖鍊�={}", taskWrk, response);
- } finally {
- apiLogService.save("wcs瀹屾垚鎴栬�呭彇娑堜换鍔′笂鎶ms"
- , wmsUrl + TaskExecCallback
- , null
- , "127.0.0.1"
- , JSON.toJSONString(headParam)
- , response
- , bool
- );
+
+ 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);
+
+ TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
+ if (!wrkLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+ }
+ if (!taskWrkService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
}
}
}
--
Gitblit v1.9.1