From f2d1970cfd6d105e28d0a51a5313f30f81dbe63a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 05 十一月 2025 13:40:34 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 +++-
src/main/java/com/zy/core/MainProcess.java | 5 ++++-
2 files changed, 7 insertions(+), 2 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 6ffce8f..510d1ef 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3367,7 +3367,9 @@
if (crnProtocol == null) {
continue;
}
-
+ if (Cools.isEmpty(crnProtocol.getLocMastDemoList())) {
+ continue;
+ }
for (String locNo : crnProtocol.getLocMastDemoList()){
LocMast locMast = locMastService.selectByLocNo(locNo);
if (locMast.getLocSts().equals("F")){
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 7998686..75f8e79 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -186,7 +186,10 @@
SystemProperties.WCS_RUNNING_STATUS_DEMO.set(true);
SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 2;
} else if (signHpMk == 1) {
- SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 1;
+// SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 1;
+
+ SystemProperties.WCS_RUNNING_STATUS_DEMO.set(true);
+ SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 2;
} else {
SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE = 0;
}
--
Gitblit v1.9.1