From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java b/src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java
index 256f9c5..5bf43bf 100644
--- a/src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java
@@ -1,23 +1,21 @@
package com.ruoyi.purchase.controller;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.purchase.pojo.InvoicePurchase;
-import com.ruoyi.purchase.service.IInvoicePurchaseService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
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.InvoicePurchaseDto;
+import com.ruoyi.purchase.pojo.InvoicePurchase;
+import com.ruoyi.purchase.service.IInvoicePurchaseService;
+import com.ruoyi.sales.service.ICommonFileService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.List;
/**
* 鍙戠エ淇℃伅Controller
@@ -32,13 +30,15 @@
private IInvoicePurchaseService invoicePurchaseService;
+ private ICommonFileService commonFileService;
+
/**
* 鏌ヨ鍙戠エ淇℃伅鍒楄〃
*/
@GetMapping("/list")
- public TableDataInfo list(InvoicePurchase invoicePurchase) {
+ public TableDataInfo list(InvoicePurchaseDto invoicePurchaseDto) {
startPage();
- List<InvoicePurchase> list = invoicePurchaseService.selectInvoicePurchaseList(invoicePurchase);
+ List<InvoicePurchaseDto> list = invoicePurchaseService.selectInvoicePurchaseList(invoicePurchaseDto);
return getDataTable(list);
}
@@ -48,18 +48,27 @@
@Log(title = "鍙戠エ淇℃伅", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, InvoicePurchase invoicePurchase) {
- List<InvoicePurchase> list = invoicePurchaseService.selectInvoicePurchaseList(invoicePurchase);
+ List<InvoicePurchase> list = invoicePurchaseService.selectInvoicePurchaseLists(invoicePurchase);
ExcelUtil<InvoicePurchase> util = new ExcelUtil<InvoicePurchase>(InvoicePurchase.class);
util.exportExcel(response, list, "鍙戠エ淇℃伅鏁版嵁");
+ }
+
+ /**
+ * 鏌ヨ鍙戠エ淇℃伅
+ */
+ @GetMapping("/getInvoiceById")
+ public InvoicePurchaseDto getInvoiceById(InvoicePurchaseDto invoicePurchaseDto) {
+ return invoicePurchaseService.getInvoiceById(invoicePurchaseDto);
}
/**
* 鏂板淇敼鍙戠エ淇℃伅
*/
@Log(title = "鍙戠エ淇℃伅", businessType = BusinessType.INSERT)
- @PostMapping ("/addOrUpdateInvoice")
- public AjaxResult addOrUpdateInvoice(@RequestBody InvoicePurchase invoicePurchase) {
- return toAjax(invoicePurchaseService.addOrUpdateInvoice(invoicePurchase));
+ @PostMapping("/addOrUpdateInvoice")
+ public R<?> addOrUpdateInvoice(@RequestBody InvoicePurchaseDto invoicePurchaseDto) throws IOException {
+ invoicePurchaseService.addOrUpdateInvoice(invoicePurchaseDto);
+ return R.ok();
}
/**
@@ -67,7 +76,9 @@
*/
@Log(title = "鍙戠エ淇℃伅", businessType = BusinessType.DELETE)
@DeleteMapping("/delInvoice")
- public AjaxResult remove(@RequestBody Long[] ids) {
- return toAjax(invoicePurchaseService.delInvoice(ids));
+ public R<?> remove(@RequestBody Long[] ids) {
+ invoicePurchaseService.delInvoice(ids);
+ return R.ok();
}
+
}
--
Gitblit v1.9.3