|
|
|
@ -2515,7 +2515,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
for (DistributionAppReservationVO distributionAppReservationVO : customList) { |
|
|
|
|
List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = localFindReservationStockarticleEntityLists(reservationStockarticleEntityLists,distributionAppReservationVO.getId()); |
|
|
|
|
|
|
|
|
|
log.info(">>>>>>>>>> reservationStockarticleEntityList ={}",reservationStockarticleEntityList); |
|
|
|
|
log.info(">>>>>>>>>> reservationStockarticleEntityList ={}",reservationStockarticleEntityList.size()); |
|
|
|
|
|
|
|
|
|
List<DistributionStockEntity> distributionStockEntities = new ArrayList<>(); |
|
|
|
|
List<DistributionLoadscanEntity> loadscanEntityList = new ArrayList<>(); |
|
|
|
@ -2621,12 +2621,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); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
for (DistributionParcelListEntity allParcelListEntity : allParcelListEntities) { |
|
|
|
|
if(allParcelListEntity.getStockArticleId().equals(stockArticleId)){ |
|
|
|
|
temp.add(allParcelListEntity); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return temp; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -2638,11 +2638,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
*/ |
|
|
|
|
private List<DistributionReservationStockarticleEntity> localFindReservationStockarticleEntityLists(List<DistributionReservationStockarticleEntity> reservationStockarticleEntityLists, Long id) { |
|
|
|
|
List<DistributionReservationStockarticleEntity> temp = new ArrayList<>(); |
|
|
|
|
reservationStockarticleEntityLists.forEach(t->{ |
|
|
|
|
if(t.getReservationId().equals(id)){ |
|
|
|
|
temp.add(t); |
|
|
|
|
|
|
|
|
|
for (DistributionReservationStockarticleEntity reservationStockarticleEntityList : reservationStockarticleEntityLists) { |
|
|
|
|
if(reservationStockarticleEntityList.getReservationId().equals(id)){ |
|
|
|
|
temp.add(reservationStockarticleEntityList); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return temp; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|