From 4f4ae801fbd52546ee65353b43af7b41f37d9a44 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 20 十一月 2024 16:27:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3
---
src/main/java/com/zy/asrs/utils/Utils.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index a98297a..120906d 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -491,6 +491,10 @@
continue;
}
+ if (distLocMast.getLocSts().equals("X")) {
+ continue;//璋冭繃绂佺敤搴撲綅
+ }
+
//鍒ゆ柇璇ュ簱浣嶆槸鍚﹀瓨鍦ㄥ伐浣滄。
EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
wrapper.eq("loc_no", locNo);
--
Gitblit v1.9.1