From ccef20c2aa1bda974f2b7908cd106b46e556c86b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 03 四月 2026 15:44:00 +0800
Subject: [PATCH] fix: 销售台账页面发货查询库存是否充足修改
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 118 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index a18d5c4..aec1b42 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -1,5 +1,6 @@
package com.ruoyi.sales.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -9,11 +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.pojo.SalesLedger;
+import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
+import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
+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;
@@ -22,8 +28,11 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
@@ -44,6 +53,15 @@
@Autowired
private InvoiceLedgerMapper invoiceLedgerMapper;
+ @Autowired
+ private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
+
+ @Autowired
+ private ReceiptPaymentMapper receiptPaymentMapper;
+ @Autowired
+ private ISalesLedgerProductService salesLedgerProductService;
+ @Autowired
+ private ProcurementRecordService procurementRecordService;
/**
* 鏌ヨ閿�鍞彴璐﹀垪琛�
*/
@@ -65,10 +83,10 @@
if (salesLedger.getId().intValue() == invoiceLedgerDto.getSalesLedgerId()) {
BigDecimal noInvoiceAmountTotal = salesLedger.getContractAmount().subtract(invoiceLedgerDto.getInvoiceTotal());
salesLedger.setNoInvoiceAmountTotal(noInvoiceAmountTotal);
-
}
}
}
+
return getDataTable(list);
}
@@ -89,6 +107,20 @@
List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
ExcelUtil<SalesLedger> util = new ExcelUtil<SalesLedger>(SalesLedger.class);
util.exportExcel(response, list, "閿�鍞彴璐︽暟鎹�");
+ }
+
+ /**
+ * 瀵煎嚭寮�绁ㄧ櫥璁板垪琛�
+ */
+ @Log(title = "瀵煎嚭寮�绁ㄧ櫥璁板垪琛�", businessType = BusinessType.EXPORT)
+ @PostMapping("/exportOne")
+ public void exportOne(HttpServletResponse response, SalesLedgerDto salesLedgerDto) {
+ Page page = new Page();
+ page.setCurrent(-1);
+ page.setSize(-1);
+ IPage<SalesLedger> salesLedgerIPage = listPage(page, salesLedgerDto);
+ ExcelUtil<SalesLedger> util = new ExcelUtil<SalesLedger>(SalesLedger.class);
+ util.exportExcel(response, salesLedgerIPage == null ? new ArrayList<>() : salesLedgerIPage.getRecords(), "瀵煎嚭寮�绁ㄧ櫥璁板垪琛�");
}
/**
@@ -181,6 +213,17 @@
iPage.setTotal(iPage.getRecords().size());
return iPage;
}
+ // 璁＄畻鍥炴閲戦锛屽緟鍥炴閲戦
+ List<InvoiceRegistrationProduct> invoiceRegistrationProducts = invoiceRegistrationProductMapper.selectList(new LambdaQueryWrapper<InvoiceRegistrationProduct>()
+ .in(InvoiceRegistrationProduct::getSalesLedgerId, salesLedgerIds));
+
+ List<InvoiceLedger> invoiceLedgers = invoiceLedgerMapper.selectList(new LambdaQueryWrapper<InvoiceLedger>()
+ .in(InvoiceLedger::getInvoiceRegistrationProductId, invoiceRegistrationProducts.stream().map(InvoiceRegistrationProduct::getId).collect(Collectors.toList())));
+ List<ReceiptPayment> receiptPayments = new ArrayList<>();
+ if(!CollectionUtils.isEmpty(invoiceLedgers)){
+ receiptPayments = receiptPaymentMapper.selectList(new LambdaQueryWrapper<ReceiptPayment>()
+ .in(ReceiptPayment::getInvoiceLedgerId, invoiceLedgers.stream().map(InvoiceLedger::getId).collect(Collectors.toList())));
+ }
for (SalesLedger salesLedger : iPage.getRecords()) {
boolean existFlag = false;
BigDecimal noInvoiceAmountTotal = BigDecimal.ZERO;
@@ -190,6 +233,26 @@
noInvoiceAmountTotal = salesLedger.getContractAmount().subtract(invoiceLedgerDto.getInvoiceTotal());
invoiceTotal = invoiceLedgerDto.getInvoiceTotal();
existFlag = true;
+ if(!CollectionUtils.isEmpty(receiptPayments)){
+ List<InvoiceRegistrationProduct> collect = invoiceRegistrationProducts.stream()
+ .filter(item -> salesLedger.getId().equals(Long.parseLong(item.getSalesLedgerId().toString())))
+ .collect(Collectors.toList());
+ List<Integer> collect1 = collect.stream()
+ .map(InvoiceRegistrationProduct::getId).collect(Collectors.toList());
+ List<InvoiceLedger> collect2 = invoiceLedgers.stream()
+ .filter(item -> collect1.contains(item.getInvoiceRegistrationProductId()))
+ .collect(Collectors.toList());
+ // 鑾峰彇宸插洖娆鹃噾棰�
+ List<ReceiptPayment> collect3 = receiptPayments.stream()
+ .filter(item -> collect2.stream().anyMatch(item1 -> item1.getId().equals(item.getInvoiceLedgerId())))
+ .collect(Collectors.toList());
+ BigDecimal receiptPaymentAmountTotal = collect3.stream().map(ReceiptPayment::getReceiptPaymentAmount)
+ .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+ // 鑾峰彇寰呭洖娆鹃噾棰�
+ BigDecimal noReceiptPaymentAmountTotal = invoiceLedgerDto.getInvoiceTotal().subtract(receiptPaymentAmountTotal);
+ salesLedger.setReceiptPaymentAmountTotal(receiptPaymentAmountTotal);
+ salesLedger.setNoReceiptAmount(noReceiptPaymentAmountTotal);
+ }
break;
}
}
@@ -208,4 +271,57 @@
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