From 726f9fd86e790386732906769c4ee5f9c3e3087b Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 14 一月 2026 11:08:15 +0800
Subject: [PATCH] yys 付款，回款改为绑定台账，产品
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index 058360b..2848d5c 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -8,6 +8,7 @@
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;
@@ -40,6 +41,28 @@
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);
+ }
+
+
/**
* 鏌ヨ浜у搧淇℃伅鍒楄〃
*/
@@ -52,10 +75,12 @@
procurementDto.setSalesLedgerProductId(item.getId());
procurementDto.setProductCategory(item.getProductCategory());
IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopyByProduction(new Page<>(1,-1), procurementDto);
- ProcurementPageDtoCopy procurementDtoCopy = result.getRecords().get(0);
- if(item.getQuantity().compareTo(procurementDtoCopy.getInboundNum0())>=0){
- item.setApproveStatus(1);
- salesLedgerProductService.addOrUpdateSalesLedgerProduct(item);
+ if(result.getRecords().size()>0) {
+ 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