From 794ed17c6f37a6deacb6ef37349dceb03eae3395 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 06 六月 2025 08:40:35 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 12 ++++++++++++
src/main/java/com/zy/core/MainProcess.java | 2 +-
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 0cf1887..c41153e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -263,6 +263,8 @@
//鑾峰彇灏忚溅鍙栨斁浠诲姟鍒楄〃澶辫触
public synchronized List<List<List<WrkMast>>> getWrkMastListAll(List<List<Integer>> siteListAll ,BasDevpPosition[] basDevpPositionsListUN) {
List<List<List<WrkMast>>> wrkMastListAll = new ArrayList<>();
+ List<Integer> sourceStaNoList = new ArrayList<>();
+
for (List<Integer> siteList : siteListAll){
List<List<WrkMast>> wrkMastLists = new ArrayList<>();
try {
@@ -273,9 +275,19 @@
for (WrkMast wrkMast : wrkMastList) {
if (!Cools.isEmpty(wrkMast)) {
if (siteList.contains(wrkMast.getSourceStaNo())){
+ if (!sourceStaNoList.contains(wrkMast.getSourceStaNo())){
+ List<WrkMast> wrkMastListS = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("source_sta_no", wrkMast.getSourceStaNo()).eq("wrk_sts", 1L).orderBy("modi_time", true));
+ if (wrkMastListS.isEmpty()){
+ continue;
+ }
+ } else {
+ continue;
+ }
if (SortTheExecutionOfTheCarUtil.devpNoSortbj(basDevpPositionsListUN, wrkMast.getSourceStaNo(), wrkMast.getStaNo())) {
+ sourceStaNoList.add(wrkMast.getSourceStaNo());
wrkMastlistA.add(wrkMast);
} else {
+ sourceStaNoList.add(wrkMast.getSourceStaNo());
wrkMastlistB.add(wrkMast);
}
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 2bca69b..4034c7e 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -53,7 +53,7 @@
Thread.sleep(200);
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
--
Gitblit v1.9.1