#

lsh

2024-05-18 3d35502631c71da0ff11834aa92b6839d3e707d2

#

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

@@ -241,21 +241,21 @@
    }

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

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

    public static boolean BooleanWhsTypeSta(Integer whsType, Integer staDescId) {
        if ((whsType == 1 || whsType == 5 || whsType == 2 || whsType==3 || whsType==4) && staDescId != 11 && staDescId != 111) {
        if ((whsType == 1 || whsType == 5 || whsType == 2 || whsType==3 || whsType==4 || whsType == 9) && staDescId != 11 && staDescId != 111) {
            return true;
        }
        return false;
@@ -290,6 +290,8 @@
                return LocNecessaryParametersDoubleExtension4(whsType, curRow, crnNumber); //未完善
            case 5://双工位单伸库位(4排货架)
                return LocNecessaryParametersDoubleExtension5(whsType, curRow, crnNumber); //已完善
            case 9://前双伸 后左单右双(小单大双)  煜星定制
                return LocNecessaryParametersDoubleExtension9(whsType, curRow, crnNumber); //已完善
            default:
                return LocNecessaryParametersMove(whsType, curRow, crnNumber);//moveCrnNo
        }
@@ -505,6 +507,33 @@
        }
        return necessaryParameters;
    }
    public static int[] LocNecessaryParametersDoubleExtension9(Integer whsType, Integer curRow, Integer crnNumber) {
        int[] necessaryParameters = new int[]{0, 0, 0, 0};
        if (BooleanWhsTypeSta(whsType)) {
            necessaryParameters[0] = crnNumber; // 轮询次数
            //满板正常入库
            if (curRow.equals(21)) {
                necessaryParameters[1] = 25;    //curRow   最深库位排
                necessaryParameters[2] = 7;     //crnNo     堆垛机号
                necessaryParameters[3] = 25;    //nearRow  最浅库位排
            } else if (curRow.equals(25)) {
                necessaryParameters[1] = 24;    //curRow   最深库位排
                necessaryParameters[2] = 6;     //crnNo     堆垛机号
                necessaryParameters[3] = 23;    //nearRow  最浅库位排
            } else if (curRow.equals(24)) {
                necessaryParameters[1] = 27;    //curRow   最深库位排
                necessaryParameters[2] = 7;     //crnNo     堆垛机号
                necessaryParameters[3] = 26;    //nearRow  最浅库位排
            } else if (curRow.equals(27)) {
                necessaryParameters[1] = 21;    //curRow   最深库位排
                necessaryParameters[2] = 6;     //crnNo     堆垛机号
                necessaryParameters[3] = 22;    //nearRow  最浅库位排
            } else {
                throw new CoolException("库位排号异常：排号：" + curRow);
            }
        }
        return necessaryParameters;
    }


    public static void main(String[] args) {

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

@@ -200,10 +200,10 @@


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