From 7ea5b862e6d760824e305a26c36f688da038bf9c Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 26 五月 2023 11:02:46 +0800
Subject: [PATCH] 检测库位
---
src/main/java/com/zy/common/service/CommonService.java | 50 ++++++++++++++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index a080000..6e64ee7 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -271,15 +271,19 @@
//鎵炬渶澶栦晶绌哄簱浣�
List<LocMast> locMasts = locMastService.findOutMast(locTypeDto.getLocType1(), crnNos);
for (LocMast locMast0 : locMasts) {
- //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负R鎴朣(鍑哄叆搴撻绾︾姸鎬�)
+ //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
boolean flag = false;
List<String> insideLoc = Utils.getGroupInsideLoc(locMast0.getLocNo());
- List<LocMast> insideLocMast = locMastService.selectByLocNos(insideLoc);
- for (LocMast mast : insideLocMast) {
- if (mast.getLocSts().equals("R") || mast.getLocSts().equals("S")) {
- //R鎴朣(鍑哄叆搴撻绾︾姸鎬侊紝涓嶈兘閫夊畾杩欎釜澶栦晶搴撲綅)
- flag = true;
- break;
+ if (insideLoc.size() > 0) {
+ List<LocMast> insideLocMast = locMastService.selectByLocNos(insideLoc);
+ for (LocMast mast : insideLocMast) {
+ if (!mast.getLocSts().equals("D")
+ && !mast.getLocSts().equals("F")
+ && !mast.getLocSts().equals("X")) {
+ //D銆丗銆乆(涓嶈兘閫夊畾杩欎釜澶栦晶搴撲綅)
+ flag = true;
+ break;
+ }
}
}
if (flag) {
@@ -306,25 +310,31 @@
LocMast locMast = null;
List<LocMast> locMasts = locMastService.findEmptyLowFrequencyLocMast(locTypeDto.getLocType1());
for (LocMast locMast0 : locMasts) {
- //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负R鎴朣(鍑哄叆搴撻绾︾姸鎬�)
+ //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
boolean flag = false;
List<String> insideLoc = Utils.getGroupInsideLoc(locMast0.getLocNo());
- List<LocMast> insideLocMast = locMastService.selectByLocNos(insideLoc);
- for (LocMast mast : insideLocMast) {
- if (mast.getLocSts().equals("R") || mast.getLocSts().equals("S")) {
- //R鎴朣(鍑哄叆搴撻绾︾姸鎬侊紝涓嶈兘閫夊畾杩欎釜澶栦晶搴撲綅)
- flag = true;
- break;
+ if (insideLoc.size() > 0) {
+ List<LocMast> insideLocMast = locMastService.selectByLocNos(insideLoc);
+ for (LocMast mast : insideLocMast) {
+ if (!mast.getLocSts().equals("D")
+ && !mast.getLocSts().equals("F")
+ && !mast.getLocSts().equals("X")) {
+ //D銆丗銆乆(涓嶈兘閫夊畾杩欎釜澶栦晶搴撲綅)
+ flag = true;
+ break;
+ }
}
}
//妫�娴嬪綋鍓嶅簱浣嶅渚у簱浣嶆槸鍚︿负O(绌哄簱浣�)
List<String> outerLoc = Utils.getGroupOuterLoc(locMast0.getLocNo());
- List<LocMast> outerLocMast = locMastService.selectByLocNos(outerLoc);
- for (LocMast mast : outerLocMast) {
- if (!mast.getLocSts().equals("O")) {
- //涓嶆槸绌哄簱浣嶏紝鎵句笅涓�涓�
- flag = true;
- break;
+ if (outerLoc.size() > 0) {
+ List<LocMast> outerLocMast = locMastService.selectByLocNos(outerLoc);
+ for (LocMast mast : outerLocMast) {
+ if (!mast.getLocSts().equals("O")) {
+ //涓嶆槸绌哄簱浣嶏紝鎵句笅涓�涓�
+ flag = true;
+ break;
+ }
}
}
if (flag) {
--
Gitblit v1.9.1