From 1854c5182fe81f3663b794963cb5ea62f648b699 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 15 十月 2024 13:41:28 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/ShuttleStandby.java | 9 +++++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java | 4 +++-
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/ShuttleStandby.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/ShuttleStandby.java
index a9ca548..28ef641 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/ShuttleStandby.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/ShuttleStandby.java
@@ -249,6 +249,15 @@
return null;
}
+ public List<String> getStandbyLoc$() {
+ ArrayList<String> list = new ArrayList<>();
+ if (this.standbyLoc != null) {
+ List<String> standbyLocs = JSON.parseArray(this.standbyLoc, String.class);
+ list.addAll(standbyLocs);
+ }
+ return list;
+ }
+
public List<String> getLockPath$() {
ArrayList<String> list = new ArrayList<>();
if (this.lockPath != null) {
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
index be5cc3e..5c2f664 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
@@ -477,7 +477,9 @@
String standbyLocNoFrom = shuttleStandbyFrom.getDeviceStandbyLoc();
//绌挎杞﹀嚭鎻愬崌鏈哄悗灏忚溅寰呮満浣�
- String shuttleFromLiftStandbyLoc = shuttleStandbyFrom.getStandbyLoc();
+ List<String> standbyLocs = shuttleStandbyFrom.getStandbyLoc$();//鑾峰彇鍏ㄩ儴寰呮満浣�
+ //鑾峰彇鍙敤寰呮満浣�
+ String shuttleFromLiftStandbyLoc = shuttleDispatcher.searchAvailableLocNo(Integer.valueOf(shuttleDevice.getDeviceNo()), shuttleDevice.getHostId(), shuttleThread.getStatus().getCurrentLocNo(), standbyLocs);
//鎹㈠眰闇�瑕侀攣瀹氱殑璺緞
List<String> lockPath = shuttleStandbyFrom.getLockPath$();
--
Gitblit v1.9.1