From f0f07a80269905ccb9741a94f797781452837cf5 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 28 三月 2026 13:34:17 +0800
Subject: [PATCH] Merge branch 'dhdc' of http://114.132.189.42:9002/r/product-inventory-management-after into dhdc
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 71 +++++++++++++++++++++++++++++++++--
1 files changed, 66 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index e968530..356a9de 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;
@@ -31,6 +31,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
@@ -56,7 +57,10 @@
@Autowired
private ReceiptPaymentMapper receiptPaymentMapper;
-
+ @Autowired
+ private ISalesLedgerProductService salesLedgerProductService;
+ @Autowired
+ private ProcurementRecordService procurementRecordService;
/**
* 鏌ヨ閿�鍞彴璐﹀垪琛�
*/
@@ -102,6 +106,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(), "瀵煎嚭寮�绁ㄧ櫥璁板垪琛�");
}
/**
@@ -252,4 +270,47 @@
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("璇ヤ骇鍝佷笉瀛樺湪");
+ }
+ 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)){
+ throw new RuntimeException("璇ヤ骇鍝佸簱瀛樹笉瀛樺湪");
+ }
+ 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("璇ヤ骇鍝佸簱瀛樹笉瓒�");
+ }
+
+ /**
+ * 鏍规嵁閲囪喘鍚堝悓鍙锋煡璇㈣鎯�
+ */
+ @GetMapping("/getSalesByCode")
+ public AjaxResult getSalesByCode(SalesLedgerDto salesLedgerDto) {
+ return AjaxResult.success(salesLedgerService.getSalesByCode(salesLedgerDto));
+ }
}
--
Gitblit v1.9.3