| | |
|---|
| | | LambdaQueryWrapper<LocMast> wrapper1 = new LambdaQueryWrapper<LocMast>() |
|---|
| | | .eq(LocMast::getLocSts, "O") |
|---|
| | | .eq(LocMast::getHostId, hostId) |
|---|
| | | .in(LocMast::getRow1, curRow) |
|---|
| | | .eq(LocMast::getLocType1, locTypeDto.getLocType1()) |
|---|
| | | .le(LocMast::getRow1, eRow) |
|---|
| | | .ge(LocMast::getRow1, sRow) |
|---|
| | | // .in(LocMast::getRow1, curRow) |
|---|
| | | .orderByAsc(LocMast::getLev1) |
|---|
| | | .orderByAsc(LocMast::getBay1); |
|---|
| | | |
|---|
| | |
|---|
| | | for (LocMast mast : locMasts) { |
|---|
| | | LocMast innerLoc = null; |
|---|
| | | for (String loc : Utils.getGroupLoc(mast.getLocNo(), hostId)) { |
|---|
| | | //1 2 |
|---|
| | | LocMast one = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, loc).eq(LocMast::getHostId, hostId)); |
|---|
| | | if (!one.getLocSts().equals("O")) { |
|---|
| | | innerLoc = null; |
|---|
| | | // innerLoc = null; |
|---|
| | | continue; |
|---|
| | | } |
|---|
| | | |
|---|
| | | if (innerLoc == null) { |
|---|
| | | List<Integer> innerDeepRow = locDirectionService.getInnerDeepRow(hostId); |
|---|
| | | if (innerDeepRow.contains(one.getRow1())) { |
|---|
| | | innerLoc = one; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | innerLoc = one; |
|---|
| | | |
|---|
| | | // if (innerLoc == null) { |
|---|
| | | // List<Integer> innerDeepRow = locDirectionService.getInnerDeepRow(hostId); |
|---|
| | | //// if (innerDeepRow.contains(one.getRow1())) { |
|---|
| | | // innerLoc = one; |
|---|
| | | //// } |
|---|
| | | // } |
|---|
| | | } |
|---|
| | | |
|---|
| | | if(innerLoc == null) { |
|---|
