From 8e4eee5ad4d74e1a4e6ab4de3a9c28000700dce0 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 十一月 2026 13:49:04 +0800
Subject: [PATCH] 修复采购退货页面 ERP 模块已禁用报错
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnRespVO.java | 142 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 142 insertions(+), 0 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnRespVO.java
new file mode 100644
index 0000000..68781f5
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnRespVO.java
@@ -0,0 +1,142 @@
+package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.returns;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "绠＄悊鍚庡彴 - ERP 閲囪喘閫�璐� Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ErpPurchaseReturnRespVO {
+
+ @Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "17386")
+ @ExcelProperty("缂栧彿")
+ private Long id;
+
+ @Schema(description = "閫�璐у崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "XS001")
+ @ExcelProperty("閫�璐у崟缂栧彿")
+ private String no;
+
+ @Schema(description = "閫�璐х姸鎬�", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+ @ExcelProperty("閫�璐х姸鎬�")
+ private Integer status;
+
+ @Schema(description = "渚涘簲鍟嗙紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724")
+ private Long supplierId;
+ @Schema(description = "渚涘簲鍟嗗悕绉�", example = "鑺嬮亾")
+ @ExcelProperty("渚涘簲鍟嗗悕绉�")
+ private String supplierName;
+
+ @Schema(description = "缁撶畻璐︽埛缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "311.89")
+ @ExcelProperty("缁撶畻璐︽埛缂栧彿")
+ private Long accountId;
+
+ @Schema(description = "閫�璐ф椂闂�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("閫�璐ф椂闂�")
+ private LocalDateTime returnTime;
+
+ @Schema(description = "閲囪喘璁㈠崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "17386")
+ private Long orderId;
+ @Schema(description = "閲囪喘璁㈠崟鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "XS001")
+ private String orderNo;
+
+ @Schema(description = "鍚堣鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "15663")
+ @ExcelProperty("鍚堣鏁伴噺")
+ private BigDecimal totalCount;
+ @Schema(description = "鏈�缁堝悎璁′环鏍�", requiredMode = Schema.RequiredMode.REQUIRED, example = "24906")
+ @ExcelProperty("鏈�缁堝悎璁′环鏍�")
+ private BigDecimal totalPrice;
+ @Schema(description = "宸查��娆鹃噾棰濓紝鍗曚綅锛氬厓", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
+ private BigDecimal refundPrice;
+
+ @Schema(description = "鍚堣浜у搧浠锋牸锛屽崟浣嶏細鍏�", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
+ private BigDecimal totalProductPrice;
+
+ @Schema(description = "鍚堣绋庨锛屽崟浣嶏細鍏�", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
+ private BigDecimal totalTaxPrice;
+
+ @Schema(description = "浼樻儬鐜囷紝鐧惧垎姣�", requiredMode = Schema.RequiredMode.REQUIRED, example = "99.88")
+ private BigDecimal discountPercent;
+
+ @Schema(description = "浼樻儬閲戦锛屽崟浣嶏細鍏�", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
+ private BigDecimal discountPrice;
+
+ @Schema(description = "瀹氶噾閲戦锛屽崟浣嶏細鍏�", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
+ private BigDecimal otherPrice;
+
+
+ @Schema(description = "澶囨敞", example = "浣犵寽")
+ @ExcelProperty("澶囨敞")
+ private String remark;
+
+ @Schema(description = "鍒涘缓浜�", example = "鑺嬮亾")
+ private String creator;
+ @Schema(description = "鍒涘缓浜哄悕绉�", example = "鑺嬮亾")
+ private String creatorName;
+
+ @Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+ @Schema(description = "閫�璐ч」鍒楄〃", requiredMode = Schema.RequiredMode.REQUIRED)
+ private List<Item> items;
+
+ @Schema(description = "浜у搧淇℃伅", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("浜у搧淇℃伅")
+ private String productNames;
+
+ @Data
+ public static class Item {
+
+ @Schema(description = "閫�璐ч」缂栧彿", example = "11756")
+ private Long id;
+
+ @Schema(description = "閲囪喘璁㈠崟椤圭紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "11756")
+ private Long orderItemId;
+
+ @Schema(description = "浠撳簱缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
+ private Long warehouseId;
+
+ @Schema(description = "浜у搧缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
+ private Long productId;
+
+ @Schema(description = "浜у搧鍗曚綅鍗曚綅", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
+ private Long productUnitId;
+
+ @Schema(description = "浜у搧鍗曚环", example = "100.00")
+ private BigDecimal productPrice;
+
+ @Schema(description = "浜у搧鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
+ @NotNull(message = "浜у搧鏁伴噺涓嶈兘涓虹┖")
+ private BigDecimal count;
+
+ @Schema(description = "绋庣巼锛岀櫨鍒嗘瘮", example = "99.88")
+ private BigDecimal taxPercent;
+
+ @Schema(description = "绋庨锛屽崟浣嶏細鍏�", example = "100.00")
+ private BigDecimal taxPrice;
+
+ @Schema(description = "澶囨敞", example = "闅忎究")
+ private String remark;
+
+ // ========== 鍏宠仈瀛楁 ==========
+
+ @Schema(description = "浜у搧鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "宸у厠鍔�")
+ private String productName;
+ @Schema(description = "浜у搧鏉＄爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "A9985")
+ private String productBarCode;
+ @Schema(description = "浜у搧鍗曚綅鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "鐩�")
+ private String productUnitName;
+
+ @Schema(description = "搴撳瓨鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
+ private BigDecimal stockCount; // 璇ュ瓧娈典粎浠呭湪鈥滆鎯呪�濆拰鈥滅紪杈戔�濇椂浣跨敤
+
+ }
+
+}
--
Gitblit v1.9.3