From 2d580e9a1cc031f9d7bf1def649fbca86045ccae Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期日, 29 一月 2023 13:40:23 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 5 ++ src/main/resources/mapper/LocMastMapper.xml | 44 ++++++++++++++++++++++ src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 4 ++ src/main/java/com/zy/asrs/service/LocMastService.java | 2 + src/main/java/com/zy/common/service/CommonService.java | 36 ++++++++++++++---- 5 files changed, 83 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java index e89c39f..9656b06 100644 --- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java +++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java @@ -15,6 +15,10 @@ List<LocMast> queryFreeLocMast(@Param("rows") List<Integer> rows, @Param("rowsLen") Integer rowsLen, @Param("locType1") Short locType1); List<LocMast> queryFreeLocMast0(@Param("rows") List<Integer> rows, @Param("rowsLen") Integer rowsLen, @Param("locType1") Short locType1, @Param("inoutEveryday") Boolean inoutEveryday); + List<LocMast> queryFreeLocMast1(@Param("rows") List<Integer> rows + , @Param("rowsLen") Integer rowsLen, @Param("locType1") Short locType1, @Param("inoutEveryday") Boolean inoutEveryday + , @Param("rowBeg") Integer rowBeg, @Param("rowEnd") Integer rowEnd, @Param("bayBeg") Integer bayBeg + , @Param("bayEnd") Integer bayEnd, @Param("levBeg") Integer levBeg, @Param("levEnd") Integer levEnd); @Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}") List<String> queryGroupEmptyStock(Integer crnNo); diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java index 85a939a..b9ce6de 100644 --- a/src/main/java/com/zy/asrs/service/LocMastService.java +++ b/src/main/java/com/zy/asrs/service/LocMastService.java @@ -13,6 +13,8 @@ */ List<LocMast> queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1); List<LocMast> queryFreeLocMast0(List<Integer> rows, Integer rowsLen, Short locType1,Boolean inoutEveryday); + List<LocMast> queryFreeLocMast1(List<Integer> rows, Integer rowsLen, Short locType1,Boolean inoutEveryday + , Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd); /** * 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅 diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java index 46dda57..3b85cad 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java @@ -36,6 +36,11 @@ } @Override + public List<LocMast> queryFreeLocMast1(List<Integer> rows, Integer rowsLen, Short locType1, Boolean inoutEveryday, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd) { + return this.baseMapper.queryFreeLocMast1(rows, rowsLen, locType1,inoutEveryday, rowBeg, rowEnd, bayBeg, bayEnd, levBeg, levEnd); + } + + @Override public List<String> queryGroupEmptyStock(String sourceLocNo) { if (Cools.isEmpty(sourceLocNo)) { return null; diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index fb8428b..e4f3864 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -312,14 +312,34 @@ // 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺� if (locMast == null) { - List<Integer> rows = Utils.getGroupLoc(curRow); - List<LocMast> locMasts = locMastService.queryFreeLocMast0(rows, rows.size(), locTypeDto.getLocType1(), inoutEveryday); - if (!Cools.isEmpty(locMasts)) { - Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo()); - for (LocMast one : locMasts) { - if (one.getRow1().equals(innermostRow)) { - locMast = one; - break; + + // 搴撳尯閿佸畾 + LocRule locRule = locRuleService.find(Cools.isEmpty(matNos) ? null : matNos.get(0), null); + if (!Cools.isEmpty(locRule)) { + List<Integer> rows = Utils.getGroupLoc(locRule.getRowBeg()); + List<LocMast> locMasts = locMastService.queryFreeLocMast1(rows, rows.size(), locTypeDto.getLocType1(), inoutEveryday + , locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd()); + if (!Cools.isEmpty(locMasts)) { + Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo()); + for (LocMast one : locMasts) { + if (one.getRow1().equals(innermostRow)) { + locMast = one; + break; + } + } + } + } + + if (locMast == null) { + List<Integer> rows = Utils.getGroupLoc(curRow); + List<LocMast> locMasts = locMastService.queryFreeLocMast0(rows, rows.size(), locTypeDto.getLocType1(), inoutEveryday); + if (!Cools.isEmpty(locMasts)) { + Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo()); + for (LocMast one : locMasts) { + if (one.getRow1().equals(innermostRow)) { + locMast = one; + break; + } } } } diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml index e02bf3b..4cd1351 100644 --- a/src/main/resources/mapper/LocMastMapper.xml +++ b/src/main/resources/mapper/LocMastMapper.xml @@ -121,4 +121,48 @@ ) </select> + <select id="queryFreeLocMast1" resultMap="BaseResultMap"> + select + * + from asr_loc_mast + where 1=1 + and row1 in + <foreach item="item" collection="rows" index="index" separator="," open="(" close=")"> + #{item} + </foreach> + and ctn_no = + ( + select + top 1 + ctn_no + from ( + select + ctn_no, + count(1) as count + from asr_loc_mast + where 1=1 + and row1 in + <foreach item="item" collection="rows" index="index" separator="," open="(" close=")"> + #{item} + </foreach> + and loc_sts = 'O' + <if test="locType1 != null"> + and loc_type1 = #{locType1} + </if> + <choose> + <when test="inoutEveryday != null and inoutEveryday"> + AND bay1 < 11 and lev1 in (3,4) + </when> + <otherwise> + AND (bay1 >= 11 or (bay1 < 11 and lev1 in (1,2))) + </otherwise> + </choose> + and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401') + group by ctn_no + ) a + where count = #{rowsLen} + order by right(ctn_no, 2) + 0 asc, left(ctn_no, 3) + 0 asc + ) + </select> + </mapper> -- Gitblit v1.9.1