From 59183282a7cfdb6bd0976697681c851baf696265 Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期五, 30 六月 2023 12:35:20 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/LocMastMapper.xml | 8 +++++---
src/main/java/com/zy/common/service/CommonService.java | 2 ++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 35af86a..a9303cf 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -444,6 +444,8 @@
if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
+ //鍒ゆ柇鏄惁闇�瑕佺Щ搴�
+
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
if (locMastService.checkEmptyCount0(locMast0, 2)) {
locMast = locMast0;
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index bd4b6ae..d883d4b 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -326,7 +326,9 @@
<select id="findEmptyLowFrequencyLocMast" resultMap="BaseResultMap">
select * from asr_loc_mast
where loc_type2 = 3
- and loc_type1 = #{locType1}
+ <if test="locType1 != 1">
+ and loc_type1 = #{locType1}
+ </if>
and loc_sts = 'O'
and crn_no = #{crnNo}
order by bay1,lev1,row1
@@ -352,8 +354,8 @@
</foreach>
</select>
- <select id="selectEmptyLocCount0" resultMap="BaseResultMap">
- select count(*) as count from asr_loc_mast
+ <select id="selectEmptyLocCount0" resultType="java.lang.Integer">
+ select count(1) from asr_loc_mast
where 1=1
and loc_sts = 'O'
and loc_type1 = #{locType1}
--
Gitblit v1.9.1