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/order/ErpPurchaseOrderRespVO.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java
index e2b3242..65531ae 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java
@@ -34,7 +34,7 @@
@Schema(description = "渚涘簲鍟嗙紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724")
private Long supplierId;
- @Schema(description = "渚涘簲鍟嗗悕绉�", example = "鑺嬮亾")
+ @Schema(description = "渚涘簲鍟嗗悕绉�", example = "瓒呯骇绠＄悊鍛�")
@ExcelProperty("渚涘簲鍟嗗悕绉�")
private String supplierName;
@@ -59,6 +59,9 @@
@Schema(description = "鍚堣绋庨锛屽崟浣嶏細鍏�", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
private BigDecimal totalTaxPrice;
+ @Schema(description = "鍓╀綑鍙紑绁ㄩ噾棰濓紙璁㈠崟鎬婚噾棰� - 宸叉潵绁ㄩ噾棰濓級锛屽崟浣嶏細鍏�", example = "100.00")
+ private BigDecimal remainInvoicePrice;
+
@Schema(description = "浼樻儬鐜囷紝鐧惧垎姣�", requiredMode = Schema.RequiredMode.REQUIRED, example = "99.88")
private BigDecimal discountPercent;
@@ -82,6 +85,28 @@
@Schema(description = "鏉ユ簮绫诲瀷鍚嶇О", example = "鐢熶骇宸ュ崟")
private String sourceTypeName;
+ @Schema(description = "鍏宠仈渚涘簲鍟嗗悎鍚岀紪鍙�", example = "1024")
+ private Long contractId;
+
+ @Schema(description = "鍏宠仈鍚堝悓缂栫爜", example = "HT20261030001")
+ @ExcelProperty("鍏宠仈鍚堝悓")
+ private String contractNo;
+
+ @Schema(description = "浠樻鏂瑰紡", example = "MONTHLY")
+ @ExcelProperty("浠樻鏂瑰紡")
+ private String paymentMethod;
+
+ @Schema(description = "鐗╂祦鍗曞彿", example = "SF1234567890")
+ @ExcelProperty("鐗╂祦鍗曞彿")
+ private String logisticsNo;
+
+ @Schema(description = "鏄惁寮傚父鏍囪", example = "false")
+ private Boolean abnormalFlag;
+
+ @Schema(description = "寮傚父璇存槑", example = "渚涘簲鍟嗗欢鏈熶氦璐�")
+ @ExcelProperty("寮傚父璇存槑")
+ private String abnormalReason;
+
@Schema(description = "澶囨敞", example = "浣犵寽")
@ExcelProperty("澶囨敞")
private String remark;
@@ -89,9 +114,9 @@
@Schema(description = "闄勪欢鍒楄〃")
private List<StorageBlobRespDTO> attachmentList;
- @Schema(description = "鍒涘缓浜�", example = "鑺嬮亾")
+ @Schema(description = "鍒涘缓浜�", example = "瓒呯骇绠＄悊鍛�")
private String creator;
- @Schema(description = "鍒涘缓浜哄悕绉�", example = "鑺嬮亾")
+ @Schema(description = "鍒涘缓浜哄悕绉�", example = "瓒呯骇绠＄悊鍛�")
private String creatorName;
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
--
Gitblit v1.9.3