From d8282bc83c48030c3338ce014a88574d1bbfe895 Mon Sep 17 00:00:00 2001 From: bfwms <1> Date: 星期六, 29 三月 2025 16:50:59 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 12 +++++++++++- 1 files changed, 11 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..376cb17 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java @@ -76,6 +76,7 @@ @Override public Boolean checkEmptyCount(LocMast locMast, int quaOfBlank) { +// quaOfBlank = 0; if (locMast == null) { return false; } @@ -91,7 +92,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 +235,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