From 27e041badaa2876d5a7f39da3ff6bb4005b57013 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 11 十一月 2024 16:49:05 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java | 8 ++++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/Utils.java | 10 ++++++++++
2 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
index 9e4f317..8a31403 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
@@ -485,6 +485,14 @@
continue;
}
+ //瑙ｆ瀽鍓嶅垽鏂唴閮ㄧ洰鏍囧�兼槸鍚︽湁鐗� 鏈夊伐浣滃彿
+ StaProtocol staProtocolInside = devpThread.getStation().get(Utils.getStaByLev(Utils.getLev(task.getDestLoc())));
+ if (staProtocolInside == null) {
+ continue;
+ }
+ if (staProtocolInside.isLoading() || staProtocolInside.getWorkNo() !=0) {
+ continue;
+ }
if (Cools.isEmpty(task.getShuttleNo())) {
//鍒嗛厤灏忚溅
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/Utils.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/Utils.java
index ab8d8aa..94afb9f 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/Utils.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/Utils.java
@@ -22,12 +22,22 @@
import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
public class Utils {
public static final String _LINK = "-";
+ public static Integer getStaByLev(Integer lev) {
+ HashMap<Integer, Integer> map = new HashMap<>();
+ map.put(1, 31006);
+ map.put(2, 31007);
+ map.put(3, 31008);
+
+ return map.get(lev);
+ }
+
/**
* 閫氳繃搴撲綅鍙疯幏鍙� 鎺�
*/
--
Gitblit v1.9.1