From e6ff60c82976ae9319267674d262933d520921a0 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 14 六月 2022 07:55:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 ++++--
src/main/resources/mapper/LocMastMapper.xml | 3 +--
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 6 +++++-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 2df1691..9fd1d06 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -13,7 +13,11 @@
@Repository
public interface LocMastMapper extends BaseMapper<LocMast> {
- @Select("select distinct row1 from asr_loc_mast where crn_no = #{crnNo}")
+// @Select("select distinct row1 from asr_loc_mast where crn_no = #{crnNo}")
+ @Select("select row1 from ( select distinct row1 from asr_loc_mast where crn_no = #{crnNo} ) a " +
+ "order by case row1 when 1 then 1 when 2 then 0 when 3 then 0 when 4 then 1 " +
+ "when 5 then 1 when 6 then 0 when 7 then 0 when 8 then 1 when 9 then 1 when 10 then 0 " +
+ "when 11 then 0 when 12 then 1 when 13 then 1 when 14 then 0 when 15 then 0 when 16 then 1 end desc,newid()")
List<Integer> queryDistinctRow(@Param("crnNo")Integer crnNo);
LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType1") Short locType1);
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index c40650e..9fd78b6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1604,8 +1604,6 @@
}
}
}
-
-
if (null != loc) { break; }
}
}
@@ -1613,10 +1611,14 @@
for (Integer row : rows) {
if (Utils.isShallowLoc(slaveProperties, row)) {
loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
+
+
+
if (null != loc) { break; }
}
}
}
+
if (null == loc) {
throw new CoolException("鍙屾繁搴撲綅 --- 娴呭簱浣嶉樆濉炲紓甯革紒 寰呯Щ杞祬搴撲綅锛�" + shallowLoc.getLocNo());
}
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 7f46793..7821af2 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -33,7 +33,6 @@
<result column="inv_wh" property="invWh" />
<result column="mk" property="mk" />
<result column="barcode" property="barcode" />
- <result column="Pdc_type" property="PdcType" />
<result column="ctn_no" property="ctnNo" />
</resultMap>
@@ -46,7 +45,7 @@
<if test="locType1 != null">
and loc_type1 = #{locType1}
</if>
- order by loc_sts desc ,lev1 asc,bay1 asc
+ order by NEWID(),lev1 asc,bay1 asc
</select>
<select id="queryDemoSourceLoc" resultMap="BaseResultMap">
--
Gitblit v1.9.1