|
|
|
@ -1477,17 +1477,30 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Map<String, List<MtReceiveContentDTO>> brand = null; |
|
|
|
|
log.info(">>>brand {} ",brand); |
|
|
|
|
List<DistributionReservationStockarticleEntity> distributionReservationStockarticleEntities = distributionReservationMapper.selectStockArticleByReservationId(distributionReservationEntity.getId()); |
|
|
|
|
log.info(">>>brand distributionReservationStockarticleEntities 长度 {} ",distributionReservationStockarticleEntities.size()); |
|
|
|
|
if (Func.isNotEmpty(distributionReservationStockarticleEntities)) { |
|
|
|
|
log.info(">>>brand 进入 长度 {} ",distributionReservationStockarticleEntities); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//存在订单
|
|
|
|
|
List<Long> orderIds = distributionReservationStockarticleEntities.stream().filter(f -> f.getIsZero().equals(IsOrNoConstant.no.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
|
log.info(">>>brand 进入 orderIds {} ",orderIds); |
|
|
|
|
|
|
|
|
|
List<DistributionStockArticleEntity> distributionStockArticleEntities = distributionStockArticleService.listByIds(orderIds); |
|
|
|
|
log.info(">>>brand 进入 distributionStockArticleEntities {} ",distributionStockArticleEntities); |
|
|
|
|
|
|
|
|
|
if (Func.isNotEmpty(distributionStockArticleEntities)) { |
|
|
|
|
String[] split = Func.split(brands, ","); |
|
|
|
|
log.info(">>>brand 进入 split {} ",split); |
|
|
|
|
|
|
|
|
|
//包件信息列表
|
|
|
|
|
brand = handkeBrandsPackageList(split, distributionStockArticleEntities, warehouseName, distributionReservationEntity.getId(), distributionDeliveryListEntity.getOrderCode(), warehouseId); |
|
|
|
|
} |
|
|
|
|
log.info(">>>brand 进入 {} ",brand); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//签收图片信息
|
|
|
|
|