| | |
| | | if (groupLoc) { |
| | | String shallowLoc = Utils.getDeepLoc(slaveProperties, mast.getLocNo()); |
| | | LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>() |
| | | .eq("loc_no", shallowLoc).eq("loc_sts", "O")); |
| | | .eq("loc_no", shallowLoc)); |
| | | if (!Cools.isEmpty(locMast2)) { |
| | | tmp = locMast2; |
| | | |
| | | }else { |
| | | tmp = mast; |
| | | if (locMast2.getLocSts().equals("F") || locMast2.getLocSts().equals("D")){ |
| | | tmp = mast; |
| | | } |
| | | } |
| | | }else { |
| | | if (!Cools.isEmpty(mast)) { |
| | | tmp = mast; |
| | | |
| | | if (mast.getLocSts().equals("O")){ |
| | | tmp = mast; |
| | | } |
| | | } |
| | | } |
| | | //预留空库位 |