diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index dd4a642c9..05c9670b7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -1542,12 +1542,15 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl !OrderPackageStatusConstant.yiqianshou.getValue().equals(f.getOrderPackageStatus()) - || !OrderPackageLoadingStatusConstant.yizhuangche.getValue().equals(f.getOrderPackageLoadingStatus()) - || !OrderPackageReservationStatusConstant.yiyueyue.getValue().equals(f.getOrderPackageReservationStatus()) +// int sum = parcelListEntities.stream().filter(f -> !OrderPackageStatusConstant.yiqianshou.getValue().equals(f.getOrderPackageStatus()) +// || OrderPackageLoadingStatusConstant.weizhuancghe.getValue().equals(f.getOrderPackageLoadingStatus()) +// || OrderPackageReservationStatusConstant.daiyuyue.getValue().equals(f.getOrderPackageReservationStatus()) +// ).mapToInt(DistributionParcelListEntity::getQuantity).sum(); + int a = parcelListEntities.stream().filter(f -> !OrderPackageStatusConstant.yiqianshou.getValue().equals(f.getOrderPackageStatus())) + .filter(f->OrderPackageLoadingStatusConstant.weizhuancghe.getValue().equals(f.getOrderPackageLoadingStatus())) + .filter(f->OrderPackageReservationStatusConstant.daiyuyue.getValue().equals(f.getOrderPackageReservationStatus()) ).mapToInt(DistributionParcelListEntity::getQuantity).sum(); - log.info("####################维护订单在库数量>>>>>>>>>>>>>>>>,:{}",stockArticleEntity.getOrderCode()+sum); - inWarehouseQuantity = sum; + inWarehouseQuantity = a; stockArticleEntity.setHandQuantity(inWarehouseQuantity); stockArticleEntity.setDeliveryQuantity(deliveryQuantity);