From c2550abf17be08fedff59098425d99353f56340e Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期五, 30 六月 2023 11:22:45 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |    6 +++++-
 src/main/java/com/zy/common/service/CommonService.java         |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 701bb1e..220790b 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -91,7 +91,11 @@
         if (locMast == null) {
             return false;
         }
-        Integer nowQua = this.baseMapper.selectEmptyLocCount0(locMast.getLocType1(), locMast.getLocType2(), locMast.getCrnNo());
+        Integer nowQua = 0;
+        nowQua = this.baseMapper.selectEmptyLocCount0(locMast.getLocType1(), locMast.getLocType2(), locMast.getCrnNo());
+        if (Cools.isEmpty(nowQua)) {
+            nowQua = 0;
+        }
         boolean res = nowQua > quaOfBlank;
         if (!res) {
             log.warn("{}鍙峰爢鍨涙満搴撲綅涓嶈冻锛屽洜婊炵暀绌哄簱浣峽}涓�,鐩墠绌哄簱浣峽}涓�", locMast.getCrnNo(), quaOfBlank, nowQua);
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index c4c5166..35af86a 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -445,7 +445,7 @@
                 // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
                 if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                     // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
-                    if (locMastService.checkEmptyCount0(locMast0, 6)) {
+                    if (locMastService.checkEmptyCount0(locMast0, 2)) {
                         locMast = locMast0;
                     }
                 }

--
Gitblit v1.9.1