From 1bdb27f4508fd8a718e8f5a834b923667625f5bd Mon Sep 17 00:00:00 2001 From: LSH Date: 星期六, 06 五月 2023 17:28:20 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 5 +++++ src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 3 +++ src/main/resources/mapper/WrkMastMapper.xml | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java index 57f4a22..5b399ce 100644 --- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java +++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java @@ -122,4 +122,7 @@ WrkMast selectWorkingPakin(@Param("sourceStaNo")Integer sourceStaNo); WrkMast selectWorkingPakout(@Param("sourceStaNo")Integer sourceStaNo); + + + WrkMast selectShallowLoc(@Param("row")Integer row,@Param("bay")Integer bay,@Param("lev")Integer lev); } 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 ceba294..1795d06 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -856,6 +856,11 @@ continue; } + // 鍏ュ簱娣卞簱浣嶆槸鍚︽湁闈濬銆丏搴撲綅杩涜鏍¢獙 + if (wrkMastMapper.selectShallowLoc(Integer.parseInt(wrkMast.getLocNo().substring(0, 2)),Integer.parseInt(wrkMast.getLocNo().substring(2, 5)),Integer.parseInt(wrkMast.getLocNo().substring(5, 7)))!=null){ + continue; + } + //鍔犲己鍒ゆ柇锛屽彧瑕佸瓨鍦ㄧЩ搴撲换鍔★紝璇存槑鍑哄簱浠诲姟鏈畬鍏ㄧ粨鏉燂紝涓嶆墽琛屽叆搴撲换鍔� WrkMast one = wrkMastMapper.selectLocMoveData(slave.getId()); if(!Cools.isEmpty(one)){ diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml index d614ce3..43505bf 100644 --- a/src/main/resources/mapper/WrkMastMapper.xml +++ b/src/main/resources/mapper/WrkMastMapper.xml @@ -242,4 +242,37 @@ order by io_time,wrk_no </select> + <select id="selectShallowLoc" resultMap="BaseResultMap"> + select top 1 * + from dbo.asr_loc_mast + where 1=1 + and loc_sts!='F' and loc_sts!='D' + and bay1 = #{bay} + and lev1 = #{lev} + <if test="row <= 3"> + and row1 < #{row} + </if> + <if test="row > 3 and row <= 7"> + and row1 > #{row} + and row1 <= 7 + </if> + <if test="row > 7 and row <= 11"> + and row1 > 7 + and row1 < #{row} + </if> + <if test="row > 11 and row <= 14"> + and row1 > #{row} + and row1 <= 14 + </if> + <if test="row > 14 and row <= 18"> + and row1 > 14 + and row1 < #{row} + </if> + <if test="row > 18 and row <= 21"> + and row1 > #{row} + and row1 <= 21 + </if> + order by io_time,wrk_no + </select> + </mapper> -- Gitblit v1.9.1