|
|
@ -321,6 +321,7 @@ public class LocationServiceImpl implements LocationService { |
|
|
|
} |
|
|
|
//增加过滤条件
|
|
|
|
QueryWrapper<LocationDO> queryWrapper = new QueryWrapper<>(); |
|
|
|
queryWrapper.eq("available", "TRUE"); |
|
|
|
List<String> locationTypeList = new ArrayList<>(); |
|
|
|
locationTypeList.add("RAW"); |
|
|
|
locationTypeList.add("SEMI"); |
|
|
@ -398,9 +399,10 @@ public class LocationServiceImpl implements LocationService { |
|
|
|
List<LocationDO> notEmptyList = new ArrayList<>(); |
|
|
|
for (LocationDO locationDO : locationDOList) { |
|
|
|
List<BalanceDO> balanceDOList = balanceMapper.getBalanceList(null, null, null, null, locationDO.getCode()); |
|
|
|
if (balanceDOList.isEmpty()) { |
|
|
|
if (balanceDOList.isEmpty()) {//空库位
|
|
|
|
emptyList.add(locationDO); |
|
|
|
} else { |
|
|
|
} else {//非空库位
|
|
|
|
//库位上存在物品,判断可以混物品、可以混批次、可以混状态
|
|
|
|
boolean flag = true; |
|
|
|
for (BalanceDO balanceDO : balanceDOList) { |
|
|
|
if ("TRUE".equals(enableMixItem) && !itemCode.equals(balanceDO.getItemCode())) { |
|
|
|