From 4f1cb437bd84e1922e5c60d4a583137fda581cc8 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 29 六月 2023 17:09:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 12 ++++++++++++
src/main/resources/mapper/LocMastMapper.xml | 18 ++++++++++++++++++
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 2 ++
src/main/java/com/zy/asrs/service/LocMastService.java | 7 +++++++
src/main/java/com/zy/common/service/CommonService.java | 2 +-
5 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index ffecd1d..e757e6b 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -34,6 +34,8 @@
@Select("select count(*) as count from asr_loc_mast where 1=1 and loc_sts = 'O' and loc_type1 = #{locType1} and loc_type2 = #{locType2} and crn_no = #{crnNo}")
Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("locType2") Short locType2, @Param("crnNo") Integer crnNo);
+ Integer selectEmptyLocCount0(@Param("locType1") Short locType1, @Param("locType2") Short locType2, @Param("crnNo") Integer crnNo);
+
void updateLocSts(@Param("locNo") String locNo,@Param("locSts") String locSts);
//鎵惧渚х┖搴撲綅
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index c896f45..ec6efa3 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -36,6 +36,13 @@
Boolean checkEmptyCount(LocMast locMast, int quaOfBlank);
/**
+ * 妫�鏌ュ綋鍓嶅簱浣嶆墍灞炲贩閬撶殑绌哄簱浣嶆暟閲�
+ * @param locMast
+ * @return
+ */
+ Boolean checkEmptyCount0(LocMast locMast, int quaOfBlank);
+
+ /**
* 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵�
*/
Boolean checkWhole(List<LocDetl> locDetls);
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 930a1b0..701bb1e 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -86,6 +86,18 @@
}
return res;
}
+ @Override
+ public Boolean checkEmptyCount0(LocMast locMast, int quaOfBlank) {
+ if (locMast == null) {
+ return false;
+ }
+ Integer nowQua = this.baseMapper.selectEmptyLocCount0(locMast.getLocType1(), locMast.getLocType2(), locMast.getCrnNo());
+ boolean res = nowQua > quaOfBlank;
+ if (!res) {
+ log.warn("{}鍙峰爢鍨涙満搴撲綅涓嶈冻锛屽洜婊炵暀绌哄簱浣峽}涓�,鐩墠绌哄簱浣峽}涓�", locMast.getCrnNo(), quaOfBlank, nowQua);
+ }
+ return res;
+ }
@Override
public Boolean checkWhole(List<LocDetl> locDetls) {
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index f70ed5b..c4c5166 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.checkEmptyCount(locMast0, 10)) {
+ if (locMastService.checkEmptyCount0(locMast0, 6)) {
locMast = locMast0;
}
}
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index e71c79e..bd4b6ae 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -351,4 +351,22 @@
#{item}
</foreach>
</select>
+
+ <select id="selectEmptyLocCount0" resultMap="BaseResultMap">
+ select count(*) as count from asr_loc_mast
+ where 1=1
+ and loc_sts = 'O'
+ and loc_type1 = #{locType1}
+ and loc_type2 = #{locType2}
+ and crn_no = #{crnNo}
+ <if test="crnNo == 1">
+ and row1 in (3,4)
+ </if>
+ <if test="crnNo == 2">
+ and row1 in (11,12)
+ </if>
+ <if test="crnNo == 3">
+ and row1 in (18,19)
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.1