src/main/java/com/zy/asrs/utils/Utils.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/common/service/CommonService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/asrs/LocMastMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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); 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)) { 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">