From 47806d9e390ee00e1d29ad1da8c1aa908882a758 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 11 八月 2026 14:43:59 +0800
Subject: [PATCH] 用河南鹤壁代码覆盖山西长治
---
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
index 58216c1..07a090d 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
@@ -7,7 +7,6 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
import com.ruoyi.purchase.mapper.PurchaseLedgerTemplateMapper;
@@ -32,8 +31,8 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLEncoder;
-import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* 閲囪喘鍙拌处Controller
@@ -138,13 +137,6 @@
return toAjax(purchaseLedgerService.addOrEditPurchase(purchaseLedgerDto));
}
- @Operation(summary = "鎵归噺鎺ㄨ繘閲囪喘鍙拌处鍒板叆搴�")
- @Log(title = "鎵归噺鎺ㄨ繘閲囪喘鍙拌处鍒板叆搴�", businessType = BusinessType.OTHER)
- @PostMapping("/batchInsertPurchaseSteps")
- public R batchInsertPurchaseSteps(@RequestBody PurchaseLedgerDto purchaseLedgerDto) {
- return purchaseLedgerService.batchInsertPurchaseSteps(purchaseLedgerDto == null ? null : purchaseLedgerDto.getIds());
- }
-
/**
* 鏌ヨ閲囪喘妯℃澘
*/
@@ -166,6 +158,7 @@
/**
* 淇敼閲囪喘鍙拌处瀹℃壒鐘舵��
*/
+ @Log(title = "閲囪喘鍙拌处", businessType = BusinessType.UPDATE)
@PostMapping("/updateApprovalStatus")
public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedger purchaseLedger){
return toAjax(purchaseLedgerService.updateById(purchaseLedger));
@@ -255,7 +248,17 @@
@Operation(summary = "鐢熸垚閲囪喘搴忓垪鍙�")
@GetMapping("/createPurchaseNo")
@Log(title = "鐢熸垚閲囪喘搴忓垪鍙�", businessType = BusinessType.OTHER)
- public AjaxResult createPurchaseNo(@RequestParam Date entryDate) {
- return AjaxResult.success("鐢熸垚鎴愬姛",purchaseLedgerService.getPurchaseNo(entryDate));
+ public AjaxResult createPurchaseNo() {
+ return AjaxResult.success("鐢熸垚鎴愬姛",purchaseLedgerService.getPurchaseNo());
+ }
+
+ @Operation(summary = "鑾峰彇閲囪喘鍗曟墦鍗版暟鎹�")
+ @GetMapping("/printData/{id}")
+ public AjaxResult printData(@PathVariable Long id) {
+ Map<String, Object> data = purchaseLedgerService.getPrintData(id);
+ if (data == null) {
+ return AjaxResult.error("閲囪喘鍗曚笉瀛樺湪");
+ }
+ return AjaxResult.success(data);
}
}
--
Gitblit v1.9.3