zxf недель назад: 2
Родитель
Сommit
fdfd9f2804

+ 8 - 8
jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/domain/dto/SfOrderImportDTO.java

@@ -50,14 +50,14 @@ public class SfOrderImportDTO implements Serializable {
     @ExcelProperty(value = "物品名称", order = 6)
     @ColumnWidth(15)
     private String goodsName;
-    @ExcelProperty(value = "物品重量", order = 7)
-    @ColumnWidth(15)
+    @ExcelProperty(value = "物品重量(KG)", order = 7)
+    @ColumnWidth(20)
     private BigDecimal goodsWeight;
-    @ExcelProperty(value = "物品体积", order = 8)
-    @ColumnWidth(15)
+    @ExcelProperty(value = "物品体积(m³)", order = 8)
+    @ColumnWidth(20)
     private BigDecimal goodsVolume;
-    @ExcelProperty(value = "物品数量", order = 9)
-    @ColumnWidth(15)
+    @ExcelProperty(value = "物品数量(件)", order = 9)
+    @ColumnWidth(20)
     private Long goodsQty;
     /** 上门取件开始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -65,8 +65,8 @@ public class SfOrderImportDTO implements Serializable {
     @ExcelProperty(value = "产品类型", order = 10)
     @ColumnWidth(15)
     private String productCode;
-    @ExcelProperty(value = "保价金额", order = 11)
-    @ColumnWidth(15)
+    @ExcelProperty(value = "保价金额(元)", order = 11)
+    @ColumnWidth(20)
     private String protecPrice;
 
 }

+ 4 - 7
jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/handler/SFOrderDynamicTemplateHandler.java

@@ -69,18 +69,15 @@ public class SFOrderDynamicTemplateHandler {
                 if (productCodes != null && !productCodes.isEmpty()) {
                     addDropdownValidation(workbook, sheet, productCodes, 10, "ProductCodes");
                 }
-
-
-
                 // 5. 添加数值列的数据验证(不能为负数)
                 // 物品重量(第 H 列,索引 7)
-                addNumberValidation(workbook, sheet, 7, "物品重量");
+                addNumberValidation(workbook, sheet, 7, "物品重量(KG)");
                 // 物品体积(第 I 列,索引 8)
-                addNumberValidation(workbook, sheet, 8, "物品体积");
+                addNumberValidation(workbook, sheet, 8, "物品体积(m³)");
                 // 物品数量(第 J 列,索引 9)
-                addNumberValidation(workbook, sheet, 9, "物品数量");
+                addNumberValidation(workbook, sheet, 9, "物品数量(件)");
                 // 保价金额(第 O 列,索引 14)
-                addNumberValidation(workbook, sheet, 11, "保价金额");
+                addNumberValidation(workbook, sheet, 11, "保价金额(元)");
 
            /*     // 6. 添加时间列的数据验证(格式:yyyy-MM-dd HH:00:00)
                 // 上门取件开始时间(第 K 列,索引 10)