From 47806d9e390ee00e1d29ad1da8c1aa908882a758 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 11 八月 2026 14:43:59 +0800
Subject: [PATCH] 用河南鹤壁代码覆盖山西长治
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java | 54 +++++++++++++++++++++++++++++-------------------------
1 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index f04417e..6d45432 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -7,13 +7,20 @@
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.procurementrecord.service.ProcurementRecordService;
+import com.ruoyi.procurementrecord.utils.StockUtils;
+import com.ruoyi.purchase.dto.SimpleReturnOrderGroupDto;
+import com.ruoyi.purchase.mapper.PurchaseReturnOrderProductsMapper;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* 浜у搧淇℃伅Controller
@@ -27,6 +34,9 @@
public class SalesLedgerProductController extends BaseController
{
private final ISalesLedgerProductService salesLedgerProductService;
+ private final ProcurementRecordService procurementRecordService;
+ private final StockUtils stockUtils;
+ private final PurchaseReturnOrderProductsMapper purchaseReturnOrderProductsMapper;
/**
@@ -35,32 +45,26 @@
@GetMapping("/list")
public AjaxResult list(SalesLedgerProduct salesLedgerProduct) {
List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
- if (CollUtil.isNotEmpty(list)) {
- list.forEach(item -> {
- if (item.getApproveStatus() != 2) {
- if (item.getHasSufficientStock() == 0) {
- item.setApproveStatus(0);
- } else {
- item.setApproveStatus(1);
- }
- }
- java.math.BigDecimal returnQuantity = item.getReturnQuantity() == null
- ? java.math.BigDecimal.ZERO
- : item.getReturnQuantity();
- item.setReturnQuantity(returnQuantity);
- java.math.BigDecimal availableQuality = item.getQuantity() == null
- ? java.math.BigDecimal.ZERO
- : item.getQuantity();
- if (item.getType() != null && item.getType() == 2) {
- availableQuality = item.getApprovedStockInNum() == null
- ? java.math.BigDecimal.ZERO
- : item.getApprovedStockInNum();
- availableQuality = availableQuality
- .subtract(item.getShippedQuantity() == null ? java.math.BigDecimal.ZERO : item.getShippedQuantity());
- }
- item.setAvailableQuality(availableQuality.subtract(returnQuantity));
- });
+ if (CollUtil.isEmpty(list)) {
+ return AjaxResult.success(list);
}
+ List<Long> productIds = list.stream().map(SalesLedgerProduct::getProductModelId).collect(Collectors.toList());
+ List<SimpleReturnOrderGroupDto> groupListByProductIds = purchaseReturnOrderProductsMapper.getReturnOrderGroupListByProductIds(productIds);
+ Map<Long, BigDecimal> returnOrderGroupDtoMap = groupListByProductIds.stream().collect(Collectors.toMap(SimpleReturnOrderGroupDto::getProductModelId, item -> item.getSumReturnQuantity()));
+
+ list.forEach(item -> {
+ if (item.getApproveStatus() != 2) {
+ if (item.getHasSufficientStock() == 0) {
+ item.setApproveStatus(0);
+ } else {
+ item.setApproveStatus(1);
+ }
+ }
+ // 缁熻閫�璐ф暟閲�
+ BigDecimal returnQuality = returnOrderGroupDtoMap.getOrDefault(item.getProductModelId(), BigDecimal.ZERO);
+ item.setReturnQuality(returnQuality);
+ item.setAvailableQuality(item.getQuantity().subtract(returnQuality));
+ });
return AjaxResult.success(list);
}
--
Gitblit v1.9.3