Merge branch 'dev' into pre-production

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

@@ -1549,10 +1549,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 //					|| 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();
+				int a = parcelListEntities.stream().filter(f -> !OrderPackageStatusConstant.yiqianshou.getValue().equals(f.getOrderPackageStatus())&&OrderPackageLoadingStatusConstant.weizhuancghe.getValue().equals(f.getOrderPackageLoadingStatus()))
+				.mapToInt(DistributionParcelListEntity::getQuantity).sum();
 				inWarehouseQuantity = a;
 
 				stockArticleEntity.setHandQuantity(inWarehouseQuantity);