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 | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java b/src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java
index a69d204..5bf43bf 100644
--- a/src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java
@@ -4,17 +4,16 @@
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 org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
@@ -67,8 +66,9 @@
*/
@Log(title = "鍙戠エ淇℃伅", businessType = BusinessType.INSERT)
@PostMapping("/addOrUpdateInvoice")
- public AjaxResult addOrUpdateInvoice(@RequestBody InvoicePurchaseDto invoicePurchaseDto) throws IOException {
- return toAjax(invoicePurchaseService.addOrUpdateInvoice(invoicePurchaseDto));
+ public R<?> addOrUpdateInvoice(@RequestBody InvoicePurchaseDto invoicePurchaseDto) throws IOException {
+ invoicePurchaseService.addOrUpdateInvoice(invoicePurchaseDto);
+ return R.ok();
}
/**
@@ -76,16 +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();
}
- @PostMapping("/upload")
- public AjaxResult uploadFile(MultipartFile file, Long id, Integer type) {
- try {
- return AjaxResult.success(commonFileService.uploadFile(file, id, type));
- } catch (Exception e) {
- return AjaxResult.error(e.getMessage());
- }
- }
}
--
Gitblit v1.9.3