DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

三期内容优化

Browse Source
This commit is contained in:
hdka
2025-03-20 18:19:31 +08:00
parent ed7012e2dd
commit 72036bc7bd
44 changed files with 780 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/CalendarDay.java Normal file
View File

@@ -0,0 +1,11 @@
package com.ruoyi.oa.domain;
import lombok.Data;
@Data
public class CalendarDay {
private String date; // "2025-03-01" 格式
private Integer type; // 0 工作
}

4
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaHoliday.java
View File

@@ -1,6 +1,7 @@
package com.ruoyi.oa.domain;
import com.baomidou.mybatisplus.annotation.*;
import liquibase.pro.packaged.J;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
@@ -10,6 +11,7 @@ import java.math.BigDecimal;
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_holiday
@@ -36,6 +38,8 @@ public class SysOaHoliday extends BaseEntity {
/**
* 假期日期
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date holidayTime;
/**
* 假期名称（如果是周日，值为休息日）

14
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaOutWarehouse.java → ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseDetail.java
View File

@@ -3,22 +3,19 @@ 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_out_warehouse
* 仓库出库对象 sys_oa_warehouse_detail
*
* @author liuzongkun999
* @date 2024-11-02
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sys_oa_out_warehouse")
public class SysOaOutWarehouse extends BaseEntity {
@TableName("sys_oa_warehouse_detail")
public class SysOaWarehouseDetail extends BaseEntity {
private static final long serialVersionUID=1L;
@@ -49,4 +46,9 @@ public class SysOaOutWarehouse extends BaseEntity {
@TableLogic
private Integer delFlag;
private Long masterId;
private Double signPrice;
}

2
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseMaster.java
View File

@@ -29,6 +29,8 @@ public class SysOaWarehouseMaster extends BaseEntity {
*/
@TableId(value = "master_id")
private Long masterId;
private String masterNum;
/**
* 0出库单1入库单
*/

3
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaHolidayBo.java
View File

@@ -11,6 +11,7 @@ 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_holiday
@@ -36,6 +37,8 @@ public class SysOaHolidayBo extends BaseEntity {
/**
* 假期日期
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date holidayTime;
/**

2
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBo2.java
View File

@@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
/**
* 仓库出库业务对象 sys_oa_out_warehouse
* 仓库出库业务对象 sys_oa_warehouse_detail
*
* @author liuzongkun999
* @date 2024-11-02

2
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBoList.java
View File

@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* 仓库批量出库业务对象 sys_oa_out_warehouse
* 仓库批量出库业务对象 sys_oa_warehouse_detail
*
* @author liuzongkun999
* @date 2024-11-05

10
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBo.java → ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseDetailBo.java
View File

@@ -8,12 +8,10 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import java.util.Date;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 仓库出库业务对象 sys_oa_out_warehouse
* 仓库出库业务对象 sys_oa_warehouse_detail
*
* @author liuzongkun999
* @date 2024-11-02
@@ -21,7 +19,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
@Data
@EqualsAndHashCode(callSuper = true)
public class SysOaOutWarehouseBo extends BaseEntity {
public class SysOaWarehouseDetailBo extends BaseEntity {
/**
* 主键id
@@ -61,4 +59,8 @@ public class SysOaOutWarehouseBo extends BaseEntity {
* 物料名
*/
private String warehouseName;
private Double signPrice;
private Long masterId;
}

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

@@ -9,6 +9,8 @@ import javax.validation.constraints.*;
import java.util.Date;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
@@ -28,6 +30,8 @@ public class SysOaWarehouseMasterBo extends BaseEntity {
*/
private Long masterId;
private String masterNum;
/**
* 0出库单1入库单
*/
@@ -53,5 +57,10 @@ public class SysOaWarehouseMasterBo extends BaseEntity {
*/
private String remark;
/**
* 涉及物料
*/
private List<SysOaWarehouseDetailBo> warehouseList;
}

3
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaHolidayVo.java
View File

@@ -54,5 +54,8 @@ public class SysOaHolidayVo {
@ExcelProperty(value = "备注")
private String remark;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date date;
}

2
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseListVo.java
View File

@@ -9,7 +9,7 @@ import java.util.List;
/**
* 仓库出库查询对象 sys_oa_out_warehouse
* 仓库出库查询对象 sys_oa_warehouse_detail
*
* @author liuzongkun999
* @date 2024-11-02

11
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseVo.java → ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseDetailVo.java
View File

@@ -8,14 +8,14 @@ import lombok.Data;
/**
* 仓库出库视图对象 sys_oa_out_warehouse
* 仓库出库视图对象 sys_oa_warehouse_detail
*
* @author liuzongkun999
* @date 2024-11-02
*/
@Data
@ExcelIgnoreUnannotated
public class SysOaOutWarehouseVo extends BaseEntity {
public class SysOaWarehouseDetailVo extends BaseEntity {
private static final long serialVersionUID = 1L;
@@ -61,4 +61,11 @@ public class SysOaOutWarehouseVo extends BaseEntity {
/** 项目信息 */
private SysOaProjectVo project;
private Double signPrice;
private Long masterId;
private String model;
private String specifications;
}

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

@@ -8,7 +8,7 @@ import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
@@ -29,6 +29,12 @@ public class SysOaWarehouseMasterVo {
@ExcelProperty(value = "主键id")
private Long masterId;
/**
* 出库单编号
*/
@ExcelProperty(value = "出库单编号")
private String masterNum;
/**
* 0出库单1入库单
*/
@@ -59,5 +65,12 @@ public class SysOaWarehouseMasterVo {
@ExcelProperty(value = "备注")
private String remark;
/**
* 出库列表
*/
private List<SysOaWarehouseDetailVo> warehouseList;
private String projectName;
}

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

@@ -86,6 +86,4 @@ public class SysOaWarehouseVo extends SysOaWarehouse {
private String remark;
}