|
|
|
@ -2515,6 +2515,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
for (DistributionAppReservationVO distributionAppReservationVO : customList) { |
|
|
|
|
List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = localFindReservationStockarticleEntityLists(reservationStockarticleEntityLists,distributionAppReservationVO.getId()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<DistributionStockEntity> distributionStockEntities = new ArrayList<>(); |
|
|
|
|
List<DistributionLoadscanEntity> loadscanEntityList = new ArrayList<>(); |
|
|
|
|
List<WarehouseTrayGoodsEntity> trayList = new ArrayList<>(); |
|
|
|
@ -2524,6 +2525,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
.map(DistributionReservationStockarticleEntity::getReservationId) |
|
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
|
if(reaveIds.isEmpty()){ |
|
|
|
|
log.info(">>>>> reaveIds ==null 匹配的预约ID = {}",distributionAppReservationVO.getId()); |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<DistributionParcelListEntity> allParcelListEntities =distributionReservationMapper.selectPackageByReservations(reaveIds, myCurrentWarehouse.getId()); |
|
|
|
@ -2615,16 +2620,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
|
|
|
|
|
private List<DistributionParcelListEntity> localFindAllParcelListEntities(List<DistributionParcelListEntity> allParcelListEntities, Long stockArticleId) { |
|
|
|
|
List<DistributionParcelListEntity> temp = new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
allParcelListEntities.forEach(t->{ |
|
|
|
|
|
|
|
|
|
if(t.getStockArticleId().equals(stockArticleId)){ |
|
|
|
|
temp.add(t); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
log.info(">>>>>>>>> localFindAllParcelListEntities 寻找的包件集合{}",temp); |
|
|
|
|
return temp; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -2641,7 +2642,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
temp.add(t); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
log.info(">>>>> localFindReservationStockarticleEntityLists 寻找匹配的预约订单集合:{} ",temp); |
|
|
|
|
return temp; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|