330任务完成

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaFeedback.java

@@ -0,0 +1,50 @@
+package com.ruoyi.oa.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 问题反馈对象 oa_feedback
+ *
+ * @author ruoyi
+ * @date 2025-03-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("oa_feedback")
+public class OaFeedback extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "feedback_id")
+    private Long feedbackId;
+    /**
+     * 反馈内容
+     */
+    private String content;
+    /**
+     * 反馈状态
+     */
+    private Long status;
+    /**
+     *
+     */
+    private String remark;
+    /**
+     *
+     */
+    @TableLogic
+    private Long delFlag;
+
+    private String title;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaTask.java

@@ -134,4 +134,10 @@ public class SysOaTask extends BaseEntity {
      * 报工间隔
      */
     private Long timeGap;
+
+    /**
+     * 临时时间
+     */
+    private Date tempTime;
+
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaTaskItem.java

@@ -0,0 +1,83 @@
+package com.ruoyi.oa.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 报工任务单元对象 sys_oa_task_item
+ *
+ * @author hdka
+ * @date 2025-03-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_oa_task_item")
+public class SysOaTaskItem extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "item_id")
+    private Long itemId;
+    /**
+     *
+     */
+    private Long taskId;
+    /**
+     * 报工内容
+     */
+    private String content;
+    /**
+     *
+     */
+    private String files;
+    /**
+     * 上传事件
+     */
+    private Date signTime;
+    /**
+     * 任务状态
+     */
+    private Long status;
+    /**
+     * 该报功开始时间
+     */
+    private Date beginTime;
+    /**
+     * 结束事件
+     */
+    private Date endTime;
+    /**
+     * 最初结束事件
+     */
+    private Date originEndTime;
+
+    /**
+     * 完成时间
+     */
+    private Date completedTime;
+    /**
+     * 延期临时使用字段
+     */
+    private Date tempTime;
+    /**
+     *
+     */
+    @TableLogic
+    private Long delFlag;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaTaskUser.java

@@ -3,29 +3,41 @@ package com.ruoyi.oa.domain;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
 
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 任务工人对象 sys_oa_task_user
+ * 文件共享表对象 sys_oa_task_user
  *
  * @author hdka
- * @date 2024-11-09
+ * @date 2025-03-28
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @TableName("sys_oa_task_user")
-public class SysOaTaskUser {
+public class SysOaTaskUser extends BaseEntity {
 
     private static final long serialVersionUID=1L;
 
     /**
-     * 主键
+     *
+     */
+    @TableId(value = "task_user_id")
+    private Long taskUserId;
+    /**
+     * 任务id
+     */
+    private Long taskId;
+    /**
+     *
+     */
+    private Long itemId;
+    /**
+     *
      */
     private Long userId;
-    /**
-     * 任务键
-     */
-    @TableId(value = "task_id")
-    private Long taskId;
 
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouse.java

@@ -68,4 +68,6 @@ public class SysOaWarehouse extends BaseEntity {
     @TableLogic
     private Long delFlag;
 
+    private Long threshold;
+
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseMaster.java

@@ -57,4 +57,7 @@ public class SysOaWarehouseMaster extends BaseEntity {
      */
     private String remark;
 
+
+    private Long status;
+
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseTask.java

@@ -0,0 +1,69 @@
+package com.ruoyi.oa.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 采购计划对象 sys_oa_warehouse_task
+ *
+ * @author hdka
+ * @date 2025-03-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_oa_warehouse_task")
+public class SysOaWarehouseTask extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "task_id")
+    private Long taskId;
+    /**
+     * 绑定采购单
+     */
+    private Long masterId;
+    /**
+     * 物料名
+     */
+    private String name;
+    /**
+     * 型号
+     */
+    private String model;
+    /**
+     * 计划入库
+     */
+    private Long taskInventory;
+
+    /**
+     * 物料id
+     */
+    private Long warehouseId;
+    /**
+     * 品牌
+     */
+    private String brand;
+    /**
+     * 规格
+     */
+    private String specifications;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private Long delFlag;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/UserMonthlyData.java

@@ -0,0 +1,36 @@
+package com.ruoyi.oa.domain;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 记录员工在某个月份的任务统计数据
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class UserMonthlyData {
+    /** 员工昵称 */
+    private String nickName;
+
+    private String projectName;
+
+    /** 月份（yyyy-MM格式等） */
+    private String month;
+
+    /** 当月总任务量 */
+    private Long totalTasks;
+
+    /** 已完成任务量 */
+    private Long completedTasks;
+
+    /** 推迟任务量 */
+    private Long delayedTasks;
+
+    /** 推迟次数 */
+    private Long delayedTimes;
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaFeedbackBo.java

@@ -0,0 +1,47 @@
+package com.ruoyi.oa.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 问题反馈业务对象 oa_feedback
+ *
+ * @author ruoyi
+ * @date 2025-03-28
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OaFeedbackBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    private Long feedbackId;
+
+    /**
+     * 反馈内容
+     */
+    private String content;
+
+    /**
+     * 反馈状态
+     */
+    private Long status;
+
+    /**
+     *
+     */
+    private String remark;
+
+    private Long state;
+
+    private String title;
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaRemindBo.java

@@ -33,13 +33,11 @@ public class SysOaRemindBo extends BaseEntity {
     /**
      * 提醒名称
      */
-    @NotBlank(message = "提醒名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String taskTitle;
 
     /**
      * 事件内容
      */
-    @NotBlank(message = "事件内容不能为空", groups = { AddGroup.class, EditGroup.class })
     private String content;
 
     /**

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskBo.java

@@ -178,4 +178,8 @@ public class SysOaTaskBo extends BaseEntity {
      */
     private Long timeGap;
 
+    private Long itemId;
+
+
+    private Long itemStatus;
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskItemBo.java

@@ -0,0 +1,101 @@
+package com.ruoyi.oa.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 报工任务单元业务对象 sys_oa_task_item
+ *
+ * @author hdka
+ * @date 2025-03-27
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysOaTaskItemBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    private Long itemId;
+
+    /**
+     *
+     */
+    private Long taskId;
+
+    /**
+     * 报工内容
+     */
+    private String content;
+
+    /**
+     *
+     */
+    private String files;
+
+    /**
+     * 上传事件
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date signTime;
+
+    /**
+     * 任务状态
+     */
+    private Long status;
+
+    /**
+     * 该报功开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date beginTime;
+
+    /**
+     * 结束事件
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
+    /**
+     * 最初结束事件
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date originEndTime;
+
+    /**
+     * 延期临时使用字段
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date tempTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 完成时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date completedTime;
+
+    private Long timeGap;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskUserBo.java

@@ -0,0 +1,51 @@
+package com.ruoyi.oa.domain.bo;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+import java.util.List;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 文件共享表业务对象 sys_oa_task_user
+ *
+ * @author hdka
+ * @date 2025-03-28
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysOaTaskUserBo extends BaseEntity {
+
+    /**
+     *
+     */
+    private Long taskUserId;
+
+    /**
+     * 任务id
+     */
+    private Long taskId;
+
+    /**
+     *
+     */
+    private Long itemId;
+
+    /**
+     *
+     */
+    private Long userId;
+
+    /**
+     * 用户列表
+     */
+    private List<SysUser> userList;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseBo.java

@@ -71,5 +71,14 @@ public class SysOaWarehouseBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 告警阈值
+     */
+    private Long threshold;
+
+    private Long taskInventory;
+
+    private Long warehouseId;
+
 
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseMasterBo.java

@@ -33,7 +33,7 @@ public class SysOaWarehouseMasterBo extends BaseEntity {
     private String masterNum;
 
     /**
-     * 0出库单1入库单
+     * 0出库单1入库单2采购单
      */
     private Long type;
 
@@ -62,5 +62,6 @@ public class SysOaWarehouseMasterBo extends BaseEntity {
      */
     private List<SysOaWarehouseDetailBo> warehouseList;
 
+    private Long status;
 
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseTaskBo.java

@@ -0,0 +1,75 @@
+package com.ruoyi.oa.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 采购计划业务对象 sys_oa_warehouse_task
+ *
+ * @author hdka
+ * @date 2025-03-30
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysOaWarehouseTaskBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    private Long taskId;
+
+    /**
+     * 绑定采购单
+     */
+    private Long masterId;
+
+    /**
+     * 物料名
+     */
+    private String name;
+
+    /**
+     * 型号
+     */
+    private String model;
+
+    /**
+     * 计划入库
+     */
+    private Long taskInventory;
+
+    /**
+     * 品牌
+     */
+    private String brand;
+
+    /**
+     * 规格
+     */
+    private String specifications;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 物料id
+     */
+    private Long warehouseId;
+
+    /**
+     * 前端接受一个id
+     */
+    private Long id;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaFeedbackVo.java

@@ -0,0 +1,56 @@
+package com.ruoyi.oa.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 问题反馈视图对象 oa_feedback
+ *
+ * @author ruoyi
+ * @date 2025-03-28
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class OaFeedbackVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long feedbackId;
+
+    /**
+     * 反馈内容
+     */
+    @ExcelProperty(value = "反馈内容")
+    private String content;
+
+    /**
+     * 反馈状态
+     */
+    @ExcelProperty(value = "反馈状态")
+    private Long status;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private String remark;
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private Long state;
+
+    private String title;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java

@@ -206,4 +206,10 @@ public class SysOaProjectVo {
      *  人力资源成本
      */
     private Double laborCost;
+
+
+    /**
+     * 项目剩余时间
+     */
+    private Long remainTime;
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaRemindVo.java

@@ -95,6 +95,10 @@ public class SysOaRemindVo {
     @ExcelProperty(value = "修改时间")
     private Date updateTime;
 
+    private String type;
+
+    private Long remainTime;
+
 
 
 

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskItemVo.java

@@ -0,0 +1,110 @@
+package com.ruoyi.oa.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+
+
+/**
+ * 报工任务单元视图对象 sys_oa_task_item
+ *
+ * @author hdka
+ * @date 2025-03-27
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class SysOaTaskItemVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long itemId;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private Long taskId;
+
+    /**
+     * 报工内容
+     */
+    @ExcelProperty(value = "报工内容")
+    private String content;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private String files;
+
+    /**
+     * 上传事件
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ExcelProperty(value = "上传事件")
+    private Date signTime;
+
+    /**
+     * 任务状态
+     */
+    @ExcelProperty(value = "任务状态")
+    private Long status;
+
+    /**
+     * 该报功开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ExcelProperty(value = "该报功开始时间")
+    private Date beginTime;
+
+    /**
+     * 结束事件
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ExcelProperty(value = "结束事件")
+    private Date endTime;
+
+    /**
+     * 最初结束事件
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ExcelProperty(value = "最初结束事件")
+    private Date originEndTime;
+
+    /**
+     * 延期临时使用字段
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ExcelProperty(value = "延期临时使用字段")
+    private Date tempTime;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 完成时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date completedTime;
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskUserVo.java

@@ -10,10 +10,10 @@ import java.util.Date;
 
 
 /**
- * 任务工人视图对象 sys_oa_task_user
+ * 文件共享表视图对象 sys_oa_task_user
  *
  * @author hdka
- * @date 2024-11-09
+ * @date 2025-03-28
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -22,16 +22,28 @@ public class SysOaTaskUserVo {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 主键
+     *
      */
-    @ExcelProperty(value = "主键")
-    private Long userId;
+    @ExcelProperty(value = "")
+    private Long taskUserId;
 
     /**
-     * 任务键
+     * 任务id
      */
-    @ExcelProperty(value = "任务键")
+    @ExcelProperty(value = "任务id")
     private Long taskId;
 
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private Long itemId;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private Long userId;
+
 
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskVo.java

@@ -200,4 +200,14 @@ public class SysOaTaskVo {
      */
     private Long timeGap;
 
+    /**
+     * 最后一个item的id
+     */
+    private Long itemId;
+
+    private Date tempTime;
+
+    private List<SysOaTaskItemVo> taskItemVoList;
+
+    private String files;
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java

@@ -6,6 +6,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.oa.domain.SysOaWarehouseTask;
 import lombok.Data;
 import java.util.Date;
 import java.util.List;
@@ -69,8 +70,14 @@ public class SysOaWarehouseMasterVo {
      * 出库列表
      */
     private List<SysOaWarehouseDetailVo> warehouseList;
+    /**
+     * 采购列表
+     */
+    private List<SysOaWarehouseTaskVo> warehouseTaskList;
 
     private String projectName;
 
+    private Long status;
+
 
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseTaskVo.java

@@ -0,0 +1,77 @@
+package com.ruoyi.oa.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 采购计划视图对象 sys_oa_warehouse_task
+ *
+ * @author hdka
+ * @date 2025-03-30
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class SysOaWarehouseTaskVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long taskId;
+
+    /**
+     * 绑定采购单
+     */
+    @ExcelProperty(value = "绑定采购单")
+    private Long masterId;
+
+    /**
+     * 物料名
+     */
+    @ExcelProperty(value = "物料名")
+    private String name;
+
+    /**
+     * 型号
+     */
+    @ExcelProperty(value = "型号")
+    private String model;
+
+    /**
+     * 计划入库
+     */
+    @ExcelProperty(value = "计划入库")
+    private Long taskInventory;
+
+    /**
+     * 品牌
+     */
+    @ExcelProperty(value = "品牌")
+    private String brand;
+
+    /**
+     * 规格
+     */
+    @ExcelProperty(value = "规格")
+    private String specifications;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 物料id
+     */
+    private Long warehouseId;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseVo.java

@@ -85,5 +85,7 @@ public class SysOaWarehouseVo extends SysOaWarehouse {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    private Long threshold;
 
+    private Long taskInventory;
 }