优化

platform-dao/src/main/java/com/platform/dao/vo/export/store/ExportInStoreDetailVO.java

@@ -18,169 +18,258 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 public class ExportInStoreDetailVO implements Serializable {
 
-    /**
-   * 主键
-   */
-  @Excel(name = "主键", orderNum = "1")
-  private String id;
-
-//    /**
-//   * 入库单id
-//   */
-//  @Excel(name = "入库单id", orderNum = "2")
-//  private String inId;
-//
-//    /**
-//   * 入库单号
-//   */
-//  @Excel(name = "入库单号", orderNum = "3")
-//  private String inNo;
-//
-//    /**
-//   * 入库仓库id
-//   */
-//  @Excel(name = "入库仓库id", orderNum = "4")
-//  private String storeId;
-//
-//    /**
-//   * 备件id
-//   */
-  @Excel(name = "备件id", orderNum = "5")
-  private String spareId;
-
-    /**
-   * 入库数量
-   */
-  @Excel(name = "入库数量", orderNum = "6")
-  private BigDecimal totalNum;
-
-//    /**
-//   * 入库单价
-//   */
-//  @Excel(name = "入库单价", orderNum = "7")
-//  private Double price;
-
-//    /**
-//   * 入库总价
-//   */
-//  @Excel(name = "入库总价", orderNum = "8")
-//  private Double totalPrice;
-
-    /**
-   * 创建人
-   */
-  @Excel(name = "创建人", orderNum = "9")
-  private String createdUserId;
-
-    /**
-   * 更新人
-   */
-  @Excel(name = "更新人", orderNum = "10")
-  private String updateUserId;
-
-    /**
-   * 创建日期
-   */
-  @Excel(name = "创建日期", orderNum = "11")
-  private LocalDateTime createdTime;
-
-    /**
-   * 更新日期
-   */
-  @Excel(name = "更新日期", orderNum = "12")
-  private LocalDateTime updateTime;
-
-
-
-  /**
-   * 大类编码名称
-   */
-  @Excel(name = "备件类别", orderNum = "13")
-  private String typeName;
-
   /**
    * 备件编码
    */
-  @Excel(name = "备件编码", orderNum = "14")
+  @Excel(name = "备件编码", orderNum = "1")
   private String no;
 
+  @Excel(name = "品牌", orderNum = "2")
+  private String brand;
+
   /**
    * 名称
    */
-  @Excel(name = "备件名称", orderNum = "15")
+  @Excel(name = "备件名称", orderNum = "3")
   private String name;
 
   /**
    * 规格型号：使用的sb_guige
    */
-  @Excel(name = "规格型号", orderNum = "16")
+  @Excel(name = "规格型号", orderNum = "4")
   private String ggxh;
 
-  @Excel(name = "品牌", orderNum = "17")
-  private String brand;
+  /**
+   * 计量单位: 1-件;2-台;3-条; 4-个
+   */
+  @Excel(name = "计量单位", orderNum = "5")
+  private String unit;
 
   /**
-   * 单价
+   * 入库数量
    */
-  @Excel(name = "备件价值", orderNum = "18")
-  private Double initialValue;
+  @Excel(name = "入库数量", orderNum = "6")
+  private BigDecimal totalNum;
 
   /**
-   * 计量单位: 1-件;2-台;3-条; 4-个
+   * 创建人
    */
-  @Excel(name = "计量单位", orderNum = "19")
-  private String unit;
+  @Excel(name = "创建人", orderNum = "7")
+  private String createdUserName;
+
+  /**
+   * 创建日期
+   */
+  @Excel(name = "创建日期", orderNum = "8")
+  private LocalDateTime createdTime;
 
   /**
    * 当前库存
    */
-  @Excel(name = "当前库存", orderNum = "20")
+  @Excel(name = "当前库存", orderNum = "9")
   private BigDecimal currentStock;
 
   /**
    * 最高库存
    */
-  @Excel(name = "最高库存", orderNum = "21")
+  @Excel(name = "最高库存", orderNum = "10")
   private BigDecimal maxStock;
 
   /**
    * 最低库存
    */
-  @Excel(name = "最低库存", orderNum = "22")
+  @Excel(name = "最低库存", orderNum = "11")
   private BigDecimal minStock;
 
-
-//    /**
-//     * 寿命周期:月
-//     */
-//    @Excel(name = "寿命周期(月)", orderNum = "11")
-//    private BigDecimal agePeriod;
-
   /**
    * 备件等级:1-一级; 2-二级;3-三级
    */
-  @Excel(name = "备件等级", orderNum = "23", dicCode = "SPARE_PART_INFO_LEVEL")
+  @Excel(name = "备件等级", orderNum = "12", dicCode = "SPARE_PART_INFO_LEVEL")
   private Integer level;
+
+  /**
+   * 大类编码名称
+   */
+  @Excel(name = "备件类别", orderNum = "13")
+  private String typeName;
+
   /**
-   * 使用周期:月
+   * 单价
    */
-//    @Excel(name = "使用周期(月)", orderNum = "10")
-//    private BigDecimal usePeriod;
+  @Excel(name = "备件价值", orderNum = "14")
+  private Double initialValue;
 
-//    /**
-//     * 采购到货周期:天
-//     */
-//    @Excel(name = "采购到货周期(天)", orderNum = "12")
-//    private BigDecimal purchasePeriod;
   /**
    * 生产商
    */
-  @Excel(name = "生产商", orderNum = "24")
+  @Excel(name = "生产商", orderNum = "15")
   private String producerName;
 
-  @Excel(name = "用途", orderNum = "25",dicCode = "SPARE_USE_TYPE")
+  /**
+   * 主键
+   */
+  @Excel(name = "主键", orderNum = "16")
+  private String id;
+
+  @Excel(name = "备件id", orderNum = "17")
+  private String spareId;
+
+  @Excel(name = "用途", orderNum = "18",dicCode = "SPARE_USE_TYPE")
   private String yt;
 
+  //    /**
+//   * 入库单id
+//   */
+//  @Excel(name = "入库单id", orderNum = "2")
+//  private String inId;
+//
+//    /**
+//   * 入库单号
+//   */
+//  @Excel(name = "入库单号", orderNum = "3")
+//  private String inNo;
+//
+//    /**
+//   * 入库仓库id
+//   */
+//  @Excel(name = "入库仓库id", orderNum = "4")
+//  private String storeId;
+//
+//    /**
+//   * 备件id
+//   */
+//  @Excel(name = "备件id", orderNum = "5")
+//  private String spareId;
+//
+//    /**
+//   * 入库数量
+//   */
+//  @Excel(name = "入库数量", orderNum = "6")
+//  private BigDecimal totalNum;
+//
+////    /**
+////   * 入库单价
+////   */
+////  @Excel(name = "入库单价", orderNum = "7")
+////  private Double price;
+//
+////    /**
+////   * 入库总价
+////   */
+////  @Excel(name = "入库总价", orderNum = "8")
+////  private Double totalPrice;
+//
+//    /**
+//   * 创建人
+//   */
+//  @Excel(name = "创建人", orderNum = "9")
+//  private String createdUserId;
+//
+//    /**
+//   * 更新人
+//   */
+//  @Excel(name = "更新人", orderNum = "10")
+//  private String updateUserId;
+//
+//    /**
+//   * 创建日期
+//   */
+//  @Excel(name = "创建日期", orderNum = "11")
+//  private LocalDateTime createdTime;
+//
+//    /**
+//   * 更新日期
+//   */
+//  @Excel(name = "更新日期", orderNum = "12")
+//  private LocalDateTime updateTime;
+//
+//
+//
+//  /**
+//   * 大类编码名称
+//   */
+//  @Excel(name = "备件类别", orderNum = "13")
+//  private String typeName;
+//
+//
+//
+//  /**
+//   * 名称
+//   */
+//  @Excel(name = "备件名称", orderNum = "15")
+//  private String name;
+//
+//  /**
+//   * 规格型号：使用的sb_guige
+//   */
+//  @Excel(name = "规格型号", orderNum = "16")
+//  private String ggxh;
+//
+//  @Excel(name = "品牌", orderNum = "17")
+//  private String brand;
+//
+//  /**
+//   * 单价
+//   */
+//  @Excel(name = "备件价值", orderNum = "18")
+//  private Double initialValue;
+//
+//  /**
+//   * 计量单位: 1-件;2-台;3-条; 4-个
+//   */
+//  @Excel(name = "计量单位", orderNum = "19")
+//  private String unit;
+//
+//  /**
+//   * 当前库存
+//   */
+//  @Excel(name = "当前库存", orderNum = "20")
+//  private BigDecimal currentStock;
+//
+//  /**
+//   * 最高库存
+//   */
+//  @Excel(name = "最高库存", orderNum = "21")
+//  private BigDecimal maxStock;
+//
+//  /**
+//   * 最低库存
+//   */
+//  @Excel(name = "最低库存", orderNum = "22")
+//  private BigDecimal minStock;
+//
+//
+////    /**
+////     * 寿命周期:月
+////     */
+////    @Excel(name = "寿命周期(月)", orderNum = "11")
+////    private BigDecimal agePeriod;
+//
+//  /**
+//   * 备件等级:1-一级; 2-二级;3-三级
+//   */
+//  @Excel(name = "备件等级", orderNum = "23", dicCode = "SPARE_PART_INFO_LEVEL")
+//  private Integer level;
+//  /**
+//   * 使用周期:月
+//   */
+////    @Excel(name = "使用周期(月)", orderNum = "10")
+////    private BigDecimal usePeriod;
+//
+////    /**
+////     * 采购到货周期:天
+////     */
+////    @Excel(name = "采购到货周期(天)", orderNum = "12")
+////    private BigDecimal purchasePeriod;
+//  /**
+//   * 生产商
+//   */
+//  @Excel(name = "生产商", orderNum = "24")
+//  private String producerName;
+//
+//  @Excel(name = "用途", orderNum = "25",dicCode = "SPARE_USE_TYPE")
+//  private String yt;
+
 
 
 }

platform-dao/src/main/java/com/platform/dao/vo/export/store/ExportInStoreFormVO.java

@@ -18,154 +18,186 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 public class ExportInStoreFormVO implements Serializable {
 
-    /**
-   * 主键
-   */
-  @Excel(name = "主键", orderNum = "1")
-  private String id;
-
-    /**
+  /**
    * 入库单号
    */
-  @Excel(name = "入库单号", orderNum = "2")
+  @Excel(name = "入库单号", orderNum = "1")
   private String inNo;
 
-    /**
+  /**
    * 入库类型:1-采购入库 2-领用退库 3-拆解入库
    */
-  @Excel(name = "入库类型:1-采购入库 2-领用退库 3-拆解入库", orderNum = "3")
+  @Excel(name = "入库类型:1-采购入库 2-领用退库 3-拆解入库", orderNum = "2")
   private Integer type;
 
-    /**
-   * 备注
-   */
-  @Excel(name = "备注", orderNum = "4")
-  private String remark;
-
-    /**
-   * 创建人
-   */
-  @Excel(name = "创建人", orderNum = "5")
-  private String createdUserId;
-
-    /**
-   * 创建人名称
-   */
-  @Excel(name = "创建人名称", orderNum = "6")
-  private String createdUserName;
-
-    /**
-   * 更新人
-   */
-  @Excel(name = "更新人", orderNum = "7")
-  private String updateUserId;
-
-    /**
-   * 更新人名称
-   */
-  @Excel(name = "更新人名称", orderNum = "8")
-  private String updateUserName;
-
-    /**
-   * 创建日期
-   */
-  @Excel(name = "创建日期", orderNum = "9")
-  private LocalDateTime createdTime;
-
-    /**
-   * 更新日期
-   */
-  @Excel(name = "更新日期", orderNum = "10")
-  private LocalDateTime updateTime;
-
-  /**
-   * 大类编码名称
-   */
-  @Excel(name = "备件类别", orderNum = "2")
-  private String typeName;
-
   /**
    * 备件编码
    */
   @Excel(name = "备件编码", orderNum = "3")
   private String no;
 
+  @Excel(name = "品牌", orderNum = "4")
+  private String brand;
+
   /**
    * 名称
    */
-  @Excel(name = "备件名称", orderNum = "4")
+  @Excel(name = "备件名称", orderNum = "5")
   private String name;
 
   /**
    * 规格型号：使用的sb_guige
    */
-  @Excel(name = "规格型号", orderNum = "5")
+  @Excel(name = "规格型号", orderNum = "6")
   private String ggxh;
 
-  @Excel(name = "品牌", orderNum = "6")
-  private String brand;
+  /**
+   * 计量单位: 1-件;2-台;3-条; 4-个
+   */
+  @Excel(name = "计量单位", orderNum = "7")
+  private String unit;
 
   /**
-   * 单价
+   * 创建人
    */
-  @Excel(name = "备件价值", orderNum = "7")
-  private Double initialValue;
+  @Excel(name = "创建人", orderNum = "8")
+  private String createdUserName;
 
   /**
-   * 计量单位: 1-件;2-台;3-条; 4-个
+   * 创建日期
    */
-  @Excel(name = "计量单位", orderNum = "8")
-  private String unit;
+  @Excel(name = "创建日期", orderNum = "9")
+  private LocalDateTime createdTime;
 
   /**
    * 当前库存
    */
-  @Excel(name = "当前库存", orderNum = "9")
+  @Excel(name = "当前库存", orderNum = "10")
   private BigDecimal currentStock;
 
   /**
    * 最高库存
    */
-  @Excel(name = "最高库存", orderNum = "10")
+  @Excel(name = "最高库存", orderNum = "11")
   private BigDecimal maxStock;
 
   /**
    * 最低库存
    */
-  @Excel(name = "最低库存", orderNum = "11")
+  @Excel(name = "最低库存", orderNum = "12")
   private BigDecimal minStock;
 
-
-//    /**
-//     * 寿命周期:月
-//     */
-//    @Excel(name = "寿命周期(月)", orderNum = "11")
-//    private BigDecimal agePeriod;
-
   /**
    * 备件等级:1-一级; 2-二级;3-三级
    */
-  @Excel(name = "备件等级", orderNum = "12", dicCode = "SPARE_PART_INFO_LEVEL")
+  @Excel(name = "备件等级", orderNum = "13", dicCode = "SPARE_PART_INFO_LEVEL")
   private Integer level;
+
   /**
-   * 使用周期:月
+   * 大类编码名称
    */
-//    @Excel(name = "使用周期(月)", orderNum = "10")
-//    private BigDecimal usePeriod;
+  @Excel(name = "备件类别", orderNum = "14")
+  private String typeName;
+
+  /**
+   * 单价
+   */
+  @Excel(name = "备件价值", orderNum = "15")
+  private Double initialValue;
 
-//    /**
-//     * 采购到货周期:天
-//     */
-//    @Excel(name = "采购到货周期(天)", orderNum = "12")
-//    private BigDecimal purchasePeriod;
   /**
    * 生产商
    */
-  @Excel(name = "生产商", orderNum = "13")
+  @Excel(name = "生产商", orderNum = "16")
   private String producerName;
 
-  @Excel(name = "用途", orderNum = "14")
-  private String ytStr;
+    /**
+   * 主键
+   */
+  @Excel(name = "主键", orderNum = "17")
+  private String id;
+
+    /**
+   * 备注
+   */
+  @Excel(name = "备注", orderNum = "18")
+  private String remark;
+
+
+
+//    /**
+//   * 创建人名称
+//   */
+//  @Excel(name = "创建人名称", orderNum = "6")
+//  private String createdUserName;
+//
+//    /**
+//   * 更新人
+//   */
+//  @Excel(name = "更新人", orderNum = "7")
+//  private String updateUserId;
+//
+//    /**
+//   * 更新人名称
+//   */
+//  @Excel(name = "更新人名称", orderNum = "8")
+//  private String updateUserName;
+//
+//
+//
+//    /**
+//   * 更新日期
+//   */
+//  @Excel(name = "更新日期", orderNum = "10")
+//  private LocalDateTime updateTime;
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//  /**
+//   * 最高库存
+//   */
+//  @Excel(name = "最高库存", orderNum = "10")
+//  private BigDecimal maxStock;
+//
+//
+//
+//
+////    /**
+////     * 寿命周期:月
+////     */
+////    @Excel(name = "寿命周期(月)", orderNum = "11")
+////    private BigDecimal agePeriod;
+//
+//
+//  /**
+//   * 使用周期:月
+//   */
+////    @Excel(name = "使用周期(月)", orderNum = "10")
+////    private BigDecimal usePeriod;
+//
+////    /**
+////     * 采购到货周期:天
+////     */
+////    @Excel(name = "采购到货周期(天)", orderNum = "12")
+////    private BigDecimal purchasePeriod;
+//
+//
+//  @Excel(name = "用途", orderNum = "14")
+//  private String ytStr;
 
 
 }

platform-dao/src/main/java/com/platform/dao/vo/export/store/ExportOutStoreDetailVO.java

@@ -4,6 +4,7 @@ import com.platform.office.annotation.Excel;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.LocalDate;
 
@@ -17,118 +18,105 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 public class ExportOutStoreDetailVO implements Serializable {
 
-    /**
-   * 主键
+  /**
+   * 备件编码
    */
-  @Excel(name = "主键", orderNum = "1")
-  private String id;
+  @Excel(name = "备件编码", orderNum = "1")
+  private String no;
+
+  @Excel(name = "品牌", orderNum = "2")
+  private String brand;
 
-//    /**
-//   * 出库单id
-//   */
-//  @Excel(name = "出库单id", orderNum = "2")
-//  private String outId;
-//
-//    /**
-//   * 出库单号
-//   */
-//  @Excel(name = "出库单号", orderNum = "3")
-//  private String outNo;
-
-    /**
-   * 入库仓库id
+  /**
+   * 名称
    */
-  @Excel(name = "出库仓库id", orderNum = "4")
-  private String storeId;
+  @Excel(name = "备件名称", orderNum = "3")
+  private String name;
 
-    /**
-   * 备件id
+  /**
+   * 规格型号：使用的sb_guige
    */
-  @Excel(name = "备件id", orderNum = "5")
-  private String spareId;
+  @Excel(name = "规格型号", orderNum = "4")
+  private String ggxh;
+
+  /**
+   * 计量单位: 1-件;2-台;3-条; 4-个
+   */
+  @Excel(name = "计量单位", orderNum = "5")
+  private String unit;
 
-    /**
-   * 出库数量
+  /**
+   * 入库数量
    */
-  @Excel(name = "出库数量", orderNum = "6")
-  private Integer totalNum;
+  @Excel(name = "入库数量", orderNum = "6")
+  private BigDecimal totalNum;
 
-    /**
+  /**
    * 创建人
    */
   @Excel(name = "创建人", orderNum = "7")
-  private String createdUserId;
+  private String createdUserName;
 
-    /**
-   * 创建人名称
+  /**
+   * 创建日期
    */
-  @Excel(name = "创建人名称", orderNum = "8")
-  private String createdUserName;
+  @Excel(name = "创建日期", orderNum = "8")
+  private LocalDateTime createdTime;
 
-    /**
-   * 更新人
+  /**
+   * 当前库存
    */
-  @Excel(name = "更新人", orderNum = "9")
-  private String updateUserId;
+  @Excel(name = "当前库存", orderNum = "9")
+  private BigDecimal currentStock;
 
-    /**
-   * 更新人名称
+  /**
+   * 最高库存
    */
-  @Excel(name = "更新人名称", orderNum = "10")
-  private String updateUserName;
+  @Excel(name = "最高库存", orderNum = "10")
+  private BigDecimal maxStock;
 
-    /**
-   * 创建日期
+  /**
+   * 最低库存
    */
-  @Excel(name = "创建日期", orderNum = "11")
-  private LocalDateTime createdTime;
+  @Excel(name = "最低库存", orderNum = "11")
+  private BigDecimal minStock;
 
-    /**
-   * 更新日期
+  /**
+   * 备件等级:1-一级; 2-二级;3-三级
    */
-  @Excel(name = "更新日期", orderNum = "12")
-  private LocalDateTime updateTime;
+  @Excel(name = "备件等级", orderNum = "12", dicCode = "SPARE_PART_INFO_LEVEL")
+  private Integer level;
 
+  /**
+   * 大类编码名称
+   */
   @Excel(name = "备件类别", orderNum = "13")
   private String typeName;
 
-  @Excel(name = "备件编码", orderNum = "14")
-  private String no;
-
-  @Excel(name = "备件名称", orderNum = "15")
-  private String name;
-
-  @Excel(name = "规格型号", orderNum = "16")
-  private String ggxh;
-
-  @Excel(name = "品牌", orderNum = "17")
-  private String brand;
-
-  @Excel(name = "备件价值", orderNum = "18")
-  private String initialValue;
-
-  @Excel(name = "计量单位", orderNum = "19")
-  private String unit;
-
-  @Excel(name = "当前库存", orderNum = "20")
-  private String currentStock;
-
-  @Excel(name = "最高库存", orderNum = "21")
-  private String maxStock;
+  /**
+   * 单价
+   */
+  @Excel(name = "备件价值", orderNum = "14")
+  private Double initialValue;
 
-  @Excel(name = "最低库存", orderNum = "22")
-  private String minStock;
+  /**
+   * 生产商
+   */
+  @Excel(name = "生产商", orderNum = "15")
+  private String producerName;
 
-  @Excel(name = "等级", orderNum = "23", dicCode = "SPARE_PART_INFO_LEVEL")
-  private String level;
+  /**
+   * 主键
+   */
+  @Excel(name = "主键", orderNum = "16")
+  private String id;
 
-  @Excel(name = "生产商", orderNum = "24")
-  private String producerName;
+  @Excel(name = "备件id", orderNum = "17")
+  private String spareId;
 
-  @Excel(name = "用途", orderNum = "25",dicCode = "SPARE_USE_TYPE")
+  @Excel(name = "用途", orderNum = "18",dicCode = "SPARE_USE_TYPE")
   private String yt;
 
 
 
-
 }

platform-dao/src/main/java/com/platform/dao/vo/export/store/ExportOutStoreFormVO.java

@@ -18,71 +18,17 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 public class ExportOutStoreFormVO implements Serializable {
 
-    /**
-   * 主键
-   */
-  @Excel(name = "主键", orderNum = "1")
-  private String id;
-
-    /**
-   * 出库单号
+  /**
+   * 入库单号
    */
-  @Excel(name = "出库单号", orderNum = "2")
+  @Excel(name = "出库单号", orderNum = "1")
   private String outNo;
 
-    /**
-   * 出库类型:1-领用出库 2--退货出库
-   */
-  @Excel(name = "出库类型:1-领用出库 2--退货出库", orderNum = "3")
-  private Integer type;
-
-    /**
-   * 备注
-   */
-  @Excel(name = "备注", orderNum = "4")
-  private String remark;
-
-    /**
-   * 创建人
-   */
-  @Excel(name = "创建人", orderNum = "5")
-  private String createdUserId;
-
-    /**
-   * 创建人名称
-   */
-  @Excel(name = "创建人名称", orderNum = "6")
-  private String createdUserName;
-
-    /**
-   * 更新人
-   */
-  @Excel(name = "更新人", orderNum = "7")
-  private String updateUserId;
-
-    /**
-   * 更新人名称
-   */
-  @Excel(name = "更新人名称", orderNum = "8")
-  private String updateUserName;
-
-    /**
-   * 创建日期
-   */
-  @Excel(name = "创建日期", orderNum = "9")
-  private LocalDateTime createdTime;
-
-    /**
-   * 更新日期
-   */
-  @Excel(name = "更新日期", orderNum = "10")
-  private LocalDateTime updateTime;
-
   /**
-   * 大类编码名称
+   * 入库类型:1-采购入库 2-领用退库 3-拆解入库
    */
-  @Excel(name = "备件类别", orderNum = "2")
-  private String typeName;
+  @Excel(name = "出库类型:1-领用出库 2--退货出库", orderNum = "2")
+  private Integer type;
 
   /**
    * 备件编码
@@ -90,82 +36,241 @@ public class ExportOutStoreFormVO implements Serializable {
   @Excel(name = "备件编码", orderNum = "3")
   private String no;
 
+  @Excel(name = "品牌", orderNum = "4")
+  private String brand;
+
   /**
    * 名称
    */
-  @Excel(name = "备件名称", orderNum = "4")
+  @Excel(name = "备件名称", orderNum = "5")
   private String name;
 
   /**
    * 规格型号：使用的sb_guige
    */
-  @Excel(name = "规格型号", orderNum = "5")
+  @Excel(name = "规格型号", orderNum = "6")
   private String ggxh;
 
-  @Excel(name = "品牌", orderNum = "6")
-  private String brand;
+  /**
+   * 计量单位: 1-件;2-台;3-条; 4-个
+   */
+  @Excel(name = "计量单位", orderNum = "7")
+  private String unit;
 
   /**
-   * 单价
+   * 创建人
    */
-  @Excel(name = "备件价值", orderNum = "7")
-  private Double initialValue;
+  @Excel(name = "创建人", orderNum = "8")
+  private String createdUserName;
 
   /**
-   * 计量单位: 1-件;2-台;3-条; 4-个
+   * 创建日期
    */
-  @Excel(name = "计量单位", orderNum = "8")
-  private String unit;
+  @Excel(name = "创建日期", orderNum = "9")
+  private LocalDateTime createdTime;
 
   /**
    * 当前库存
    */
-  @Excel(name = "当前库存", orderNum = "9")
+  @Excel(name = "当前库存", orderNum = "10")
   private BigDecimal currentStock;
 
   /**
    * 最高库存
    */
-  @Excel(name = "最高库存", orderNum = "10")
+  @Excel(name = "最高库存", orderNum = "11")
   private BigDecimal maxStock;
 
   /**
    * 最低库存
    */
-  @Excel(name = "最低库存", orderNum = "11")
+  @Excel(name = "最低库存", orderNum = "12")
   private BigDecimal minStock;
 
-
-//    /**
-//     * 寿命周期:月
-//     */
-//    @Excel(name = "寿命周期(月)", orderNum = "11")
-//    private BigDecimal agePeriod;
-
   /**
    * 备件等级:1-一级; 2-二级;3-三级
    */
-  @Excel(name = "备件等级", orderNum = "12", dicCode = "SPARE_PART_INFO_LEVEL")
+  @Excel(name = "备件等级", orderNum = "13", dicCode = "SPARE_PART_INFO_LEVEL")
   private Integer level;
+
   /**
-   * 使用周期:月
+   * 大类编码名称
    */
-//    @Excel(name = "使用周期(月)", orderNum = "10")
-//    private BigDecimal usePeriod;
+  @Excel(name = "备件类别", orderNum = "14")
+  private String typeName;
+
+  /**
+   * 单价
+   */
+  @Excel(name = "备件价值", orderNum = "15")
+  private Double initialValue;
 
-//    /**
-//     * 采购到货周期:天
-//     */
-//    @Excel(name = "采购到货周期(天)", orderNum = "12")
-//    private BigDecimal purchasePeriod;
   /**
    * 生产商
    */
-  @Excel(name = "生产商", orderNum = "13")
+  @Excel(name = "生产商", orderNum = "16")
   private String producerName;
 
-  @Excel(name = "用途", orderNum = "14")
-  private String ytStr;
+  /**
+   * 主键
+   */
+  @Excel(name = "主键", orderNum = "17")
+  private String id;
+
+  /**
+   * 备注
+   */
+  @Excel(name = "备注", orderNum = "18")
+  private String remark;
+
+//    /**
+//   * 主键
+//   */
+//  @Excel(name = "主键", orderNum = "1")
+//  private String id;
+//
+//    /**
+//   * 出库单号
+//   */
+//  @Excel(name = "出库单号", orderNum = "2")
+//  private String outNo;
+//
+//    /**
+//   * 出库类型:1-领用出库 2--退货出库
+//   */
+//  @Excel(name = "出库类型:1-领用出库 2--退货出库", orderNum = "3")
+//  private Integer type;
+//
+//    /**
+//   * 备注
+//   */
+//  @Excel(name = "备注", orderNum = "4")
+//  private String remark;
+//
+//    /**
+//   * 创建人
+//   */
+//  @Excel(name = "创建人", orderNum = "5")
+//  private String createdUserId;
+//
+//    /**
+//   * 创建人名称
+//   */
+//  @Excel(name = "创建人名称", orderNum = "6")
+//  private String createdUserName;
+//
+//    /**
+//   * 更新人
+//   */
+//  @Excel(name = "更新人", orderNum = "7")
+//  private String updateUserId;
+//
+//    /**
+//   * 更新人名称
+//   */
+//  @Excel(name = "更新人名称", orderNum = "8")
+//  private String updateUserName;
+//
+//    /**
+//   * 创建日期
+//   */
+//  @Excel(name = "创建日期", orderNum = "9")
+//  private LocalDateTime createdTime;
+//
+//    /**
+//   * 更新日期
+//   */
+//  @Excel(name = "更新日期", orderNum = "10")
+//  private LocalDateTime updateTime;
+//
+//  /**
+//   * 大类编码名称
+//   */
+//  @Excel(name = "备件类别", orderNum = "2")
+//  private String typeName;
+//
+//  /**
+//   * 备件编码
+//   */
+//  @Excel(name = "备件编码", orderNum = "3")
+//  private String no;
+//
+//  /**
+//   * 名称
+//   */
+//  @Excel(name = "备件名称", orderNum = "4")
+//  private String name;
+//
+//  /**
+//   * 规格型号：使用的sb_guige
+//   */
+//  @Excel(name = "规格型号", orderNum = "5")
+//  private String ggxh;
+//
+//  @Excel(name = "品牌", orderNum = "6")
+//  private String brand;
+//
+//  /**
+//   * 单价
+//   */
+//  @Excel(name = "备件价值", orderNum = "7")
+//  private Double initialValue;
+//
+//  /**
+//   * 计量单位: 1-件;2-台;3-条; 4-个
+//   */
+//  @Excel(name = "计量单位", orderNum = "8")
+//  private String unit;
+//
+//  /**
+//   * 当前库存
+//   */
+//  @Excel(name = "当前库存", orderNum = "9")
+//  private BigDecimal currentStock;
+//
+//  /**
+//   * 最高库存
+//   */
+//  @Excel(name = "最高库存", orderNum = "10")
+//  private BigDecimal maxStock;
+//
+//  /**
+//   * 最低库存
+//   */
+//  @Excel(name = "最低库存", orderNum = "11")
+//  private BigDecimal minStock;
+//
+//
+////    /**
+////     * 寿命周期:月
+////     */
+////    @Excel(name = "寿命周期(月)", orderNum = "11")
+////    private BigDecimal agePeriod;
+//
+//  /**
+//   * 备件等级:1-一级; 2-二级;3-三级
+//   */
+//  @Excel(name = "备件等级", orderNum = "12", dicCode = "SPARE_PART_INFO_LEVEL")
+//  private Integer level;
+//  /**
+//   * 使用周期:月
+//   */
+////    @Excel(name = "使用周期(月)", orderNum = "10")
+////    private BigDecimal usePeriod;
+//
+////    /**
+////     * 采购到货周期:天
+////     */
+////    @Excel(name = "采购到货周期(天)", orderNum = "12")
+////    private BigDecimal purchasePeriod;
+//  /**
+//   * 生产商
+//   */
+//  @Excel(name = "生产商", orderNum = "13")
+//  private String producerName;
+//
+//  @Excel(name = "用途", orderNum = "14")
+//  private String ytStr;
 
 
 }

platform-dao/src/main/java/com/platform/dao/vo/export/store/ExportSpareStoreVO.java

@@ -17,88 +17,90 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 public class ExportSpareStoreVO implements Serializable {
 
-    /**
-     * 仓库备件id
-     */
-    @Excel(name = "仓库备件", orderNum = "1")
-    private String id;
-    /**
-     * 备件id
-     */
-    @Excel(name = "仓库id", orderNum = "2")
-    private String storeId;
+  /**
+   * 编号
+   */
+  @Excel(name = "编号", orderNum = "1")
+  private String no;
 
-    /**
-   * 备件id
+  @Excel(name = "品牌", orderNum = "2")
+  private String brand;
+
+  /**
+   * 名称
    */
-  @Excel(name = "备件id", orderNum = "3")
-  private String spareId;
+  @Excel(name = "名称", orderNum = "3")
+  private String spareName;
 
-    /**
-     * 编号
-     */
-    @Excel(name = "编号", orderNum = "4")
-    private String no;
+  /**
+   * 规格型号
+   */
+  @Excel(name = "规格型号", orderNum = "4")
+  private String ggxh;
 
-    /**
-     * 名称
-     */
-    @Excel(name = "名称", orderNum = "5")
-    private String spareName;
-    /**
-     * 原厂编号
-     */
-    @Excel(name = "原厂编号", orderNum = "6")
-    private String initNo;
-    /**
-     * 规格型号
-     */
-    @Excel(name = "规格型号", orderNum = "7")
-    private String ggxh;
+  /**
+   * 备件id
+   */
+  @Excel(name = "单位", orderNum = "5")
+  private String unit;
 
-    /**
-     * 备件id
-     */
-    @Excel(name = "单位", orderNum = "8")
-    private String unit;
+  /**
+   * 数量
+   */
+  @Excel(name = "数量", orderNum = "6")
+  private String num;
 
-    /**
-     * 单价
-     */
-    @Excel(name = "单价(可修改)", orderNum = "9")
-    private String price;
+  @Excel(name = "最高库存", orderNum = "7")
+  private Integer maxStock;
 
-    /**
-     * 数量
-     */
-    @Excel(name = "数量(可修改)", orderNum = "10")
-    private String num;
+  @Excel(name = "最低库存", orderNum = "8")
+  private String minStock;
 
-    /**
-     * 总价
-     */
-    @Excel(name = "总价", orderNum = "11")
-    private String totalPrice;
+  @Excel(name = "等级", orderNum = "9",dicCode = "SPARE_PART_INFO_LEVEL")
+  private String level;
 
-    @Excel(name = "备件类别", orderNum = "12")
-    private String spareTypeName;
+  /**
+   * 单价
+   */
+  @Excel(name = "单价", orderNum = "10")
+  private String price;
 
-    @Excel(name = "品牌", orderNum = "13")
-    private String brand;
+  /**
+   * 总价
+   */
+  @Excel(name = "总价", orderNum = "11")
+  private String totalPrice;
 
-    @Excel(name = "最高库存", orderNum = "14")
-    private Integer maxStock;
+  @Excel(name = "备件类别", orderNum = "12")
+  private String spareTypeName;
 
-    @Excel(name = "最低库存", orderNum = "15")
-    private String minStock;
+  @Excel(name = "生产商", orderNum = "13")
+  private String producerName;
 
-    @Excel(name = "等级", orderNum = "16",dicCode = "SPARE_PART_INFO_LEVEL")
-    private String level;
+  /**
+   * 原厂编号
+   */
+  @Excel(name = "原厂编号", orderNum = "14")
+  private String initNo;
 
-    @Excel(name = "生产商", orderNum = "17")
-    private String producerName;
+  @Excel(name = "用途", orderNum = "15",dicCode = "SPARE_USE_TYPE")
+  private Integer yt;
 
-    @Excel(name = "用途", orderNum = "18",dicCode = "SPARE_USE_TYPE")
-    private Integer yt;
+    /**
+     * 仓库备件id
+     */
+    @Excel(name = "仓库备件", orderNum = "16")
+    private String id;
+    /**
+     * 备件id
+     */
+    @Excel(name = "仓库id", orderNum = "17")
+    private String storeId;
+
+    /**
+   * 备件id
+   */
+  @Excel(name = "备件id", orderNum = "18")
+  private String spareId;
 
 }

platform-dao/src/main/resources/mapper/store/InStoreFormMapper.xml

@@ -308,6 +308,7 @@
         left join t_spare_type type on type.id=info.type_id
         left join t_spare_store spareStore on spareStore.spare_id = info.id
         left join t_firm_producer producer on producer.id = info.producer_id
+        left join t_sys_user user on user.user_id = instore.created_user_id
         <where>
             <if test="keyword!=null and keyword!=''">
                 and (info.name like concat('%',#{keyword},'%')
@@ -344,7 +345,8 @@
             left join t_store store on store.id = spareStore.store_id
             left join t_spare_type spareType on spareType.id = info.type_id
             left join t_firm_producer producer on producer.id = info.producer_id
-            <where>
+
+        <where>
                 <if test="storeId!=null and storeId!=''">
                     store.id = #{storeId}
                 </if>

platform-dao/src/main/resources/mapper/store/OutStoreFormMapper.xml

@@ -250,6 +250,7 @@
         left join t_spare_type type on type.id=info.type_id
         left join t_spare_store spareStore on spareStore.spare_id = info.id
         left join t_firm_producer producer on producer.id = info.producer_id
+        left join t_sys_user user on user.user_id = outstore.created_user_id
         <where>
             <if test="keyword!=null and keyword!=''">
                 and (info.name like concat('%',#{keyword},'%')

platform-rest/src/main/java/com/platform/rest/controller/report/InStoreDetailReportController.java

@@ -16,6 +16,8 @@ import com.platform.dao.vo.query.store.InStoreFormVO;
 import com.platform.rest.log.annotation.SysLog;
 import com.platform.service.store.InStoreDetailService;
 import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -64,6 +66,8 @@ public class InStoreDetailReportController {
   /**
      * 入库详情导出
      *
+   * 3
+   *
      * @param inStoreDetailDTO 入库详情DTO
      * @return R
      */