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-05-22 19:49:01 +08:00
parent 69de2b28cf
commit af5ae35562
31 changed files with 922 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,5 +50,7 @@ public class SysOaWarehouseDetail extends BaseEntity {
private Double signPrice;
private Long fatherId;
}

13
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseTask.java
View File

@@ -1,6 +1,7 @@
package com.ruoyi.oa.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
@@ -8,6 +9,7 @@ import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 采购计划对象 sys_oa_warehouse_task
@@ -66,4 +68,15 @@ public class SysOaWarehouseTask extends BaseEntity {
*/
private String remark;
/**
* 采购细节状态
*/
private Long taskStatus;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endTime;
}

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

@@ -80,5 +80,10 @@ public class SysOaWarehouseBo extends BaseEntity {
private Long warehouseId;
/**
* 批量新增时状态
*/
private Long taskStatus;
}

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

@@ -66,4 +66,7 @@ public class SysOaWarehouseDetailBo extends BaseEntity {
// 当为1的时候为入库单
private Long type;
private Long fatherId;
}

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

@@ -65,6 +65,11 @@ public class SysOaWarehouseMasterBo extends BaseEntity {
*/
private List<SysOaWarehouseDetailBo> warehouseList;
/**
* 采购物料详情列表
*/
private List<SysOaWarehouseTaskBo> warehouseTaskList;
private Long status;
}

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

@@ -1,5 +1,6 @@
package com.ruoyi.oa.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import lombok.Data;
@@ -9,6 +10,7 @@ import javax.validation.constraints.*;
import java.util.Date;
import com.ruoyi.common.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 采购计划业务对象 sys_oa_warehouse_task
@@ -71,5 +73,15 @@ public class SysOaWarehouseTaskBo extends BaseEntity {
*/
private Long id;
/**
* 采购细节状态
*/
private Long taskStatus;
private Double price;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endTime;
}

40
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/dto/MonthlyStatsDTO.java Normal file
View File

@@ -0,0 +1,40 @@
package com.ruoyi.oa.domain.dto;
import java.util.List;
import java.util.Map;
public class MonthlyStatsDTO {
/**
* key 为 "月"，value 为 12 个点（1 月–12 月）
*/
private Map<String, List<Long>> inData;
private Map<String, List<Long>> outData;
private Map<String, List<Long>> dataMap;
// —— getters & setters ——
public Map<String, List<Long>> getInData() {
return inData;
}
public void setInData(Map<String, List<Long>> inData) {
this.inData = inData;
}
public Map<String, List<Long>> getOutData() {
return outData;
}
public void setOutData(Map<String, List<Long>> outData) {
this.outData = outData;
}
public Map<String, List<Long>> getDataMap() {
return dataMap;
}
public void setDataMap(Map<String, List<Long>> dataMap) {
this.dataMap = dataMap;
}
}

17
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/dto/SummaryFilterDTO.java Normal file
View File

@@ -0,0 +1,17 @@
package com.ruoyi.oa.domain.dto;
import lombok.Data;
import java.time.LocalDateTime;
@Data
public class SummaryFilterDTO {
private LocalDateTime beginTime;
private LocalDateTime endTime;
private String name;
private String brand;
private String supplier;
}

18
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SummaryCardVo.java Normal file
View File

@@ -0,0 +1,18 @@
package com.ruoyi.oa.domain.vo;
import lombok.Data;
@Data
public class SummaryCardVo {
private String title;
private Long value;
private Double trend;
public SummaryCardVo(String title, Long value, Double trend) {
this.title = title;
this.value = value;
this.trend = trend;
}
}

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

@@ -69,4 +69,6 @@ public class SysOaWarehouseDetailVo extends BaseEntity {
private String specifications;
private String brand;
private Long fatherId;
}

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

@@ -79,5 +79,6 @@ public class SysOaWarehouseMasterVo {
private Long status;
private Date nearestEndTime;
}

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

@@ -2,9 +2,12 @@ package com.ruoyi.oa.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
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;
@@ -73,5 +76,14 @@ public class SysOaWarehouseTaskVo {
*/
private Long warehouseId;
/**
* 采购细节状态
*/
private Long taskStatus;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endTime;
}

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

@@ -88,4 +88,10 @@ public class SysOaWarehouseVo extends SysOaWarehouse {
private Long threshold;
private Long taskInventory;
private Long lastInbound;
private Long lastOutbound;
}