#1

lsh

17 小时以前 75e92e196c01e33de751544ad037dc631c5edf61

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

@@ -133,6 +133,7 @@
     */
    @Transactional
    public StartupDto getLocNoRun(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
        boolean sign999 = false;
        if (Cools.isEmpty(matnr)) {  //物料号
            matnr = "";
        }
@@ -160,7 +161,7 @@
            throw new CoolException("数据异常，请联系管理员");
        }
        // ===============>>>> 开始执行
        if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901){
        if (sign999 || sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901 || sourceStaNo == 1908){
            curRow = rowLastno.getCurrentRow1();
        } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){
            curRow = rowLastno.getCurrentRow2();
@@ -230,7 +231,7 @@
                        if (locMast2.getCrnNo()==1 || locMast2.getCrnNo()==6){
                            continue;
                        }
                        if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901){
                        if (sign999 || sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901 || sourceStaNo == 1908){
                            if (locMast2.getCrnNo()>3){
                                continue;
                            }
@@ -262,7 +263,7 @@
                        if (shallowLoc.getCrnNo()==1 || shallowLoc.getCrnNo()==6){
                            continue;
                        }
                        if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901){
                        if (sign999 || sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901 || sourceStaNo == 1908){
                            if (shallowLoc.getCrnNo()>3){
                                continue;
                            }
@@ -355,7 +356,7 @@

        // 更新库位排号
        if (Utils.BooleanWhsTypeSta(whsType, staDescId) && Cools.isEmpty(locMast)) {
            if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901){
            if (sign999 || sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901 || sourceStaNo == 1908){
                rowLastno.setCurrentRow1(curRow);
            } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){
                rowLastno.setCurrentRow2(curRow);
@@ -473,7 +474,7 @@
        if (Cools.isEmpty(grade)) {  //备用
            grade = "";
        }

        boolean sign999 = false;
        // 初始化参数
        int crnNo = 0;      //堆垛机号
        int nearRow = 0;    //最浅库位排
@@ -491,7 +492,7 @@
            throw new CoolException("数据异常，请联系管理员");
        }
        // ===============>>>> 开始执行
        if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901){
        if (sign999 || sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901 || sourceStaNo == 1908){
            curRow = rowLastno.getCurrentRow1();
        } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){
            curRow = rowLastno.getCurrentRow2();
@@ -671,7 +672,7 @@

        // 更新库位排号
        if (Utils.BooleanWhsTypeSta(whsType, staDescId) && Cools.isEmpty(locMast)) {
            if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901){
            if (sign999 || sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901 || sourceStaNo == 1908){
                rowLastno.setCurrentRow1(curRow);
            } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){
                rowLastno.setCurrentRow2(curRow);