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/ErpPurchaseOrderImportExcelVO.java |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportExcelVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportExcelVO.java
index 638a35f..3ba8c9f 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportExcelVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportExcelVO.java
@@ -36,6 +36,26 @@
     @Schema(description = "閲囪喘鏃堕棿锛屾牸寮忓 2026-01-01 10:00:00锛涚暀绌哄彇褰撳墠鏃堕棿")
     private String orderTime;
 
+    @ExcelProperty("閲囪喘绫诲瀷")
+    @Schema(description = "閲囪喘绫诲瀷锛氱敓浜� / 鍔炲叕鐢ㄥ搧 / 鍏朵粬锛涚暀绌轰笉濉�")
+    private String purchaseType;
+
+    @ExcelProperty("鍚堝悓鍙�")
+    @Schema(description = "鍚堝悓鍙凤紙鎵嬪伐濉啓锛岀郴缁熶笉鑷姩鐢熸垚锛�")
+    private String contractNo;
+
+    @ExcelProperty("椤圭洰鍚嶇О")
+    @Schema(description = "椤圭洰鍚嶇О锛岄潪蹇呭~")
+    private String projectName;
+
+    @ExcelProperty("浠樻鏃ユ湡")
+    @Schema(description = "浠樻鏃ユ湡锛屾牸寮忓 2026-01-01 10:00:00锛涘鍏ュ厑璁哥暀绌猴紝鍚庣画缂栬緫鏃惰ˉ濉�")
+    private String paymentDate;
+
+    @ExcelProperty("浠樻鏂瑰紡")
+    @Schema(description = "浠樻鏂瑰紡锛氱數姹� / 姹囩エ / 鐜伴噾 / 鎵嬫満鏀粯锛涚暀绌轰笉濉�")
+    private String paymentMethod;
+
     @ExcelProperty("浜у搧缂栫爜")
     @Schema(description = "浜у搧锛堢墿鏂欙級缂栫爜", requiredMode = Schema.RequiredMode.REQUIRED)
     private String productCode;
@@ -55,10 +75,6 @@
     @ExcelProperty("绋庣巼(%)")
     @Schema(description = "绋庣巼锛岀櫨鍒嗘瘮锛屼緥濡� 13 琛ㄧず 13%")
     private BigDecimal taxPercent;
-
-    @ExcelProperty("鏄惁鏉ユ枡妫�楠�")
-    @Schema(description = "鏄惁闇�瑕佹潵鏂欐楠岋細濉�滄槸鈥濅负闇�瑕侊紝鍏跺畠涓轰笉闇�瑕�")
-    private String qcCheckFlag;
 
     @ExcelProperty("澶囨敞")
     @Schema(description = "澶囨敞")

--
Gitblit v1.9.3