From d2c1030a17f4bcf6846e52f7bc91068159cc8f99 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 11 十月 2024 11:00:37 +0800
Subject: [PATCH] --

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 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..ec31817 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);
@@ -230,6 +234,11 @@
     }
 
     @Override
+    public List<LocMast> findInEmptyLocMastNew(Short locType1, List<String> locNos, Integer crnNo) {
+        return this.baseMapper.findInEmptyLocMastNew(locType1, locNos, crnNo);
+    }
+
+    @Override
     public List<LocMast> findEmptyLocMastByLocNos(Short locType1, List<String> locNos, Integer crnNo) {
         return this.baseMapper.findEmptyLocMastByLocNos(locType1, locNos, crnNo);
     }

--
Gitblit v1.9.1