From 5317c6f53f6997e42e5bb9b72da4d8bbd6df9715 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 02 一月 2025 15:31:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 52b51c1..0a54bcf 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -149,14 +149,15 @@
LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", shallowLoc));
if (!Cools.isEmpty(locMast2)) {
- if (locMast2.getLocSts().equals("F")){
- tmp = locMast2;
+ if (locMast2.getLocSts().equals("F") || locMast2.getLocSts().equals("D")){
+ tmp = mast;
}
}
}else {
if (!Cools.isEmpty(mast)) {
- tmp = mast;
-
+ if (mast.getLocSts().equals("O")){
+ tmp = mast;
+ }
}
}
//棰勭暀绌哄簱浣�
--
Gitblit v1.9.1