From 3688f07fd292812994dbf3c84bde18a440d8275c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 04 十一月 2026 16:52:29 +0800
Subject: [PATCH] feat(erp): 采购来票支持关联多张采购订单并按订单分摊金额
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceRespVO.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceRespVO.java
index 3d84083..f92866d 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceRespVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceRespVO.java
@@ -1,9 +1,6 @@
package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice;
-import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderRespVO;
-import cn.iocoder.yudao.module.erp.enums.DictTypeConstants;
import cn.iocoder.yudao.module.system.api.storage.dto.StorageBlobRespDTO;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
@@ -33,11 +30,19 @@
@ExcelProperty("渚涘簲鍟嗗悕绉�")
private String supplierName;
- @Schema(description = "閲囪喘璁㈠崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "17386")
+ @Schema(description = "閲囪喘璁㈠崟缂栧彿锛堜富璁㈠崟锛屽嵆鍒嗘憡鏄庣粏绗竴寮狅級", example = "17386")
@ExcelProperty("閲囪喘璁㈠崟缂栧彿")
private Long purchaseOrderId;
@Schema(description = "閲囪喘璁㈠崟淇℃伅")
private ErpPurchaseOrderRespVO order;
+
+ @Schema(description = "鍏宠仈閲囪喘璁㈠崟鍙凤紙澶氬紶鏃朵互 銆� 鎷兼帴锛�", example = "CGDD20260101001銆丆GDD20260101002")
+ @ExcelProperty("閲囪喘璁㈠崟鍙�")
+ private String orderNos;
+ @Schema(description = "鍏宠仈閲囪喘璁㈠崟鏁伴噺", example = "2")
+ private Integer orderCount;
+ @Schema(description = "閲囪喘璁㈠崟鍒嗘憡鏄庣粏")
+ private List<ErpPurchaseInvoiceOrderRespVO> orderAllocations;
@Schema(description = "鍙戠エ鍙风爜", example = "02564178")
@ExcelProperty("鍙戠エ鍙风爜")
@@ -54,15 +59,6 @@
@Schema(description = "鏉ョエ鏃ユ湡", requiredMode = Schema.RequiredMode.REQUIRED, example = "2024-02-02")
@ExcelProperty("鏉ョエ鏃ユ湡")
private LocalDateTime invoiceTime;
-
- @Schema(description = "瀹℃壒鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
- @ExcelProperty(value = "瀹℃壒鐘舵��", converter = DictConvert.class)
- @DictFormat(DictTypeConstants.AUDIT_STATUS)
- private Integer auditStatus;
-
- @Schema(description = "宸ヤ綔娴佺紪鍙�", example = "1043")
- @ExcelProperty("宸ヤ綔娴佺紪鍙�")
- private String processInstanceId;
@Schema(description = "澶囨敞", example = "澶囨敞")
@ExcelProperty("澶囨敞")
--
Gitblit v1.9.3