From f456520492f2539be4772eb2c4f6aad3df08f05f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 12 七月 2024 15:21:53 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
index cdc3cd6..bb35f7f 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
@@ -67,8 +67,17 @@
taskService.updateById(task);
continue;
}else if (task.getMemo().equals("06YZ0001")){
- task.setTaskSts(1001L);
- taskService.updateById(task);
+ HashMap<String, String> mesMap = new HashMap<>();
+ mesMap.put("taskNo", task.getWmsTaskNo());
+ mesMap.put("contNo",task.getZpallet());
+ boolean returnTask4 = toMesHttpRequest(mesMap, "172.18.231.126", "/api/wcs/wcsTaskInfo", "4",task.getZpallet());
+ if (returnTask4){
+ task.setTaskSts(1001L);
+ taskService.updateById(task);
+ log.info("鍑哄簱浠诲姟瀹屾垚鎺ㄩ�乵es"+task.getWmsTaskNo());
+ }else {
+ log.error("鍑哄簱浠诲姟瀹屾垚鎺ㄩ�乵es澶辫触"+task.getWmsTaskNo());
+ }
continue;
}
if (task.getTaskNo().equals(basConveyorSta.getTaskNo().toString())) {
@@ -78,6 +87,7 @@
if (httpRequest){
task.setTaskSts(1000L);
taskService.updateById(task);
+ log.info("鍑哄簱浠诲姟鎺ㄩ�乺gv"+task.getWmsTaskNo());
}else {
log.error("鍑哄簱浠诲姟鎺ㄩ�乺gv澶辫触"+task.getWmsTaskNo());
}
@@ -140,22 +150,25 @@
public synchronized void clearCompletedTask() {
ArrayList<Long> taskSts = new ArrayList<>();
taskSts.add(TaskStsType.COMPLETE_INBOUND.sts);
- taskSts.add(TaskStsType.OUT_TASK_OVER.sts);
- taskSts.add(TaskStsType.COMPLETE_CHARGE.sts);
- taskSts.add(TaskStsType.COMPLETE_MOVE.sts);
- taskSts.add(TaskStsType.COMPLETE_MANUAL.sts);
- taskSts.add(TaskStsType.COMPLETE_LADEN_MOVE.sts);
+
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
.eq(Task::getStatus, 1)
.in(Task::getTaskSts, taskSts));
for (Task task : tasks) {
+ if (Cools.isEmpty(task.getMemo())){
+ task.setTaskSts(998L);
+ taskService.updateById(task);
+ continue;
+ }
+
HashMap<String, String> mesMap = new HashMap<>();
mesMap.put("taskNo", task.getWmsTaskNo());
mesMap.put("contNo",task.getZpallet());
boolean returnTask4 = toMesHttpRequest(mesMap, "172.18.231.126", "/api/wcs/wcsTaskInfo", "4",task.getMemo());
if (returnTask4){
+ log.info("浠诲姟瀹屾垚鍚庝笂鎶es鎴愬姛锛屼换鍔″彿:"+task.getWmsTaskNo());
//璁板綍搴撳瓨淇℃伅
updateRecordLoc(task);
//浠诲姟杞巻鍙叉。
@@ -173,6 +186,12 @@
public synchronized void clearCompletedTask999() {
ArrayList<Long> taskSts = new ArrayList<>();
taskSts.add(TaskStsType.OUT_TASK_OVER_HAND.sts);
+ taskSts.add(TaskStsType.OUT_TASK_OVER.sts);
+ taskSts.add(TaskStsType.COMPLETE_CHARGE.sts);
+ taskSts.add(TaskStsType.COMPLETE_MOVE.sts);
+ taskSts.add(TaskStsType.COMPLETE_MANUAL.sts);
+ taskSts.add(TaskStsType.COMPLETE_LADEN_MOVE.sts);
+ taskSts.add(TaskStsType.IN_TASK_OVER_HAND.sts);
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
--
Gitblit v1.9.1