|
@@ -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);
|
|
|
}
|
|
|
}
|
|
|
//赋值已入库记录
|