导入修改

ruoyi-inventory/src/main/java/com/ruoyi/inventory/domain/vo/OutboundTemplateVO.java

@@ -28,21 +28,18 @@ public class OutboundTemplateVO extends BaseEntity {
     @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd",headerColor = IndexedColors.BLACK,headerBackgroundColor = IndexedColors.WHITE)
     private Date inboundDate;
 
-    /** 订单类型 */
-    @Excel(name = "订单类型",headerColor = IndexedColors.BLACK,headerBackgroundColor = IndexedColors.YELLOW)
-    private String orderTypeId;
-
     /** SAP号 */
     @Excel(name = "SAP No",headerColor = IndexedColors.BLACK,headerBackgroundColor = IndexedColors.YELLOW)
     private String sapNo;
 
-    /** 物料ID */
-    private String materialId;
-
     /** 货物名称 */
     @Excel(name = "物料名称",headerColor = IndexedColors.BLACK,headerBackgroundColor = IndexedColors.WHITE)
     private String materialName;
 
+    /** 物料ID */
+    private String materialId;
+
+
     /** TS Code */
     @Excel(name = "TS Code",headerColor = IndexedColors.BLACK,headerBackgroundColor = IndexedColors.WHITE)
     private String tsCode;
@@ -55,16 +52,19 @@ public class OutboundTemplateVO extends BaseEntity {
     @Excel(name = "计划数量",headerColor = IndexedColors.BLACK,headerBackgroundColor = IndexedColors.WHITE)
     private Long plannedQuantity;
 
-    @Excel(name = "约数",headerColor = IndexedColors.BLACK,headerBackgroundColor = IndexedColors.WHITE)
-    private Double divisor;
     /** 件重 */
     @Excel(name = "件重",headerColor = IndexedColors.BLACK,headerBackgroundColor = IndexedColors.WHITE)
     private Double pieceWeight;
 
+    /** 约数 */
+    @Excel(name = "约数",headerColor = IndexedColors.BLACK,headerBackgroundColor = IndexedColors.WHITE)
+    private Double divisor;
+
     /** 件数（实际件数） */
     @Excel(name = "件数",headerColor = IndexedColors.BLACK,headerBackgroundColor = IndexedColors.WHITE)
     private Long actualPackages;
 
+
     /** 实发数量（实际数量） */
     @Excel(name = "实发数量",headerColor = IndexedColors.BLACK,headerBackgroundColor = IndexedColors.YELLOW)
     private Long actualQuantity;
@@ -112,6 +112,9 @@ public class OutboundTemplateVO extends BaseEntity {
     private String systemNo;
 
 
+    /** 订单类型 */
+    @Excel(name = "订单类型",headerColor = IndexedColors.BLACK,headerBackgroundColor = IndexedColors.YELLOW)
+    private String orderTypeId;
     /** 货主ID */
     private String ownerId;