From 60117d199e9345ac3e5287f1e82d51f74f14dddb Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 13 一月 2026 15:57:23 +0800
Subject: [PATCH] yys 付款，回款改为绑定台账，产品
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index 8e14547..b964e4c 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -2,7 +2,13 @@
import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
+import com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy;
+import com.ruoyi.procurementrecord.service.ProcurementRecordService;
+import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,15 +39,50 @@
{
@Autowired
private ISalesLedgerProductService salesLedgerProductService;
+ @Autowired
+ private ProcurementRecordService procurementRecordService;
+
+
+ /**
+ * 鍥炴鐧昏鍒嗛〉鏌ヨ
+ */
+ @GetMapping("/listPageSalesLedger")
+ public AjaxResult listPage(Page page, SalesLedgerProductDto salesLedgerProduct) {
+ IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPage(page,salesLedgerProduct);
+ return AjaxResult.success(list);
+ }
+
+
+ /**
+ * 浠樻鐧昏鍒嗛〉鏌ヨ
+ */
+ @GetMapping("/listPagePurchaseLedger")
+ public AjaxResult listPagePurchaseLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
+ IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPagePurchaseLedger(page,salesLedgerProduct);
+ return AjaxResult.success(list);
+ }
+
/**
* 鏌ヨ浜у搧淇℃伅鍒楄〃
*/
@GetMapping("/list")
- public List<SalesLedgerProduct> list(SalesLedgerProduct salesLedgerProduct)
+ public AjaxResult list(SalesLedgerProduct salesLedgerProduct)
{
List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
- return list;
+ list.forEach(item -> {
+ ProcurementPageDto procurementDto = new ProcurementPageDto();
+ procurementDto.setSalesLedgerProductId(item.getId());
+ procurementDto.setProductCategory(item.getProductCategory());
+ IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopyByProduction(new Page<>(1,-1), procurementDto);
+ if(result.getTotal()==0) return;
+ ProcurementPageDtoCopy procurementDtoCopy = result.getRecords().get(0);
+ if(item.getQuantity().compareTo(procurementDtoCopy.getInboundNum0())>=0){
+ item.setApproveStatus(1);
+ salesLedgerProductService.addOrUpdateSalesLedgerProduct(item);
+ }
+ });
+ return AjaxResult.success(list);
}
/**
--
Gitblit v1.9.3