From b3d902bb16adf735a554d9b3f5d383b014d9697b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 11 七月 2024 09:10:56 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/TaskStsType.java | 3 ++-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java | 19 ++++++++++++++-----
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java | 3 +++
3 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java
index 53a9308..c2b2bc2 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java
@@ -377,6 +377,9 @@
int row = Integer.parseInt(loc.substring(6,8));
int bay = Integer.parseInt(loc.substring(8,10));
int lev = Integer.parseInt(loc.substring(10,12));
+ if (row == 2){
+ row = 3;
+ }
locNo = row +"-"+bay+"-"+lev;
return locNo;
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/TaskStsType.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/TaskStsType.java
index 5e7b858..31920eb 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/TaskStsType.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/TaskStsType.java
@@ -5,7 +5,8 @@
public enum TaskStsType {
OUT_TASK_OVER(1001,"鍑哄簱浠诲姟瀹屾垚"),
- OUT_TASK_OVER_HAND(999,"鍑哄簱浠诲姟瀹屾垚"),
+ OUT_TASK_OVER_HAND(999,"鎵嬪姩鍑哄簱浠诲姟瀹屾垚"),
+ IN_TASK_OVER_HAND(998,"鎵嬪姩鍏ュ簱浠诲姟瀹屾垚"),
NEW_INBOUND(1, "鐢熸垚鍏ュ簱浠诲姟"),
ANALYZE_INBOUND(2, "鍏ュ簱浠诲姟瑙ｆ瀽"),
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..896d325 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
@@ -140,22 +140,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 +176,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