From 95ce4948405975fbe1137fdbe6f5c25eb00663db Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 23 十二月 2025 10:42:01 +0800
Subject: [PATCH] 发货前校验产品库存接口
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 111 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 79bde14..e398a11 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -1,6 +1,8 @@
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;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -8,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;
@@ -21,7 +28,11 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
@@ -42,6 +53,15 @@
@Autowired
private InvoiceLedgerMapper invoiceLedgerMapper;
+ @Autowired
+ private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
+
+ @Autowired
+ private ReceiptPaymentMapper receiptPaymentMapper;
+ @Autowired
+ private ISalesLedgerProductService salesLedgerProductService;
+ @Autowired
+ private ProcurementRecordService procurementRecordService;
/**
* 鏌ヨ閿�鍞彴璐﹀垪琛�
*/
@@ -66,6 +86,7 @@
}
}
}
+
return getDataTable(list);
}
@@ -86,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(), "瀵煎嚭寮�绁ㄧ櫥璁板垪琛�");
}
/**
@@ -158,8 +193,8 @@
* 杩戝崐骞村紑绁�,鍥炴閲戦
*/
@GetMapping("/getAmountHalfYear")
- public AjaxResult getAmountHalfYear() {
- return AjaxResult.success(salesLedgerService.getAmountHalfYear());
+ public AjaxResult getAmountHalfYear(@RequestParam(value = "type",defaultValue = "1") Integer type) {
+ return AjaxResult.success(salesLedgerService.getAmountHalfYear(type));
}
/**
@@ -175,7 +210,19 @@
List<Long> salesLedgerIds = iPage.getRecords().stream().map(SalesLedger::getId).collect(Collectors.toList());
List<InvoiceLedgerDto> invoiceLedgerDtoList = invoiceLedgerMapper.invoicedTotal(salesLedgerIds);
if(CollectionUtils.isEmpty(invoiceLedgerDtoList)){
+ 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;
@@ -186,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;
}
}
@@ -196,6 +263,47 @@
}
salesLedger.setInvoiceTotal(invoiceTotal);
}
+ if (ObjectUtils.isNotEmpty(salesLedgerDto.getStatus())) {
+ if (salesLedgerDto.getStatus()) {
+ iPage.getRecords().removeIf(salesLedger -> Objects.equals(salesLedger.getNoInvoiceAmountTotal(), new BigDecimal("0.00")));
+ }
+ }
+ iPage.setTotal(iPage.getRecords().size());
return iPage;
}
+ /**
+ * 閿�鍞彴璐﹂〉闈㈠彂璐э紝鏌ヨ搴撳瓨鏄惁鍏呰冻
+ */
+ @GetMapping("/getProductInventory")
+ public AjaxResult getProductInventory(SalesLedgerProduct salesLedgerProduct){
+ List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
+ if(CollectionUtils.isEmpty(list)){
+ return AjaxResult.error("璇ヤ骇鍝佷笉瀛樺湪");
+ }
+ List<ProcurementPageDto> procurementPageDtoList = new ArrayList<>();
+ list.forEach(item -> {
+ ProcurementPageDto procurementDto = new ProcurementPageDto();
+ procurementDto.setSalesLedgerProductId(String.valueOf(item.getId()));
+ Page<ProcurementPageDto> page = new Page<>(1, 50);
+ IPage<ProcurementPageDto> procurementPageDtoIPage = procurementRecordService.listPage(page, procurementDto);
+ procurementPageDtoList.addAll(procurementPageDtoIPage.getRecords());
+ });
+ if(!CollectionUtils.isEmpty(procurementPageDtoList)){
+ return AjaxResult.error("璇ヤ骇鍝佸簱瀛樹笉瀛樺湪");
+ }
+ AtomicInteger num = new AtomicInteger();
+ list.forEach(item -> {
+ procurementPageDtoList.forEach(procurementPageDto -> {
+ if(String.valueOf(item.getId().intValue()).equals(procurementPageDto.getSalesLedgerProductId())){
+ if (item.getQuantity().compareTo(procurementPageDto.getInboundNum0()) <= 0) {
+ num.getAndIncrement();
+ }
+ }
+ });
+ });
+ if(num.get() == list.size()){
+ return AjaxResult.success("璇ヤ骇鍝佸簱瀛樺厖瓒�");
+ }
+ return AjaxResult.error("璇ヤ骇鍝佸簱瀛樹笉瓒�");
+ }
}
--
Gitblit v1.9.3