#

LSH

2024-02-29 d372d7d03bd553d369e0fcb0fb9c20f1e4155f8a

#

 src/main/java/com/zy/asrs/mapper/LocMastMapper.java

@@ -22,4 +22,25 @@
    Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("crnNo") Integer crnNo);

    List<LocMast> queryShallowLocFMast(@Param("crnNo") Integer crnNo);

    /*
    * 获取目标库位所在巷道最浅非空库位  深>浅
    * */
    LocMast selectLocByLocStsPakInF1(@Param("locNos") List<String> locNos);

    /*
     * 获取目标库位所在巷道最浅非空库位  深<浅
     * */
    LocMast selectLocByLocStsPakInF2(@Param("locNos") List<String> locNos);

    /*
     * 获取目标库位所在巷道最深空库位  深>浅
     * */
    LocMast selectLocByLocStsPakInO1(@Param("locNos") List<String> locNos);

    /*
     * 获取目标库位所在巷道最深空库位  深<浅
     * */
    LocMast selectLocByLocStsPakInO2(@Param("locNos") List<String> locNos);

}

 src/main/java/com/zy/asrs/service/LocMastService.java

@@ -37,4 +37,15 @@
     * @return
     */
    List<LocMast> queryShallowLocFMast(Integer crnNo);

    /*
    * 获取目标库位所在巷道最浅非空库位
    * */
    LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos);

    /*
     * 获取目标库位所在巷道最深空库位
     * */
    LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos);

}

 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java

@@ -7,6 +7,7 @@
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.RowLastnoService;
import com.zy.asrs.utils.Utils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -43,6 +44,28 @@
        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
    }

    /*
    *获取目标库位所在巷道最浅非空库位
    * */
    @Override
    public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos) {
        if (curRow<nearRow){
            return this.baseMapper.selectLocByLocStsPakInF1(locNos);
        }
        return this.baseMapper.selectLocByLocStsPakInF2(locNos);
    }

    /*
    * 获取目标库位所在巷道最深空库位
    * */
    @Override
    public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos) {
        if (curRow<nearRow){
            return this.baseMapper.selectLocByLocStsPakInO1(locNos);
        }
        return this.baseMapper.selectLocByLocStsPakInO2(locNos);
    }

    @Override
    public Boolean checkWhole(List<LocDetl> locDetls) {
        return null;

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -9,10 +9,13 @@
import com.zy.asrs.service.RowLastnoService;
import com.zy.common.model.LocDetlDto;
import com.zy.common.properties.SlaveProperties;
import com.zy.common.service.CommonService;
import com.zy.system.service.UserService;

import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

/**
@@ -244,21 +247,21 @@
    }

    public static boolean BooleanWhsTypeStaIoType(Integer whsType) {  //查询相似物料开关
        if (whsType == 1) {
        if (whsType == 1 || whsType==3 || whsType==4) {
            return true;
        }
        return false;
    }

    public static boolean BooleanWhsTypeSta(Integer whsType) {
        if (whsType == 1 || whsType == 2 || whsType == 5) {
        if (whsType == 1 || whsType == 2 || whsType == 5 || whsType==3 || whsType==4) {
            return true;
        }
        return false;
    }

    public static boolean BooleanWhsTypeSta(Integer whsType, Integer staDescId) {
        if ((whsType == 1 || whsType == 5 || whsType == 2) && staDescId != 11 && staDescId != 111) {
        if ((whsType == 1 || whsType == 5 || whsType == 2 || whsType==3 || whsType==4) && staDescId != 11 && staDescId != 111) {
            return true;
        }
        return false;
@@ -285,14 +288,14 @@
        switch (whsType){
            case 1://经典双伸库位
                return LocNecessaryParametersDoubleExtension(whsType, curRow, crnNumber); //已完善
            case 2://经典单伸库位
            case 2://经典单伸库位（2排货架）
                return LocNecessaryParametersDoubleExtension2(whsType, curRow, crnNumber); //已完善
            case 3://经典单双伸库位  左单右双(小单大双)
                return LocNecessaryParametersDoubleExtension3(whsType, curRow, crnNumber); //未完善
            case 4://经典单双伸库位  左双右单(小双大单)
                return LocNecessaryParametersDoubleExtension4(whsType, curRow, crnNumber); //未完善
            case 5://双工位单伸库位
                return LocNecessaryParametersDoubleExtension5(whsType, curRow, crnNumber); //未完善
            case 5://双工位单伸库位(4排货架)
                return LocNecessaryParametersDoubleExtension5(whsType, curRow, crnNumber); //已完善
            default:
                return LocNecessaryParametersMove(whsType, curRow, crnNumber);//moveCrnNo
        }
@@ -312,7 +315,7 @@
                necessaryParameters[1] = sRow;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = sRow+1;    //nearRow  最浅库位排
            } else if (curRow.equals(crnNumber * 4 - 3 + sRow - 1)) {
            } else if (curRow.equals((crnNumber - 1) * 4 + sRow)) {
                necessaryParameters[1] = sRow+3;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = sRow+2;    //nearRow  最浅库位排
@@ -367,7 +370,7 @@
                necessaryParameters[1] = sRow;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = sRow;    //nearRow  最浅库位排
            } else if (curRow.equals(crnNumber * 2 - 1 + sRow - 1)) {
            } else if (curRow.equals((crnNumber - 1) * 2 + sRow)) {
                necessaryParameters[1] = sRow+1;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = sRow+1;    //nearRow  最浅库位排
@@ -392,7 +395,7 @@
        return necessaryParameters;
    }

    //经典单伸库位
    //经典单双伸库位  左单右双(小单大双)
    public static int[] LocNecessaryParametersDoubleExtension3(Integer whsType, Integer curRow, Integer crnNumber) {
        int[] necessaryParameters = new int[]{0, 0, 0, 0};
        RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
@@ -402,27 +405,27 @@
        if (BooleanWhsTypeSta(whsType)) {
            necessaryParameters[0] = crnNumber; // 轮询次数
            //满板正常入库
            if (curRow.equals(crnNumber * 2 + sRow - 1)) {
            if (curRow.equals(crnNumber * 3 + sRow - 1)) {
                necessaryParameters[1] = sRow;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = sRow;    //nearRow  最浅库位排
            } else if (curRow.equals(crnNumber * 2 - 1 + sRow - 1)) {
                necessaryParameters[1] = sRow+1;    //curRow   最深库位排
            } else if (curRow.equals((crnNumber - 1) * 3 + sRow)) {
                necessaryParameters[1] = sRow+2;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = sRow+1;    //nearRow  最浅库位排
            } else {
                curRow = curRow + 2;
                if (curRow <  sRow || curRow > (crnNumber * 2 + sRow - 1)) {
                curRow = curRow + 3;
                if (curRow <  sRow || curRow > (crnNumber * 3 + sRow - 1)) {
                    throw new CoolException("库位排号异常：排号：" + curRow);
                }
                if ((curRow - sRow) % 2 == 0) {
                if ((curRow - sRow) % 3 == 0) {
                    necessaryParameters[1] = curRow;    //curRow   最深库位排
                    necessaryParameters[2] = (curRow - sRow) / 2 + sCrnNo ;     //crnNo     堆垛机号
                    necessaryParameters[2] = (curRow - sRow) / 3 + sCrnNo ;     //crnNo     堆垛机号
                    necessaryParameters[3] = curRow ;    //nearRow  最浅库位排
                } else if ((curRow - sRow + 1) % 2 == 0) {
                } else if ((curRow - sRow + 1) % 3 == 0) {
                    necessaryParameters[1] = curRow;    //curRow   最深库位排
                    necessaryParameters[2] = (curRow - sRow - 1) / 2 + sCrnNo;     //crnNo     堆垛机号
                    necessaryParameters[3] = curRow ;    //nearRow  最浅库位排
                    necessaryParameters[2] = (curRow - sRow - 2) / 3 + sCrnNo;     //crnNo     堆垛机号
                    necessaryParameters[3] = curRow-1 ;    //nearRow  最浅库位排
                } else {
                    throw new CoolException("库位排号异常：排号：" + curRow);
                }
@@ -431,7 +434,7 @@
        return necessaryParameters;
    }

    //经典单伸库位
    //经典单双伸库位  左双右单(小双大单)
    public static int[] LocNecessaryParametersDoubleExtension4(Integer whsType, Integer curRow, Integer crnNumber) {
        int[] necessaryParameters = new int[]{0, 0, 0, 0};
        RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
@@ -441,26 +444,26 @@
        if (BooleanWhsTypeSta(whsType)) {
            necessaryParameters[0] = crnNumber; // 轮询次数
            //满板正常入库
            if (curRow.equals(crnNumber * 2 + sRow - 1)) {
            if (curRow.equals(crnNumber * 3 + sRow - 1)) {
                necessaryParameters[1] = sRow;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = sRow;    //nearRow  最浅库位排
            } else if (curRow.equals(crnNumber * 2 - 1 + sRow - 1)) {
                necessaryParameters[1] = sRow+1;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = sRow+1;    //nearRow  最浅库位排
            } else if (curRow.equals((crnNumber - 1) * 3 + sRow)) {
                necessaryParameters[1] = sRow+2;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = sRow+2;    //nearRow  最浅库位排
            } else {
                curRow = curRow + 2;
                if (curRow <  sRow || curRow > (crnNumber * 2 + sRow - 1)) {
                curRow = curRow + 3;
                if (curRow <  sRow || curRow > (crnNumber * 3 + sRow - 1)) {
                    throw new CoolException("库位排号异常：排号：" + curRow);
                }
                if ((curRow - sRow) % 2 == 0) {
                if ((curRow - sRow) % 3 == 0) {
                    necessaryParameters[1] = curRow;    //curRow   最深库位排
                    necessaryParameters[2] = (curRow - sRow) / 2 + sCrnNo ;     //crnNo     堆垛机号
                    necessaryParameters[3] = curRow ;    //nearRow  最浅库位排
                } else if ((curRow - sRow + 1) % 2 == 0) {
                    necessaryParameters[2] = (curRow - sRow) / 3 + sCrnNo ;     //crnNo     堆垛机号
                    necessaryParameters[3] = curRow + 1 ;    //nearRow  最浅库位排
                } else if ((curRow - sRow + 1) % 3 == 0) {
                    necessaryParameters[1] = curRow;    //curRow   最深库位排
                    necessaryParameters[2] = (curRow - sRow - 1) / 2 + sCrnNo;     //crnNo     堆垛机号
                    necessaryParameters[2] = (curRow - sRow - 2) / 3 + sCrnNo;     //crnNo     堆垛机号
                    necessaryParameters[3] = curRow ;    //nearRow  最浅库位排
                } else {
                    throw new CoolException("库位排号异常：排号：" + curRow);
@@ -484,7 +487,7 @@
                necessaryParameters[1] = sRow;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = sRow+1;    //nearRow  最浅库位排
            } else if (curRow.equals(crnNumber * 4 - 3 + sRow - 1)) {
            } else if (curRow.equals((crnNumber - 1) * 4 + sRow)) {
                necessaryParameters[1] = sRow+3;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = sRow+2;    //nearRow  最浅库位排
@@ -560,4 +563,27 @@
        return null;
    }


    /*
    * 最深库位排号 ： curRow
    * 最浅库位排号 ： nearRow
    * 最浅库位号，用于锁定列、层 ： nearRow
    * 入库  true:pakin
    * 出库  false:pakin
    * */
    // 外侧方向的货位  优先入库方向 ===>> 反之
    public static List<String> getGroupOutLocCrn(Integer curRow,Integer nearRow,String locNo,boolean pakin){
        List<String> result = new ArrayList<>();
        if (pakin){
            for (int row = curRow;row<=nearRow;row++){
                result.add(zerofill(String.valueOf(row), 2) + locNo.substring(2));
            }
        }else {
            for (int row = curRow;row>=curRow;row--){
                result.add(zerofill(String.valueOf(row), 2) + locNo.substring(2));
            }
        }
        return result;
    }

}

 src/main/java/com/zy/common/service/CommonService.java

@@ -201,7 +201,7 @@

        if (Utils.BooleanWhsTypeStaIoType(whsType)){
            // 靠近摆放规则 --- 同天同规格物料 //分离版
            if (!Cools.isEmpty(matnr) &&  (staDescId == 1)){
            if (!Cools.isEmpty(matnr) &&  staDescId == 1){
                signRule1 = true;
            }
            // 靠近摆放规则 --- 同天同规格物料 //互通版
@@ -215,21 +215,23 @@
        }

        if (signRule1){
            if (nearRow!=curRow){
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
            for (LocMast locMast1:locMasts){
                if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
                    continue;
                }
                String shallowLoc = Utils.getDeepLoc(slaveProperties,locMast1.getLocNo());
                LocMast locMast2 = locMastService.selectById(shallowLoc);
                if (!Cools.isEmpty(locMast2) && locMast2.getLocSts().equals("F")){
                    LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast2.getLocNo()));
                    if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr())) {
                        locMast = locMast1;
                    //获取巷道
                    List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
                    //获取目标库位所在巷道最浅非空库位
                    LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,groupOutsideLocCrn);
                    if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")){
                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMastF.getLocNo()));
                        if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr()) && batch.equals(Cools.isEmpty(locDetl.getBatch()) ? "" : locDetl.getBatch()) && grade.equals(Cools.isEmpty(locDetl.getBrand()) ? "" : locDetl.getBrand())) {
                            //获取目标库位所在巷道最浅非空库位
                            locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,groupOutsideLocCrn);
                        break;
                    }
                }
            }
            }
        }else if (signRule2){
            List<String> locNos = locDetlService.getSameDetlToday(matnr, sRow, eRow);
            for (String locNo : locNos) {

 src/main/resources/mapper/LocMastMapper.xml

@@ -75,4 +75,37 @@
        )
        and (loc_sts = 'F' or loc_sts = 'D') and crn_no = #{crnNo}
    </select>

    <select id="selectLocByLocStsPakInF1" resultMap="BaseResultMap">
        SELECT top 1 * FROM [dbo].[asr_loc_mast] WHERE loc_no in
        <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
            #{locNo}
        </foreach>
        AND loc_sts not in ('O') order by row1
    </select>

    <select id="selectLocByLocStsPakInF2" resultMap="BaseResultMap">
        SELECT top 1 * FROM [dbo].[asr_loc_mast] WHERE loc_no in
        <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
            #{locNo}
        </foreach>
        AND loc_sts not in ('O') order by row1 desc
    </select>

    <select id="selectLocByLocStsPakInO1" resultMap="BaseResultMap">
        SELECT top 1 * FROM [dbo].[asr_loc_mast] WHERE loc_no in
        <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
            #{locNo}
        </foreach>
        AND loc_sts in ('O') order by row1 desc
    </select>

    <select id="selectLocByLocStsPakInO2" resultMap="BaseResultMap">
        SELECT top 1 * FROM [dbo].[asr_loc_mast] WHERE loc_no in
        <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
            #{locNo}
        </foreach>
        AND loc_sts in ('O') order by row1
    </select>

</mapper>