From 9f83a9d589aaf22cb790515272a425216ea618b2 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 27 九月 2025 16:57:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 33 +----------
src/main/resources/mapper/LocMastMapper.xml | 47 ---------------
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 9 --
src/main/java/com/zy/asrs/service/LocMastService.java | 26 --------
src/main/java/com/zy/common/service/CommonService.java | 6 ++
5 files changed, 13 insertions(+), 108 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index bd3aa02..9161a21 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -13,15 +13,8 @@
@Repository
public interface LocMastMapper extends BaseMapper<LocMast> {
- LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType1") Short locType1);
-
@Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and lev1 = #{lev}")
List<String> queryGroupEmptyStock(Integer lev);
- @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);
-
- List<LocMast> queryShallowLocFMast(@Param("crnNo") Integer crnNo);
-
- List<LocMast> querySame(@Param("matnr") String matnr,@Param("lev1") Integer lev1);
+ List<Integer> getLevList();
}
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index dc2562c..d4c0da6 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -8,12 +8,6 @@
import java.util.List;
public interface LocMastService extends IService<LocMast> {
-
- /**
- * 妫�绱㈠彲鐢ㄥ簱浣�
- */
- LocMast queryFreeLocMast(Integer row, Short locType1);
-
/**
* 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
* @param sourceLocNo 婧愬簱浣�
@@ -21,23 +15,5 @@
*/
List<String> queryGroupEmptyStock(String sourceLocNo);
- /**
- * 妫�鏌ュ綋鍓嶅簱浣嶆墍灞炲贩閬撶殑绌哄簱浣嶆暟閲�
- * @param locMast
- * @return
- */
- Boolean checkEmptyCount(LocMast locMast);
-
- /**
- * 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵�
- */
- Boolean checkWhole(List<LocDetl> locDetls);
-
- /**
- * 鏌ヨ娴呭簱浣嶅湪搴擄紝娣卞簱浣嶄负O鐨勬暟鎹�
- * @return
- */
- List<LocMast> queryShallowLocFMast(Integer crnNo);
-
- List<LocMast> querySame(String matnr,Integer lev1);
+ List<Integer> getLevList();
}
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 54306de..687e73d 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -2,27 +2,18 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
-import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.RowLastnoService;
import com.zy.asrs.utils.Utils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Collections;
import java.util.List;
@Service("locMastService")
public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
- @Autowired
- private RowLastnoService rowLastnoService;
-
- @Override
- public LocMast queryFreeLocMast(Integer row, Short locType1) {
- return this.baseMapper.queryFreeLocMast(row, locType1);
- }
@Override
public List<String> queryGroupEmptyStock(String sourceLocNo) {
@@ -37,25 +28,7 @@
}
@Override
- public Boolean checkEmptyCount(LocMast locMast) {
- if (locMast == null) {
- return false;
- }
- return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
- }
-
- @Override
- public Boolean checkWhole(List<LocDetl> locDetls) {
- return null;
- }
-
- @Override
- public List<LocMast> queryShallowLocFMast(Integer crnNo) {
- return this.baseMapper.queryShallowLocFMast(crnNo);
- }
-
- @Override
- public List<LocMast> querySame(String matnr,Integer lev1) {
- return this.baseMapper.querySame(matnr,lev1);
+ public List<Integer> getLevList() {
+ return this.baseMapper.getLevList();
}
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index e1761f0..faefd3f 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -198,6 +198,9 @@
List<Integer> levList = basCrnpService.getLevList();
Collections.shuffle(levList);
+ List<Integer> locLevList = locMastService.getLevList();
+ levList.addAll(locLevList);
+
for (Integer lev : levList) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("loc_sts", "O")
@@ -281,6 +284,9 @@
List<Integer> levList = basCrnpService.getLevList();
Collections.shuffle(levList);
+ List<Integer> locLevList = locMastService.getLevList();
+ levList.addAll(locLevList);
+
for (Integer lev : levList) {
//鐩歌繎鐗╂枡鍖归厤澶辫触锛屾悳绱㈠彲鐢ㄧ┖搴撲綅缁�
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index cafcb93..4141025 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -37,51 +37,8 @@
</resultMap>
- <select id="queryFreeLocMast" resultMap="BaseResultMap">
- select top 1 *
- from asr_loc_mast
- where row1=#{row}
- and loc_sts='O'
- <if test="locType1 != null">
- and loc_type1 = #{locType1}
- </if>
- order by loc_sts desc ,lev1 asc,bay1 asc
- </select>
-
- <select id="queryShallowLocFMast" resultMap="BaseResultMap">
- select * from asr_loc_mast
- where 1=1
- and loc_no in (
- select
- concat(
- (
- case
- when left(loc_no, 2) = '01' then '02'
- when left(loc_no, 2) = '04' then '03'
- when left(loc_no, 2) = '05' then '06'
- when left(loc_no, 2) = '08' then '07'
- when left(loc_no, 2) = '09' then '10'
- when left(loc_no, 2) = '12' then '11'
- when left(loc_no, 2) = '13' then '14'
- when left(loc_no, 2) = '16' then '15'
- when left(loc_no, 2) = '17' then '18'
- when left(loc_no, 2) = '20' then '19'
- end)
- , right(loc_no, 5)) as shallowLocNo
- from asr_loc_mast
- where 1=1
- and loc_sts = 'O'
- and row1 in (1,4,5,8,9,12,13,16,17,20)
- )
- and (loc_sts = 'F' or loc_sts = 'D') and crn_no = #{crnNo}
- </select>
-
- <select id="querySame" resultMap="BaseResultMap">
- select l.* from asr_loc_mast l,asr_loc_detl d where 1=1
- and l.loc_no = d.loc_no
- and d.matnr = #{matnr}
- and l.lev1 = #{lev1}
- and l.loc_sts = 'F'
+ <select id="getLevList" resultType="integer">
+ select DISTINCT lev1 from asr_loc_mast
</select>
</mapper>
--
Gitblit v1.9.1