From d39e4f7d839167c16425086dfa2f8747bccfdff9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 17:39:01 +0800
Subject: [PATCH] feat: 打通销售采购财务闭环并完成累计业务优化
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java
index 28c882a..6116e0c 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java
@@ -9,6 +9,7 @@
import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoiceItemReceiptRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoicePageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoiceRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoiceSaveReqVO;
@@ -96,7 +97,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鏉ョエ")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('erp:purchase-invoice:query')")
public CommonResult<ErpPurchaseInvoiceRespVO> getPurchaseInvoice(@RequestParam("id") Long id) {
ErpPurchaseInvoiceDO invoice = invoiceService.getPurchaseInvoice(id);
return success(buildInvoiceDetail(invoice));
@@ -111,7 +111,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鏉ョエ鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('erp:purchase-invoice:query')")
public CommonResult<PageResult<ErpPurchaseInvoiceRespVO>> getPurchaseInvoicePage(@Valid ErpPurchaseInvoicePageReqVO pageReqVO) {
PageResult<ErpPurchaseInvoiceDO> pageResult = invoiceService.getPurchaseInvoicePage(pageReqVO);
return success(new PageResult<>(buildInvoiceDetailList(pageResult.getList()), pageResult.getTotal()));
@@ -168,11 +167,20 @@
});
}
+ @GetMapping("/item-receipt-list")
+ @Operation(summary = "鑾峰緱鏉ョエ鍙�夊叆搴撳崟鍒楄〃", description = "鎸夐噰璐鍗曡繃婊� MES 鍏ュ簱鍗曪紝浠呰繑鍥炴湭鍙栨秷鐨勫叆搴撳崟锛屽苟甯﹀嚭鍙潵绁ㄩ噾棰�")
+ @Parameter(name = "purchaseOrderId", description = "閲囪喘璁㈠崟缂栧彿", required = true)
+ @Parameter(name = "id", description = "鏉ョエ缂栧彿锛堢紪杈戞椂浼犲叆锛岀敤浜庢帓闄よ嚜韬凡鍗犵敤閲戦锛�")
+ public CommonResult<List<ErpPurchaseInvoiceItemReceiptRespVO>> getItemReceiptList(
+ @RequestParam("purchaseOrderId") Long purchaseOrderId,
+ @RequestParam(value = "id", required = false) Long id) {
+ return success(invoiceService.getItemReceiptListForInvoice(purchaseOrderId, id));
+ }
+
@GetMapping("/simple-list")
@Operation(summary = "鑾峰緱鏉ョエ绮剧畝鍒楄〃", description = "鍙寘鍚凡涓婁紶鍙戠エ闄勪欢鐨勬潵绁紝涓昏鐢ㄤ簬浠樻鍒涘缓鏃堕�夋嫨鍏宠仈鏉ョエ")
@Parameter(name = "supplierId", description = "渚涘簲鍟嗙紪鍙�", required = true)
@Parameter(name = "purchaseOrderId", description = "閲囪喘璁㈠崟缂栧彿锛堝彲閫夛紝鐢ㄤ簬鎸夎鍗曡繃婊わ級")
- @PreAuthorize("@ss.hasPermission('erp:purchase-invoice:query')")
public CommonResult<List<ErpPurchaseInvoiceRespVO>> getInvoiceSimpleList(
@RequestParam("supplierId") Long supplierId,
@RequestParam(value = "purchaseOrderId", required = false) Long purchaseOrderId) {
--
Gitblit v1.9.3