#

Junjie

昨天 b9dc5699e4e999bd8f40ef1025791d9e18a074f4

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

@@ -1070,7 +1070,7 @@
            int endBay = 19;

            switch (findLocNoAttributeVo.getOutArea()) {
                case 1:
                case 3:
                    startBay = 15;
                    endBay = 19;
                    break;
@@ -1078,7 +1078,7 @@
                    startBay = 8;
                    endBay = 14;
                    break;
                case 3:
                case 1:
                    startBay = 1;
                    endBay = 8;
                    break;
@@ -1104,15 +1104,20 @@
                    if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
                        continue;
                    }
                    if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
                        // 获取目标库位所在巷道最深空库位
                        LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
                        if (!Cools.isEmpty(locMast2) && locMast2.getRow1() == curRow) {
                            locMast = locMast2;
                            found = true;
                            break;
                        }
                    if(locMast1!= null){
                        locMast = locMast1;
                        found = true;
                        break;
                    }
//                    if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
//                        // 获取目标库位所在巷道最深空库位
//                        LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
//                        if (!Cools.isEmpty(locMast2) && locMast2.getRow1() == curRow) {
//                            locMast = locMast2;
//                            found = true;
//                            break;
//                        }
//                    }
                }

                if (found) {