From 340b69790a7a2eff1ff5de75f109dc77f4b4008f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 13 十一月 2024 16:12:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/common/service/CommonService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index f651036..d15026d 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -150,7 +150,7 @@
.eq("loc_no", shallowLoc));
if (!Cools.isEmpty(locMast2)) {
if (locMast2.getLocSts().equals("F") || locMast2.getLocSts().equals("D")){
- tmp = locMast2;
+ tmp = mast;
}
}
}else {
@@ -161,7 +161,7 @@
}
}
//棰勭暀绌哄簱浣�
- if (tmp != null && locMastService.checkEmptyCount(mast, 10)) {
+ if (tmp != null) {
locMast = tmp;
break;
}
--
Gitblit v1.9.1