From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java | 58 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 31 insertions(+), 27 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..e3bf53f 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,13 +9,15 @@
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.ErpPurchaseInvoiceImportExcelVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoiceImportReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoiceImportRespVO;
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;
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;
@@ -38,6 +40,7 @@
import java.io.IOException;
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -52,7 +55,7 @@
@Tag(name = "绠＄悊鍚庡彴 - ERP 閲囪喘鏉ョエ")
@RestController
-@RequestMapping("/erp/purchase-invoice")
+@RequestMapping({"/purchase/invoice", "/erp/purchase-invoice"})
@Validated
public class ErpPurchaseInvoiceController {
@@ -97,7 +100,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));
@@ -112,7 +114,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()));
@@ -129,6 +130,28 @@
// 瀵煎嚭 Excel
ExcelUtils.write(response, "鏉ョエ.xls", "鏁版嵁", ErpPurchaseInvoiceRespVO.class,
buildInvoiceDetailList(list));
+ }
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆鏉ョエ妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<ErpPurchaseInvoiceImportExcelVO> list = Arrays.asList(
+ ErpPurchaseInvoiceImportExcelVO.builder().purchaseOrderNo("")
+ .invoiceNo("").invoiceTitle("").price(null)
+ .invoiceTime(null).remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.writeTemplate(response, "鏉ョエ瀵煎叆妯℃澘.xls", "鏉ョエ鍒楄〃", ErpPurchaseInvoiceImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆鏉ョエ")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-invoice:import')")
+ public CommonResult<ErpPurchaseInvoiceImportRespVO> importExcel(@Valid ErpPurchaseInvoiceImportReqVO importReqVO)
+ throws Exception {
+ List<ErpPurchaseInvoiceImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), ErpPurchaseInvoiceImportExcelVO.class);
+ return success(invoiceService.importPurchaseInvoiceList(list, importReqVO));
}
private List<ErpPurchaseInvoiceRespVO> buildInvoiceDetailList(List<ErpPurchaseInvoiceDO> invoiceList) {
@@ -169,37 +192,18 @@
});
}
- @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')")
public CommonResult<List<ErpPurchaseInvoiceRespVO>> getInvoiceSimpleList(
@RequestParam("supplierId") Long supplierId,
@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 +229,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