From 6fa82a1ad7c3ae061ef499f0d0806a16846e122b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 10 十一月 2026 16:55:02 +0800
Subject: [PATCH] feat(mes): 来料检验与不合格退货闭环优化
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 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 2074b87..43067c2 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
@@ -46,6 +46,30 @@
@ExcelProperty("閲囪喘鏃堕棿")
private LocalDateTime orderTime;
+ // ========== 閲囪喘鍙拌处 ==========
+
+ @Schema(description = "閲囪喘绫诲瀷锛�1鐢熶骇 2鍔炲叕鐢ㄥ搧 3鍏朵粬", example = "1")
+ @ExcelProperty(value = "閲囪喘绫诲瀷", converter = DictConvert.class)
+ @DictFormat(DictTypeConstants.PURCHASE_TYPE)
+ private Integer purchaseType;
+
+ @Schema(description = "鍚堝悓鍙凤紙瀹㈡埛鎵嬪伐杈撳叆锛屼笉鑷姩鐢熸垚锛�", example = "HT2026110001")
+ @ExcelProperty("鍚堝悓鍙�")
+ private String contractNo;
+
+ @Schema(description = "椤圭洰鍚嶇О锛堥潪蹇呭～锛�", example = "1鍙蜂骇绾挎敼閫�")
+ @ExcelProperty("椤圭洰鍚嶇О")
+ private String projectName;
+
+ @Schema(description = "浠樻鏃ユ湡")
+ @ExcelProperty("浠樻鏃ユ湡")
+ private LocalDateTime paymentDate;
+
+ @Schema(description = "浠樻鏂瑰紡锛�1鐢垫眹 2姹囩エ 3鐜伴噾 4鎵嬫満鏀粯", example = "1")
+ @ExcelProperty(value = "浠樻鏂瑰紡", converter = DictConvert.class)
+ @DictFormat(DictTypeConstants.PAYMENT_METHOD)
+ private Integer paymentMethod;
+
@Schema(description = "鍚堣鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "15663")
@ExcelProperty("鍚堣鏁伴噺")
private BigDecimal totalCount;
@@ -82,6 +106,9 @@
@Schema(description = "鏉ユ簮鍗曟嵁缂栧彿", example = "48")
private Long sourceId;
+ @Schema(description = "鏉ユ簮閲囪喘鐢宠缂栧彿", example = "12")
+ private Long purchaseRequestId;
+
@Schema(description = "鏉ユ簮绫诲瀷鍚嶇О", example = "鐢熶骇宸ュ崟")
private String sourceTypeName;
@@ -108,6 +135,10 @@
@ExcelProperty("浜у搧淇℃伅")
private String productNames;
+ @Schema(description = "浜у搧缂栧彿淇℃伅", example = "MDM001锛孧DM002")
+ @ExcelProperty("浜у搧缂栧彿")
+ private String productCodes;
+
// ========== 閲囪喘鍏ュ簱 ==========
@Schema(description = "閲囪喘鍏ュ簱鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
@@ -115,6 +146,20 @@
@Schema(description = "鍏ュ簱鐘舵�侊紙0:鏈叆搴� 1:閮ㄥ垎鍏ュ簱 2:鍏ㄩ儴鍏ュ簱锛�", example = "0")
private Integer inStatus;
+
+ // ========== 纭鏀惰揣锛堝埌璐ч�氱煡锛� ==========
+
+ @Schema(description = "鍒拌揣閫氱煡鍗曠紪鍙凤紝宸茬‘璁ゆ敹璐ф椂杩斿洖", example = "15")
+ private Long arrivalNoticeId;
+
+ @Schema(description = "鍒拌揣閫氱煡鍗曞彿", example = "AN1794282646472")
+ private String arrivalNoticeCode;
+
+ @Schema(description = "鍒拌揣閫氱煡鍗曠姸鎬侊紙0:鑽夌 2:寰呰川妫� 3:寰呭叆搴� 4:宸插畬鎴愶級", example = "3")
+ private Integer arrivalNoticeStatus;
+
+ @Schema(description = "鍒拌揣閫氱煡鍗曠姸鎬佸悕绉�", example = "寰呭叆搴�")
+ private String arrivalNoticeStatusName;
// ========== 閲囪喘閫�璐э紙鍑哄簱锛夛級 ==========
@@ -129,6 +174,9 @@
@Schema(description = "浜у搧缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
private Long productId;
+
+ @Schema(description = "浜у搧缂栧彿锛圡DM 鐗╂枡缂栫爜锛�", example = "MDM001")
+ private String productCode;
@Schema(description = "浜у搧鍗曚綅鍗曚綅", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
private Long productUnitId;
@@ -146,6 +194,12 @@
@Schema(description = "绋庨锛屽崟浣嶏細鍏�", example = "100.00")
private BigDecimal taxPrice;
+ @Schema(description = "鍚堣浜у搧閲戦锛屽崟浣嶏細鍏�", example = "100.00")
+ private BigDecimal totalProductPrice;
+
+ @Schema(description = "浠风◣鍚堣锛屽崟浣嶏細鍏�", example = "100.00")
+ private BigDecimal totalPrice;
+
@Schema(description = "澶囨敞", example = "闅忎究")
private String remark;
--
Gitblit v1.9.3