From 37b697351e8e0a9200eee1276c4081c07588dc10 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 17 六月 2025 20:39:48 +0800
Subject: [PATCH] 未回款金额(元)为NaN修复
---
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
index 70809d8..8f991e3 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
@@ -1,5 +1,7 @@
package com.ruoyi.purchase.controller;
+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.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -10,6 +12,7 @@
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.service.IPurchaseLedgerService;
import com.ruoyi.sales.service.ISalesLedgerService;
+import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -86,6 +89,15 @@
return salesLedgerService.getSalesNo();
}
+
+ /**
+ * 鏍规嵁閿�鍞悎鍚屾煡璇骇鍝佷俊鎭�
+ */
+ @GetMapping("/getProductBySalesNo")
+ public AjaxResult getProductBySalesNo(Long id) {
+ return AjaxResult.success(purchaseLedgerService.getProductBySalesNo(id));
+ }
+
/**
* 鏌ヨ閲囪喘鍚堝悓鍙�
*/
@@ -98,8 +110,8 @@
* 鏍规嵁id鏌ヨ閲囪喘鍚堝悓鍙�
*/
@GetMapping("/getPurchaseNoById")
- public PurchaseLedgerDto getPurchaseNoById(Long id) {
- return purchaseLedgerService.getPurchaseNoById(id);
+ public AjaxResult getPurchaseNoById(Long id) {
+ return AjaxResult.success(purchaseLedgerService.getPurchaseNoById(id));
}
/**
@@ -114,7 +126,22 @@
* 鏍规嵁閲囪喘鍚堝悓鍙锋煡璇骇鍝�
*/
@GetMapping("/getInfo")
- public PurchaseLedgerDto getInfo(PurchaseLedgerDto purchaseLedgerDto) {
- return purchaseLedgerService.getInfo(purchaseLedgerDto);
+ public AjaxResult getInfo(PurchaseLedgerDto purchaseLedgerDto) {
+ return AjaxResult.success(purchaseLedgerService.getInfo(purchaseLedgerDto));
+ }
+
+ /**
+ * 鏌ヨ閲囪喘鍙拌处鍒楄〃
+ */
+ @GetMapping("/listPage")
+ public IPage<PurchaseLedger> listPage(Page page, PurchaseLedger purchaseLedger) {
+ return purchaseLedgerService.selectPurchaseLedgerListPage(page ,purchaseLedger);
+ }
+
+ @ApiOperation("鐢熸垚閲囪喘搴忓垪鍙�")
+ @GetMapping("/createPurchaseNo")
+ @Log(title = "鐢熸垚閲囪喘搴忓垪鍙�", businessType = BusinessType.OTHER)
+ public String createPurchaseNo() {
+ return purchaseLedgerService.getPurchaseNo();
}
}
--
Gitblit v1.9.3