From bb34020de8977a191a0e948a057d347c5cb4b70c Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 03 四月 2026 15:51:26 +0800
Subject: [PATCH] fix: 销售台账页面发货查询库存是否充足修改
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 77 +++++++++++++++++++++++++++++++++++---
1 files changed, 70 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index c384520..b990fe8 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -10,16 +10,16 @@
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
+import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
-import com.ruoyi.sales.pojo.InvoiceLedger;
-import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
-import com.ruoyi.sales.pojo.ReceiptPayment;
-import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.pojo.*;
import com.ruoyi.sales.service.ICommonFileService;
+import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ISalesLedgerService;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,9 +29,10 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
@@ -57,6 +58,10 @@
@Autowired
private ReceiptPaymentMapper receiptPaymentMapper;
+ @Autowired
+ private ISalesLedgerProductService salesLedgerProductService;
+ @Autowired
+ private ProcurementRecordService procurementRecordService;
/**
* 鏌ヨ閿�鍞彴璐﹀垪琛�
@@ -261,10 +266,68 @@
}
if (ObjectUtils.isNotEmpty(salesLedgerDto.getStatus())) {
if (salesLedgerDto.getStatus()) {
- iPage.getRecords().removeIf(salesLedger -> Objects.equals(salesLedger.getNoInvoiceAmountTotal(), new BigDecimal("0.00")));
+ // 鑾峰彇鍒犻櫎鏁伴噺
+ long count = iPage.getRecords()
+ .stream()
+ .filter(salesLedger -> salesLedger.getNoInvoiceAmountTotal() != null && salesLedger.getNoInvoiceAmountTotal().compareTo(BigDecimal.ZERO) == 0)
+ .count();
+ iPage.setTotal(iPage.getTotal() - count);
+ iPage.getRecords().removeIf(salesLedger -> salesLedger.getNoInvoiceAmountTotal() != null && salesLedger.getNoInvoiceAmountTotal().compareTo(BigDecimal.ZERO) == 0);
}
}
- iPage.setTotal(iPage.getRecords().size());
return iPage;
}
+ /**
+ * 閿�鍞彴璐﹂〉闈㈠彂璐э紝鏌ヨ搴撳瓨鏄惁鍏呰冻
+ */
+ @GetMapping("/getProductInventory")
+ public AjaxResult getProductInventory(SalesLedgerProduct salesLedgerProduct) {
+ List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
+ if (CollectionUtils.isEmpty(list)) {
+ throw new RuntimeException("璇ヤ骇鍝佷笉瀛樺湪");
+ }
+
+ Map<Long, BigDecimal> requiredQuantities = list.stream()
+ .filter(p -> p.getProductModelId() != null)
+ .collect(Collectors.groupingBy(
+ SalesLedgerProduct::getProductModelId,
+ Collectors.mapping(SalesLedgerProduct::getQuantity, Collectors.reducing(BigDecimal.ZERO, (a, b) -> a.add(b != null ? b : BigDecimal.ZERO)))
+ ));
+
+ for (Map.Entry<Long, BigDecimal> entry : requiredQuantities.entrySet()) {
+ Long modelId = entry.getKey();
+ BigDecimal neededQty = entry.getValue();
+
+ ProcurementPageDto queryDto = new ProcurementPageDto();
+ queryDto.setProductModelId(modelId);
+
+ // 鑾峰彇璇ヨ鏍煎瀷鍙风殑鎵�鏈夊簱瀛樿褰�
+ IPage<ProcurementPageDto> inventoryPage = procurementRecordService.listPage(new Page<>(1, -1), queryDto);
+
+ // 姹囨�绘墍鏈夋壒娆＄殑鍙敤搴撳瓨
+ BigDecimal totalStock = inventoryPage.getRecords().stream()
+ .map(ProcurementPageDto::getInboundNum0)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ if (totalStock.compareTo(neededQty) < 0) {
+ String modelName = list.stream()
+ .filter(p -> modelId.equals(p.getProductModelId()))
+ .map(SalesLedgerProduct::getSpecificationModel)
+ .findFirst()
+ .orElse("鏈煡鍨嬪彿");
+ return AjaxResult.error("浜у搧 [" + modelName + "] 搴撳瓨涓嶈冻锛屾墍闇�: " + neededQty + ", 褰撳墠鎬诲簱瀛�: " + totalStock);
+ }
+ }
+
+ return AjaxResult.success("璇ヤ骇鍝佸簱瀛樺厖瓒�");
+ }
+
+ /**
+ * 鏍规嵁閲囪喘鍚堝悓鍙锋煡璇㈣鎯�
+ */
+ @GetMapping("/getSalesByCode")
+ public AjaxResult getSalesByCode(SalesLedgerDto salesLedgerDto) {
+ return AjaxResult.success(salesLedgerService.getSalesByCode(salesLedgerDto));
+ }
}
--
Gitblit v1.9.3