|
@@ -223,13 +223,15 @@ public class EhsdPurchaseFlow extends FlowDelegate {
|
|
|
|
|
|
if (Objects.equals(purchase.getDataResource(), 0)) {
|
|
|
//修改申购明细状态
|
|
|
- List<EhsdPurchaseProduct> purchaseDetailList = purchaseProductService.list(q -> q.eq(EhsdPurchaseProduct::getProductId, businessId));
|
|
|
+ List<EhsdPurchaseProduct> purchaseDetailList = purchaseProductService.list(q -> q.eq(EhsdPurchaseProduct::getPurchaseId, businessId));
|
|
|
List<Long> subscribeDetailIds = purchaseDetailList.stream().map(EhsdPurchaseProduct::getSubscribeDetailId).collect(Collectors.toList());
|
|
|
+
|
|
|
List<SubscribeDetail> subscribeDetails = subscribeDetailService.listByIds(subscribeDetailIds);
|
|
|
for (SubscribeDetail subscribeDetail : subscribeDetails) {
|
|
|
//获取申购明细下的所有采购记录 计算已采购数
|
|
|
- List<EhsdPurchaseProduct> purchaseDetails = purchaseProductService.list(q -> q.eq(EhsdPurchaseProduct::getSubscribeDetailId,
|
|
|
- subscribeDetail.getId()).eq(EhsdPurchaseProduct::getProductId, subscribeDetail.getProductId()));
|
|
|
+ List<EhsdPurchaseProduct> purchaseDetails = purchaseProductService.list(q -> q
|
|
|
+ .eq(EhsdPurchaseProduct::getSubscribeDetailId,
|
|
|
+ subscribeDetail.getId()).eq(EhsdPurchaseProduct::getProductId, subscribeDetail.getProductId()));
|
|
|
BigDecimal count = purchaseDetails.stream()
|
|
|
.map(EhsdPurchaseProduct::getQuantity)
|
|
|
.reduce(BigDecimal.ZERO, BigDecimal::add);
|