From 6bad812c69f2adbcc7ffc386e18db701f5c8fe93 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 21 十二月 2024 15:22:06 +0800
Subject: [PATCH] 找库位：深浅一起找
---
src/main/resources/mapper/LocMastMapper.xml | 8 ++++----
src/main/java/com/zy/common/service/CommonService.java | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 9ede5c0..edcfa78 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -221,7 +221,7 @@
if (signRule1){
if (nearRow!=curRow){
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O").orderBy("lev1"));
for (LocMast locMast1:locMasts){
//鑾峰彇宸烽亾
List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow<nearRow);
@@ -229,11 +229,11 @@
LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,groupOutsideLocCrn);
if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")){
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMastF.getLocNo()));
- if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr()) && batch.equals(Cools.isEmpty(locDetl.getBatch()) ? "" : locDetl.getBatch()) && grade.equals(Cools.isEmpty(locDetl.getBrand()) ? "" : locDetl.getBrand())) {
+// if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr()) && batch.equals(Cools.isEmpty(locDetl.getBatch()) ? "" : locDetl.getBatch()) && grade.equals(Cools.isEmpty(locDetl.getBrand()) ? "" : locDetl.getBrand())) {
//鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,groupOutsideLocCrn);
break;
- }
+// }
}
}
}
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index a9c6062..4c06268 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -89,7 +89,7 @@
<foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
#{locNo}
</foreach>
- AND loc_sts not in ('O') order by row1
+ AND loc_sts not in ('O') order by row1 , lev1
</select>
<select id="selectLocByLocStsPakInF2" resultMap="BaseResultMap">
@@ -97,7 +97,7 @@
<foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
#{locNo}
</foreach>
- AND loc_sts not in ('O') order by row1 desc
+ AND loc_sts not in ('O') order by row1 desc ,lev1
</select>
<select id="selectLocByLocStsPakInO1" resultMap="BaseResultMap">
@@ -105,7 +105,7 @@
<foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
#{locNo}
</foreach>
- AND loc_sts in ('O') order by row1 desc
+ AND loc_sts in ('O') order by row1 desc ,lev1
</select>
<select id="selectLocByLocStsPakInO2" resultMap="BaseResultMap">
@@ -113,7 +113,7 @@
<foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
#{locNo}
</foreach>
- AND loc_sts in ('O') order by row1
+ AND loc_sts in ('O') order by row1 ,lev1
</select>
</mapper>
--
Gitblit v1.9.1