增加已退货数量统计

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/vo/PurchaseDetailVo.java

@@ -79,6 +79,10 @@ public class PurchaseDetailVo extends PurchaseDetail {
      */
     private BigDecimal purchaseBackQuantity;
     /**
+     * 采购已退数量
+     */
+    private BigDecimal purchaseReturnedQuantity;
+    /**
      * 采购退货列表
      */
     private Object purchaseBackDetailsList;

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/deliver/impl/DeliverGoodsServiceImpl.java

@@ -380,6 +380,8 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
                         .map(PurchaseBackDetails::getQuantity)
                         .reduce(BigDecimal.ZERO, BigDecimal::add);
                 purchaseDetailVo.setPurchaseBackQuantity(backCount);
+                //已退数量
+                BigDecimal returnedQuantityCount = BigDecimal.ZERO;
                 //赋值已退货数量（已经出库的数量）
                 List<Long> pbdIds = purchaseBackDetailsVos.stream().map(PurchaseBackDetails::getId).collect(Collectors.toList());
                 Map<Long, StockWaitDetails> stockWaitDetailsMap = stockWaitDetailsService.mapKEntity(StockWaitDetails::getBusinessDetailsId,
@@ -390,9 +392,11 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
                     if (ObjectUtil.isNotEmpty(stockWaitDetails)) {
                         returnedQuantity = stockWaitDetails.getReceiptQuantity();
                     }
+                    returnedQuantityCount = returnedQuantityCount.add(returnedQuantity);
                     purchaseBackDetailsVo.setReturnedQuantity(returnedQuantity);
 
                 }
+                purchaseDetailVo.setPurchaseReturnedQuantity(returnedQuantityCount);
 
                 purchaseDetailVo.setPurchaseBackDetailsList(purchaseBackDetailsVos);
             }