From 7696449765db40cc251619554e68c6b7e50a13bd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 01 二月 2023 09:28:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 8 ++++----
src/main/resources/mapper/LocMastMapper.xml | 6 ++++++
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 4 ++--
src/main/java/com/zy/asrs/service/LocMastService.java | 4 ++--
src/main/java/com/zy/common/service/CommonService.java | 6 +++---
5 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 3c9ec56..e0722fe 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -19,8 +19,8 @@
, @Param("rowsLen") Integer rowsLen, @Param("locType1") Short locType1, @Param("inoutEveryday") Boolean inoutEveryday
, @Param("rowBeg") Integer rowBeg, @Param("rowEnd") Integer rowEnd, @Param("bayBeg") Integer bayBeg
, @Param("bayEnd") Integer bayEnd, @Param("levBeg") Integer levBeg, @Param("levEnd") Integer levEnd);
- List<LocMast> queryFreeLocMastEnd(@Param("row") Integer row);
- List<LocMast> queryFreeLocMastEnd0(@Param("bay") Integer bay,@Param("lev") Integer lev,@Param("row1") Integer row);
+ List<LocMast> queryFreeLocMastEnd(@Param("row") Integer row, @Param("locType1") Short locType1);
+ List<LocMast> queryFreeLocMastEnd0(@Param("bay") Integer bay,@Param("lev") Integer lev,@Param("row1") Integer row, @Param("locType1") Short locType1);
@Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
List<String> queryGroupEmptyStock(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 e6c33e7..7e6e34e 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -15,8 +15,8 @@
List<LocMast> queryFreeLocMast0(List<Integer> rows, Integer rowsLen, Short locType1,Boolean inoutEveryday);
List<LocMast> queryFreeLocMast1(List<Integer> rows, Integer rowsLen, Short locType1,Boolean inoutEveryday
, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd);
- List<LocMast> queryFreeLocMastEnd(Integer row);
- List<LocMast> queryFreeLocMastEnd0(Integer bay,Integer lev,Integer row);
+ List<LocMast> queryFreeLocMastEnd(Integer row, Short locType1);
+ List<LocMast> queryFreeLocMastEnd0(Integer bay,Integer lev,Integer row, Short locType1);
/**
* 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
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 47c9f4c..c19181d 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -41,12 +41,12 @@
}
@Override
- public List<LocMast> queryFreeLocMastEnd(Integer row){
- return this.baseMapper.queryFreeLocMastEnd(row);
+ public List<LocMast> queryFreeLocMastEnd(Integer row, Short locType1){
+ return this.baseMapper.queryFreeLocMastEnd(row, locType1);
}
@Override
- public List<LocMast> queryFreeLocMastEnd0(Integer bay,Integer lev,Integer row){
- return this.baseMapper.queryFreeLocMastEnd0(bay,lev,row);
+ public List<LocMast> queryFreeLocMastEnd0(Integer bay,Integer lev,Integer row, Short locType1){
+ return this.baseMapper.queryFreeLocMastEnd0(bay,lev,row, locType1);
}
@Override
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index f70fdf4..eae98cf 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -355,13 +355,13 @@
// 2.鏃犲簱浣嶆椂锛屾棤瑙嗗尯鍩熼攣瀹氾紝閲嶆柊鏌ユ壘搴撲綅
if (Cools.isEmpty(locMast)){
- List<LocMast> locMasts = locMastService.queryFreeLocMastEnd(curRow);
+ List<LocMast> locMasts = locMastService.queryFreeLocMastEnd(curRow, locTypeDto.getLocType1());
int sign=curRow;
while (true){
if (locMasts.size()==0){
sign = getCurRow(sign);
if (sign != 0){
- locMasts = locMastService.queryFreeLocMastEnd(sign);
+ locMasts = locMastService.queryFreeLocMastEnd(sign, locTypeDto.getLocType1());
}else {
break;
}
@@ -370,7 +370,7 @@
}
}
for (LocMast locMast1 : locMasts){
- List<LocMast> locMasts1 = locMastService.queryFreeLocMastEnd0(locMast1.getBay1(), locMast1.getLev1(),locMast1.getRow1());
+ List<LocMast> locMasts1 = locMastService.queryFreeLocMastEnd0(locMast1.getBay1(), locMast1.getLev1(),locMast1.getRow1(), locTypeDto.getLocType1());
Integer innermostRow = Utils.getInnermostRow(locMasts1.get(0).getLocNo());
for (LocMast locMast2:locMasts1){
if (locMast2.getLocSts().equals("O")){
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index f68296b..006bb7d 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -191,6 +191,9 @@
from asr_loc_mast
where row1=#{row}
and loc_sts='O'
+ <if test="locType1 != null">
+ and loc_type1 = #{locType1}
+ </if>
and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')
order by loc_sts desc ,lev1 asc,bay1 asc
</select>
@@ -201,6 +204,9 @@
where bay1=#{bay}
and lev1=#{lev}
-- and loc_sts='O'
+ <if test="locType1 != null">
+ and loc_type1 = #{locType1}
+ </if>
and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')
<if test="row1 >= 1 and row1 <= 3">
and row1 >= 1 and row1 <= 3
--
Gitblit v1.9.1