From 0ec581bd195ea9c06c38ef4f91ac7497a87b8ca3 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 22 四月 2026 17:49:54 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
index 650dbaa..0559ff8 100644
--- a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
@@ -1,29 +1,29 @@
package com.ruoyi.sales.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
-import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
-import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
+import com.ruoyi.sales.mapper.InvoiceLedgerFileMapper;
import com.ruoyi.sales.service.InvoiceLedgerService;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.jsonwebtoken.lang.Collections;
+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.math.BigDecimal;
import java.util.List;
@RestController
@RequestMapping("/invoiceLedger")
+@AllArgsConstructor
public class InvoiceLedgerController {
- @Autowired
private InvoiceLedgerService invoiceLedgerService;
-
- @Autowired
- private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
+ private InvoiceLedgerFileMapper invoiceLedgerFileMapper;
/**
* 寮�绁ㄥ彴璐︽柊澧�
@@ -69,6 +69,19 @@
}
/**
+ * 寮�绁ㄥ彴璐︽枃浠跺垹闄�
+ */
+ @DeleteMapping("/delFile")
+ @Log(title = "寮�绁ㄥ彴璐�", businessType = BusinessType.DELETE)
+ public AjaxResult invoiceLedgerDelFile(@RequestBody List<Integer> ids) {
+ if(Collections.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨瑕佸垹闄ょ殑鏂囦欢");
+ invoiceLedgerFileMapper.deleteBatchIds(ids);
+ return AjaxResult.success();
+ }
+
+
+
+ /**
* 寮�绁ㄥ彴璐︽枃浠朵笂浼�
* @param file
* @return
@@ -85,12 +98,12 @@
/**
* 寮�绁ㄥ彴璐﹀鍑�
* @param response
- * @param invoiceLedgerDto
+ * @param invoiceRegistrationProductDto
* @return
*/
@PostMapping("/export")
- public void invoiceLedgerExport(HttpServletResponse response, InvoiceLedgerDto invoiceLedgerDto) {
- invoiceLedgerService.invoiceLedgerExport(response, invoiceLedgerDto);
+ public void invoiceLedgerExport(HttpServletResponse response, InvoiceRegistrationProductDto invoiceRegistrationProductDto) {
+ invoiceLedgerService.invoiceLedgerExport(response, invoiceRegistrationProductDto);
}
/**
@@ -160,6 +173,7 @@
*/
@GetMapping("/registrationProductPage")
public AjaxResult registrationProductPage(Page page, InvoiceRegistrationProductDto registrationProductDto) {
+
return AjaxResult.success(invoiceLedgerService.registrationProductPage(page,registrationProductDto));
}
@@ -173,4 +187,19 @@
return AjaxResult.success(invoiceLedgerService.invoiceLedgerProductDetail(id));
}
+ /**
+ * 寮�绁ㄥ彴璐﹀垹闄�
+ * @param invoiceRegistrationProductId
+ * @return
+ */
+ @DeleteMapping("delInvoiceLedger/{invoiceRegistrationProductId}")
+ public AjaxResult delInvoiceLedger(@PathVariable Integer invoiceRegistrationProductId) {
+ try {
+ invoiceLedgerService.delInvoiceLedger(invoiceRegistrationProductId);
+ return AjaxResult.success();
+ }catch (Exception e) {
+ return AjaxResult.error(e.getMessage());
+ }
+ }
+
}
--
Gitblit v1.9.3