Browse Source

取消商配编辑页面包件信息

single_db
汤建军 1 year ago
parent
commit
01b33361f4
  1. 26
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

26
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@ -2382,19 +2382,19 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
reservationStockarticleEntityList.forEach(rs -> { reservationStockarticleEntityList.forEach(rs -> {
DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(rs.getStockArticleId()); DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(rs.getStockArticleId());
DistributionStockArticleVO distributionStockArticleVO = DistributionStockArticleWrapper.build().entityVO(stockArticleEntity); DistributionStockArticleVO distributionStockArticleVO = DistributionStockArticleWrapper.build().entityVO(stockArticleEntity);
if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())) { // if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())) {
List<DistributionReservationPackageEntity> reservationPackageEntityList = distributionReservationPackageService.list(Wrappers.<DistributionReservationPackageEntity>query().lambda().eq(DistributionReservationPackageEntity::getReservationId, rs.getReservationId()).eq(DistributionReservationPackageEntity::getStockArticleId, stockArticleEntity.getId()).ne(DistributionReservationPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue())); //// List<DistributionReservationPackageEntity> reservationPackageEntityList = distributionReservationPackageService.list(Wrappers.<DistributionReservationPackageEntity>query().lambda().eq(DistributionReservationPackageEntity::getReservationId, rs.getReservationId()).eq(DistributionReservationPackageEntity::getStockArticleId, stockArticleEntity.getId()).ne(DistributionReservationPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue()));
if (Func.isNotEmpty(reservationPackageEntityList)) { //// if (Func.isNotEmpty(reservationPackageEntityList)) {
ArrayList<DistributionParcelListVO> distributionParcelListVOS = new ArrayList<>(); //// ArrayList<DistributionParcelListVO> distributionParcelListVOS = new ArrayList<>();
reservationPackageEntityList.forEach(rp -> { //// reservationPackageEntityList.forEach(rp -> {
DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(rp.getParceListId()); //// DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(rp.getParceListId());
DistributionParcelListVO distributionParcelListVO = DistributionParcelListWrapper.build().entityVO(parcelListEntity); //// DistributionParcelListVO distributionParcelListVO = DistributionParcelListWrapper.build().entityVO(parcelListEntity);
distributionParcelListVOS.add(distributionParcelListVO); //// distributionParcelListVOS.add(distributionParcelListVO);
}); //// });
distributionStockArticleVO.setPackageList(distributionParcelListVOS); //// distributionStockArticleVO.setPackageList(distributionParcelListVOS);
distributionStockArticleVO.setParcelListVOS(DistributionParcelListWrapper.build().listVO(distributionParcelListService.getBaseMapper().selectList(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, rs.getStockArticleId())))); //// distributionStockArticleVO.setParcelListVOS(DistributionParcelListWrapper.build().listVO(distributionParcelListService.getBaseMapper().selectList(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, rs.getStockArticleId()))));
} //// }
} // }
distributionStockArticleVOS.add(distributionStockArticleVO); distributionStockArticleVOS.add(distributionStockArticleVO);
}); });
} }

Loading…
Cancel
Save