#

TQS

2023-02-02 cb7cb55b59f8dc51e06f2af5fe3ccaa117e9b615

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

@@ -355,13 +355,13 @@

        // 2.无库位时，无视区域锁定，重新查找库位
        if (Cools.isEmpty(locMast)){
            List<LocMast> locMasts = locMastService.queryFreeLocMastEnd(curRow);
            List<LocMast> locMasts = locMastService.queryFreeLocMastEnd(curRow, locTypeDto.getLocType1());
            int sign=curRow;
            while (true){
                if (locMasts.size()==0){
                    sign = getCurRow(sign);
                    if (sign != 0){
                        locMasts = locMastService.queryFreeLocMastEnd(sign);
                        locMasts = locMastService.queryFreeLocMastEnd(sign, locTypeDto.getLocType1());
                    }else {
                        break;
                    }
@@ -370,7 +370,7 @@
                }
            }
            for (LocMast locMast1 : locMasts){
                List<LocMast> locMasts1 = locMastService.queryFreeLocMastEnd0(locMast1.getBay1(), locMast1.getLev1(),locMast1.getRow1());
                List<LocMast> locMasts1 = locMastService.queryFreeLocMastEnd0(locMast1.getBay1(), locMast1.getLev1(),locMast1.getRow1(), locTypeDto.getLocType1());
                Integer innermostRow = Utils.getInnermostRow(locMasts1.get(0).getLocNo());
                for (LocMast locMast2:locMasts1){
                    if (locMast2.getLocSts().equals("O")){