三期内容优化

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

@@ -55,4 +55,9 @@ public class OaSalary extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 保险
+     */
+    private Double insure;
+
 }

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

@@ -43,6 +43,11 @@ public class SysOaReceiveAccount extends BaseEntity {
     @ExcelProperty(value = "父节点")
     private Long parentId;
 
+    /**
+     * 余额
+     */
+    private Double balance;
+
 
 
 

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

@@ -0,0 +1,58 @@
+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_warehouse_master
+ *
+ * @author hdak
+ * @date 2025-03-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_oa_warehouse_master")
+public class SysOaWarehouseMaster extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "master_id")
+    private Long masterId;
+    /**
+     * 0出库单1入库单
+     */
+    private Long type;
+    /**
+     * 绑定项目
+     */
+    private Long projectId;
+    /**
+     * 编写日期
+     */
+    private Date signTime;
+    /**
+     * 导入人
+     */
+    private String signUser;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private Long delFlag;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

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

@@ -62,5 +62,7 @@ public class OaSalaryBo extends BaseEntity {
 
     private String filePath;
 
+    private Double insure;
+
 
 }

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

@@ -46,4 +46,10 @@ public class SysOaReceiveAccountBo extends BaseEntity {
     @ExcelProperty(value = "父节点")
     private Long parentId;
 
+    /**
+     * 余额
+     */
+    private Double balance;
+
+
 }

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

@@ -0,0 +1,57 @@
+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;
+
+/**
+ * 出库单管理业务对象 sys_oa_warehouse_master
+ *
+ * @author hdak
+ * @date 2025-03-19
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysOaWarehouseMasterBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    private Long masterId;
+
+    /**
+     * 0出库单1入库单
+     */
+    private Long type;
+
+    /**
+     * 绑定项目
+     */
+    private Long projectId;
+
+    /**
+     * 编写日期
+     */
+    private Date signTime;
+
+    /**
+     * 导入人
+     */
+    private String signUser;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

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

@@ -5,8 +5,9 @@ import lombok.Data;
 // 物料出库明细VO
 @Data
 public class MaterialVO {
-    private Long materialId;
-    private String name;
+    private Long detailId;
+    private String detailTitle;
     private Double price;
-    private Integer amount;
+    private String financeParties;
+    private String remark;
 }

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

@@ -74,4 +74,6 @@ public class OaSalaryVo extends OaSalary {
     private Double punishSalary;
 
     private Double laborCost;
+
+    private Double insure;
 }

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

@@ -45,4 +45,5 @@ public class SysOaCostAllVo {
 
     private Double peopleDay;
 
+    private Double funds;
 }

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

@@ -54,5 +54,11 @@ public class SysOaReceiveAccountVo {
      */
     private String label;
 
+    /**
+     * 余额
+     */
+    private Double balance;
+
+
 
 }

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

@@ -0,0 +1,63 @@
+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 java.util.Date;
+
+
+
+/**
+ * 出库单管理视图对象 sys_oa_warehouse_master
+ *
+ * @author hdak
+ * @date 2025-03-19
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class SysOaWarehouseMasterVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long masterId;
+
+    /**
+     * 0出库单1入库单
+     */
+    @ExcelProperty(value = "0出库单1入库单")
+    private Long type;
+
+    /**
+     * 绑定项目
+     */
+    @ExcelProperty(value = "绑定项目")
+    private Long projectId;
+
+    /**
+     * 编写日期
+     */
+    @ExcelProperty(value = "编写日期")
+    private Date signTime;
+
+    /**
+     * 导入人
+     */
+    @ExcelProperty(value = "导入人")
+    private String signUser;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}