From 24b0b06a6e13f74db86e2c643097b37cada07d58 Mon Sep 17 00:00:00 2001 From: Administrator <56479841@QQ.COM> Date: 星期六, 10 六月 2023 17:24:56 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/utils/Utils.java | 1 + src/main/java/com/zy/common/service/CommonService.java | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java index debe482..5b2270f 100644 --- a/src/main/java/com/zy/asrs/utils/Utils.java +++ b/src/main/java/com/zy/asrs/utils/Utils.java @@ -700,6 +700,7 @@ for (LocMast mast : insideLocMast) { if (!mast.getLocSts().equals("D") && !mast.getLocSts().equals("F") + && !mast.getLocSts().equals("O") && !mast.getLocSts().equals("X")) { //D銆丗銆乆(涓嶈兘閫夊畾杩欎釜澶栦晶搴撲綅) return true; diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 823a720..0f3f7ec 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -193,6 +193,13 @@ if (locMast != null) { //鎵惧埌搴撲綅锛岃繑鍥瀌to sign=true; + } else { + //鍗曞搧娌℃湁鎵惧埌搴撲綅锛屾壘楂橀娣锋斁鍖哄煙搴撲綅 + locMast = getLocNoStep3(locTypeDto, crnNos); + if (locMast != null) { + //鎵惧埌搴撲綅锛岃繑鍥瀌to + sign=true; + } } } else if (matType == 2) {//楂橀绫诲瀷鍏ユ渶澶栦晶搴撲綅 locMast = getLocNoStep3(locTypeDto, crnNos); @@ -325,7 +332,7 @@ // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父 if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) { // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣� - if (locMastService.checkEmptyCount(locMast0, 10)) { + if (locMastService.checkEmptyCount(locMast0, 10) && locMast0.getCrnNo()>=3) { locMast = locMast0; break; } @@ -352,7 +359,7 @@ // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父 if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) { // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣� - if (locMastService.checkEmptyCount(locMast0, 10)) { + if (locMastService.checkEmptyCount(locMast0, 10) && locMast0.getCrnNo()>=3) { locMast = locMast0; break; } -- Gitblit v1.9.1