From 84b74dfb03ee81307e88b128d57d55cbbe47678e Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 10 三月 2023 13:51:06 +0800
Subject: [PATCH] # 演示
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 5 +++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 7 +++++--
src/main/resources/mapper/LocMastMapper.xml | 4 ++++
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 2 ++
src/main/java/com/zy/asrs/service/LocMastService.java | 8 ++++++++
5 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 9fd1d06..f9ae090 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -32,6 +32,8 @@
LocMast queryDemoLoc(@Param("crnNo") Integer crnNo);
+ LocMast queryDemoLoc0(@Param("crnNo") Integer crnNo, @Param("locType1") short locType1);
+
@Select("select count(*) as count from asr_loc_mast where 1=1 and loc_sts = 'O' and loc_type1 = #{locType1} and crn_no = #{crnNo}")
Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("crnNo") Integer crnNo);
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index bc45966..60ed6f8 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -39,6 +39,14 @@
LocMast queryDemoLoc(Integer crn);
/**
+ * 鍫嗗灈鏈烘紨绀鸿幏鍙栫洰鏍囧簱浣�
+ * @param crn
+ * @param locType1
+ * @return
+ */
+ LocMast queryDemoLoc0(Integer crn, short locType1);
+
+ /**
* 妫�鏌ュ綋鍓嶅簱浣嶆墍灞炲贩閬撶殑绌哄簱浣嶆暟閲�
* @param locMast
* @return
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 ababf93..0607b65 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -45,6 +45,11 @@
}
@Override
+ public LocMast queryDemoLoc0(Integer crn, short locType1) {
+ return this.baseMapper.queryDemoLoc0(crn,locType1);
+ }
+
+ @Override
public Boolean checkEmptyCount(LocMast locMast) {
if (locMast == null) {
return false;
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 64db69b..7f27dce 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1839,8 +1839,11 @@
}
LocMast sourceLoc = locMastService.queryDemoSourceLoc(crn.getId());
- LocMast loc = locMastService.queryDemoLoc(crn.getId());
- if (null == sourceLoc || null == loc) {
+ if (null == sourceLoc ) {
+ continue;
+ }
+ LocMast loc = locMastService.queryDemoLoc0(crn.getId(),sourceLoc.getLocType1());
+ if ( null == loc) {
continue;
}
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 7821af2..796ebd6 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -59,4 +59,8 @@
ORDER BY NEWID()
</select>
+ <select id="queryDemoLoc0" resultMap="BaseResultMap">
+ select top 1 * from asr_loc_mast where crn_no = #{crnNo} and loc_sts = 'O'and loc_type1 = #{locType1}
+ ORDER BY NEWID()
+ </select>
</mapper>
--
Gitblit v1.9.1