From e1797a873bf114329f4870062201d388155ef014 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 14 八月 2026 13:39:51 +0800
Subject: [PATCH] refactor(erp): 移除采购来票审核流程并简化业务逻辑
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java | 27 ++++-----------------------
1 files changed, 4 insertions(+), 23 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 8d00f34..28c882a 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
@@ -15,7 +15,6 @@
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderRespVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInvoiceDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
-import cn.iocoder.yudao.module.erp.enums.ErpPurchaseInvoiceAuditStatusEnum;
import cn.iocoder.yudao.module.erp.service.finance.ErpFinancePaymentService;
import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseInvoiceService;
import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseInvoiceServiceImpl;
@@ -169,24 +168,8 @@
});
}
- @PutMapping("/update-status")
- @Operation(summary = "鏇存柊鏉ョエ鐨勭姸鎬侊紙瀹℃牳/鍙嶅鏍革級")
- @PreAuthorize("@ss.hasPermission('erp:purchase-invoice:update-status')")
- public CommonResult<Boolean> updatePurchaseInvoiceStatus(@RequestParam("id") Long id,
- @RequestParam("status") Integer status) {
- invoiceService.updatePurchaseInvoiceStatus(id, status);
- return success(true);
- }
-
- @GetMapping("/audit-count")
- @Operation(summary = "鑾峰緱寰呭鏍告潵绁ㄦ暟閲�")
- @PreAuthorize("@ss.hasPermission('erp:purchase-invoice:query')")
- public CommonResult<Long> getAuditInvoiceCount() {
- return success(invoiceService.getAuditInvoiceCount());
- }
-
@GetMapping("/simple-list")
- @Operation(summary = "鑾峰緱鏉ョエ绮剧畝鍒楄〃", description = "鍙寘鍚鏍搁�氳繃涓斿凡涓婁紶鍙戠エ闄勪欢鐨勬潵绁紝涓昏鐢ㄤ簬浠樻鍒涘缓鏃堕�夋嫨鍏宠仈鏉ョエ")
+ @Operation(summary = "鑾峰緱鏉ョエ绮剧畝鍒楄〃", description = "鍙寘鍚凡涓婁紶鍙戠エ闄勪欢鐨勬潵绁紝涓昏鐢ㄤ簬浠樻鍒涘缓鏃堕�夋嫨鍏宠仈鏉ョエ")
@Parameter(name = "supplierId", description = "渚涘簲鍟嗙紪鍙�", required = true)
@Parameter(name = "purchaseOrderId", description = "閲囪喘璁㈠崟缂栧彿锛堝彲閫夛紝鐢ㄤ簬鎸夎鍗曡繃婊わ級")
@PreAuthorize("@ss.hasPermission('erp:purchase-invoice:query')")
@@ -195,11 +178,9 @@
@RequestParam(value = "purchaseOrderId", required = false) Long purchaseOrderId) {
List<ErpPurchaseInvoiceDO> invoices;
if (purchaseOrderId != null) {
- invoices = invoiceService.getPurchaseInvoiceListByOrderIdAndStatus(purchaseOrderId,
- List.of(ErpPurchaseInvoiceAuditStatusEnum.APPROVE.getStatus()));
+ invoices = invoiceService.getPurchaseInvoiceListByOrderId(purchaseOrderId);
} else {
- invoices = invoiceService.getPurchaseInvoiceListBySupplierIdAndStatus(supplierId,
- List.of(ErpPurchaseInvoiceAuditStatusEnum.APPROVE.getStatus()));
+ invoices = invoiceService.getPurchaseInvoiceListBySupplierId(supplierId);
}
if (CollUtil.isEmpty(invoices)) {
return success(Collections.emptyList());
@@ -225,7 +206,7 @@
.setId(invoice.getId()).setNo(invoice.getNo()).setInvoiceNo(invoice.getInvoiceNo())
.setInvoiceTitle(invoice.getInvoiceTitle()).setPrice(invoice.getPrice())
.setSupplierId(invoice.getSupplierId()).setPurchaseOrderId(invoice.getPurchaseOrderId())
- .setAuditStatus(invoice.getAuditStatus()).setHasAttachment(true)
+ .setHasAttachment(true)
.setRemainingInvoicePrice(remainingPrice));
}
return success(result);
--
Gitblit v1.9.3