From d22260317e0e4e7854205ac66b900c035c342c0f Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 07 六月 2025 15:38:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 4 ++--
src/main/resources/mapper/asrs/LocMastMapper.xml | 4 ----
src/main/java/com/zy/common/service/CommonService.java | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 4ead5ce..8f5121c 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -317,11 +317,11 @@
}
if ((curRow - sRow) % 4 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[2] = (curRow - sRow) / 4 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
} else if ((curRow - sRow + 1) % 4 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow + 1) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[2] = (curRow - sRow - 3) / 4 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
} else {
throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index e659ad1..19709aa 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -375,7 +375,7 @@
continue;
}
if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
- String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
+ String shallowLoc = Utils.getShallowLoc(slaveProperties, locMast1.getLocNo());
LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", shallowLoc).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
if (!Cools.isEmpty(locMast2)) {
diff --git a/src/main/resources/mapper/asrs/LocMastMapper.xml b/src/main/resources/mapper/asrs/LocMastMapper.xml
index cae15d0..4edecc1 100644
--- a/src/main/resources/mapper/asrs/LocMastMapper.xml
+++ b/src/main/resources/mapper/asrs/LocMastMapper.xml
@@ -127,7 +127,6 @@
and crn_no=#{crnNo}
and bay1 = #{bay}
and lev1 = #{lev}
- and gro1 = #{gro}
AND loc_sts not in ('O') order by row1
</select>
@@ -150,7 +149,6 @@
and crn_no=#{crnNo}
and bay1 = #{bay}
and lev1 = #{lev}
- and gro1 = #{gro}
AND loc_sts not in ('O') order by row1 desc
</select>
<!-- <select id="selectLocByLocStsPakInO1" resultMap="BaseResultMap">-->
@@ -172,7 +170,6 @@
and crn_no=#{crnNo}
and bay1 = #{bay}
and lev1 = #{lev}
- and gro1 = #{gro}
AND loc_sts in ('O') order by row1 desc
</select>
<!-- <select id="selectLocByLocStsPakInO2" resultMap="BaseResultMap">-->
@@ -194,7 +191,6 @@
and crn_no=#{crnNo}
and bay1 = #{bay}
and lev1 = #{lev}
- and gro1 = #{gro}
AND loc_sts in ('O') order by row1
</select>
<select id="findFirstFrozenLocNo" resultType="java.lang.String">
--
Gitblit v1.9.1