From 392aebed0af81c8369a3f07dfdc53cad1b59f6b4 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 09 三月 2023 16:53:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/java/com/zy/common/service/CommonService.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 3d48739..296bbbd 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -380,14 +380,17 @@
success = false; break;
}
}
- // 娣卞簱浣�
+ // 娣卞簱浣嶅垽鏂�
List<String> insideLocList = Utils.getGroupInsideLoc(loc.getLocNo());
for (String insideLocNo : insideLocList) {
LocMast insideLoc = locMastService.selectById(insideLocNo);
if (Cools.isEmpty(insideLoc)) {
continue;
}
- if (insideLoc.getLocSts().equals("R") || insideLoc.getLocSts().equals("P")) {
+ if (insideLoc.getLocSts().equals("R")
+ || insideLoc.getLocSts().equals("P")
+ || insideLoc.getLocSts().equals("Q")
+ || insideLoc.getLocSts().equals("S")) {
success = false; break;
}
}
@@ -430,7 +433,10 @@
if (Cools.isEmpty(insideLoc)) {
continue;
}
- if (insideLoc.getLocSts().equals("R") || insideLoc.getLocSts().equals("P")) {
+ if (insideLoc.getLocSts().equals("R")
+ || insideLoc.getLocSts().equals("P")
+ || insideLoc.getLocSts().equals("Q")
+ || insideLoc.getLocSts().equals("S")) {
success = false; break;
}
}
--
Gitblit v1.9.1