到货详情添加已退数量

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

@@ -4,14 +4,21 @@ import com.fjhx.victoriatourist.entity.purchase.po.PurchaseBackDetails;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * 采购退货明细列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-05-19
  */
 @Getter
 @Setter
 public class PurchaseBackDetailsVo extends PurchaseBackDetails {
 
+    /**
+     * 已经退货数量
+     */
+    private BigDecimal returnedQuantity;
+
 }

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

@@ -33,6 +33,7 @@ import com.fjhx.victoriatourist.entity.logistics.po.LogisticsDetails;
 import com.fjhx.victoriatourist.entity.logistics.po.LogisticsInfos;
 import com.fjhx.victoriatourist.entity.purchase.po.PurchaseBack;
 import com.fjhx.victoriatourist.entity.purchase.po.PurchaseBackDetails;
+import com.fjhx.victoriatourist.entity.purchase.vo.PurchaseBackDetailsVo;
 import com.fjhx.victoriatourist.mapper.deliver.DeliverGoodsMapper;
 import com.fjhx.victoriatourist.service.deliver.DeliverGoodsDetailsService;
 import com.fjhx.victoriatourist.service.deliver.DeliverGoodsService;
@@ -315,17 +316,27 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
 
             for (PurchaseDetailVo purchaseDetailVo : purchaseDetailVoList) {
                 List<PurchaseBackDetails> purchaseBackDetails = longListMap.get(purchaseDetailVo.getId());
+                List<PurchaseBackDetailsVo> purchaseBackDetailsVos = BeanUtil.copyToList(purchaseBackDetails, PurchaseBackDetailsVo.class);
 
-                if (ObjectUtil.isEmpty(purchaseBackDetails)) {
+                if (ObjectUtil.isEmpty(purchaseBackDetailsVos)) {
                     purchaseDetailVo.setPurchaseBackQuantity(BigDecimal.ZERO);
                     continue;
                 }
                 //退货数量求和
-                BigDecimal backCount = purchaseBackDetails.stream()
+                BigDecimal backCount = purchaseBackDetailsVos.stream()
                         .map(PurchaseBackDetails::getQuantity)
                         .reduce(BigDecimal.ZERO, BigDecimal::add);
                 purchaseDetailVo.setPurchaseBackQuantity(backCount);
-                purchaseDetailVo.setPurchaseBackDetailsList(purchaseBackDetails);
+                //赋值已退货数量（已经出库的数量）
+                List<Long> pbdIds = purchaseBackDetailsVos.stream().map(PurchaseBackDetails::getId).collect(Collectors.toList());
+                Map<Long, StockWaitDetails> stockWaitDetailsMap = stockWaitDetailsService.mapKEntity(StockWaitDetails::getBusinessDetailsId,
+                        q -> q.in(StockWaitDetails::getBusinessDetailsId, pbdIds));
+                for (PurchaseBackDetailsVo purchaseBackDetailsVo : purchaseBackDetailsVos) {
+                    StockWaitDetails stockWaitDetails = stockWaitDetailsMap.get(purchaseBackDetailsVo.getId());
+                    purchaseBackDetailsVo.setReturnedQuantity(stockWaitDetails.getReceiptQuantity());
+                }
+
+                purchaseDetailVo.setPurchaseBackDetailsList(purchaseBackDetailsVos);
             }
         }
         //赋值已入库记录

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -269,7 +269,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         //创建出入库记录
         Integer businessType = stockWait.getBusinessType();
         StockJournal stockJournal = new StockJournal();
-        stockJournal.setOpType(stockWaitDto.getType());
+        stockJournal.setOpType(stockWait.getType());
         stockJournal.setType(getStockJournalType(businessType));
         stockJournal.setCode(stockWait.getType() == 1 ? CodeEnum.SIN_CODE.getCode() : CodeEnum.SOUT_CODE.getCode());
         stockJournal.setWarehouseId(stockWaitDto.getWarehouseId());