From ff61feb990cbe2a7be5b790566b3aff9f16005e5 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 28 三月 2026 09:33:14 +0800
Subject: [PATCH] feat: 销售台账导入新增字段

---
 src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java |   76 +++++++++++++++++--------------------
 1 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java
index 2c95909..11f2f387 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java
@@ -18,61 +18,55 @@
     @Excel(name = "閿�鍞崟鍙�")
     private String salesContractNo;
 
-
-    /**
-     * 浜у搧澶х被
-     */
     @Excel(name = "浜у搧澶х被")
     private String productCategory;
 
-    /**
-     * 瑙勬牸鍨嬪彿
-     */
     @Excel(name = "瑙勬牸鍨嬪彿")
     private String specificationModel;
+
+    @Excel(name = "瀹�(mm)")
+    private BigDecimal width;
+
+    @Excel(name = "楂�(mm)")
+    private BigDecimal height;
+
+    @Excel(name = "绋庣巼")
+    private BigDecimal taxRate;
+
+    @Excel(name = "鍚◣鍗曚环")
+    private BigDecimal taxInclusiveUnitPrice;
+
+    @Excel(name = "鏁伴噺")
+    private BigDecimal quantity;
+
+    @Excel(name = "鍚◣鎬讳环")
+    private BigDecimal taxInclusiveTotalPrice;
+
+    @Excel(name = "鍙戠エ绫诲瀷")
+    private String invoiceType;
+
+    @Excel(name = "妤煎眰缂栧彿")
+    private String floorNo;
+
+    @Excel(name = "鍔犲伐瑕佹眰")
+    private String processingRequirements;
+
+    @Excel(name = "澶囨敞")
+    private String remarks;
+
+    @Excel(name = "棰濆鍔犲伐")
+    private String extraProcessing;
 
     /**
      * 鍗曚綅
      */
-    @Excel(name = "鍗曚綅")
+//    @Excel(name = "鍗曚綅")
     private String unit;
-
-    /**
-     * 鏁伴噺
-     */
-    @Excel(name = "鏁伴噺")
-    private BigDecimal quantity;
-
-    /**
-     * 绋庣巼
-     */
-    @Excel(name = "绋庣巼")
-    private BigDecimal taxRate;
-
-    /**
-     * 鍚◣鍗曚环
-     */
-    @Excel(name = "鍚◣鍗曚环")
-    private BigDecimal taxInclusiveUnitPrice;
-
-    /**
-     * 鍚◣鎬讳环
-     */
-    @Excel(name = "鍚◣鎬讳环")
-    private BigDecimal taxInclusiveTotalPrice;
-
-    /**
-     * 鍙戠エ绫诲瀷
-     */
-    @Excel(name = "鍙戠エ绫诲瀷")
-    private String invoiceType;
 
     /**
      * 鏄惁璐ㄦ
      */
-    @Excel(name = "鏄惁璐ㄦ", readConverterExp = "0=鍚�,1=鏄�")
+//    @Excel(name = "鏄惁璐ㄦ", readConverterExp = "0=鍚�,1=鏄�")
     private Boolean isChecked;
-
-
 
 }

--
Gitblit v1.9.3