From 3beb75264c3daab38f71c83f57355aeff917ed99 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 12 五月 2025 10:53:45 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/product-inventory-management-after
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 54 ++++++++++++++++++++++--------------------------------
1 files changed, 22 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 1f871d6..1c934a1 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -4,15 +4,13 @@
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.service.ISalesLedgerService;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -39,11 +37,19 @@
* 鏌ヨ閿�鍞彴璐﹀垪琛�
*/
@GetMapping("/list")
- public TableDataInfo list(SalesLedger salesLedger)
+ public TableDataInfo list(SalesLedgerDto salesLedgerDto)
{
startPage();
- List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedger);
+ List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
return getDataTable(list);
+ }
+
+ /**
+ * 鏌ヨ閿�鍞彴璐﹀拰浜у搧鐖跺瓙鍒楄〃
+ */
+ @GetMapping("/getSalesLedgerWithProducts")
+ public SalesLedgerDto getSalesLedgerWithProducts(SalesLedgerDto salesLedgerDto){
+ return salesLedgerService.getSalesLedgerWithProducts(salesLedgerDto);
}
/**
@@ -51,49 +57,33 @@
*/
@Log(title = "閿�鍞彴璐�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, SalesLedger salesLedger)
+ public void export(HttpServletResponse response, SalesLedgerDto salesLedgerDto)
{
- List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedger);
+ List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
ExcelUtil<SalesLedger> util = new ExcelUtil<SalesLedger>(SalesLedger.class);
util.exportExcel(response, list, "閿�鍞彴璐︽暟鎹�");
}
/**
- * 鑾峰彇閿�鍞彴璐﹁缁嗕俊鎭�
- */
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return success(salesLedgerService.selectSalesLedgerById(id));
- }
-
- /**
- * 鏂板閿�鍞彴璐�
+ * 鏂板淇敼閿�鍞彴璐�
*/
@Log(title = "閿�鍞彴璐�", businessType = BusinessType.INSERT)
- @PostMapping ("/insertSalesLedger")
- public AjaxResult add(@RequestBody SalesLedger salesLedger)
+ @PostMapping ("/addOrUpdateSalesLedger")
+ public AjaxResult add(@RequestBody SalesLedgerDto salesLedgerDto)
{
- return toAjax(salesLedgerService.insertSalesLedger(salesLedger));
- }
-
- /**
- * 淇敼閿�鍞彴璐�
- */
- @Log(title = "閿�鍞彴璐�", businessType = BusinessType.UPDATE)
- @PostMapping ("/updateSalesLedger")
- public AjaxResult edit(@RequestBody SalesLedger salesLedger)
- {
- return toAjax(salesLedgerService.updateSalesLedger(salesLedger));
+ return toAjax(salesLedgerService.addOrUpdateSalesLedger(salesLedgerDto));
}
/**
* 鍒犻櫎閿�鍞彴璐�
*/
@Log(title = "閿�鍞彴璐�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
+ @DeleteMapping("/delLedger")
+ public AjaxResult remove(@RequestBody Long[] ids)
{
+ if (ids == null || ids.length == 0) {
+ return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ }
return toAjax(salesLedgerService.deleteSalesLedgerByIds(ids));
}
}
--
Gitblit v1.9.3