From 08c0e7417807e0e172640835d21f873157b03650 Mon Sep 17 00:00:00 2001 From: liding <756868258@qq.com> Date: 星期二, 13 五月 2025 16:48:51 +0800 Subject: [PATCH] 采购台账联调优化 --- src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java | 34 ++++++++++++++++++++++++++++------ 1 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java index 7f0fb01..3b902c2 100644 --- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java +++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java @@ -3,8 +3,10 @@ import javax.servlet.http.HttpServletResponse; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.purchase.dto.PurchaseLedgerDto; import com.ruoyi.purchase.pojo.PurchaseLedger; import com.ruoyi.purchase.service.IPurchaseLedgerService; +import com.ruoyi.sales.service.ISalesLedgerService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -18,19 +20,23 @@ import com.ruoyi.framework.web.domain.AjaxResult; import com.ruoyi.framework.web.page.TableDataInfo; +import java.io.IOException; import java.util.List; +import java.util.Map; /** * 閲囪喘鍙拌处Controller - * + * * @author ruoyi * @date 2025-05-09 */ @RestController -@RequestMapping("/system/ledger") +@RequestMapping("/purchase/ledger") @AllArgsConstructor public class PurchaseLedgerController extends BaseController { private IPurchaseLedgerService purchaseLedgerService; + + private ISalesLedgerService salesLedgerService; /** * 鏌ヨ閲囪喘鍙拌处鍒楄〃 @@ -57,17 +63,33 @@ * 鏂板淇敼閲囪喘鍙拌处 */ @Log(title = "閲囪喘鍙拌处", businessType = BusinessType.INSERT) - @PostMapping ("/addOrEditPurchase") - public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedger purchaseLedger) { - return toAjax(purchaseLedgerService.addOrEditPurchase(purchaseLedger)); + @PostMapping("/addOrEditPurchase") + public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedgerDto purchaseLedgerDto) throws IOException { + return toAjax(purchaseLedgerService.addOrEditPurchase(purchaseLedgerDto)); + } + + /** + * 鏌ヨ閿�鍞彴璐﹀拰浜у搧鐖跺瓙鍒楄〃 + */ + @GetMapping("/getPurchaseById") + public PurchaseLedgerDto getPurchaseById(PurchaseLedgerDto purchaseLedgerDto) { + return purchaseLedgerService.getPurchaseById(purchaseLedgerDto); } /** * 鍒犻櫎閲囪喘鍙拌处 */ @Log(title = "閲囪喘鍙拌处", businessType = BusinessType.DELETE) - @DeleteMapping("/delPurchase") + @DeleteMapping("/delPurchase") public AjaxResult remove(@RequestBody Long[] ids) { return toAjax(purchaseLedgerService.deletePurchaseLedgerByIds(ids)); } + + /** + * 鏌ヨ閿�鍞悎鍚屽彿 + */ + @GetMapping("/getSalesNo") + public List getSalesNo() { + return salesLedgerService.getSalesNo(); + } } -- Gitblit v1.9.3