From 8537a164dbd4c8696c3269141a8f18922d4ed15f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 21 十月 2025 09:02:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageGeneralDTO.java | 56 ++++++++++++++------------------------------------------
1 files changed, 14 insertions(+), 42 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageGeneralDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageGeneralDTO.java
index 3848cb6..d434cb9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageGeneralDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageGeneralDTO.java
@@ -42,6 +42,10 @@
@NotBlank(message = "资产名称不能为空")
private String assetName;
+ @ApiModelProperty(value = "类别")
+ @NotBlank(message = "类别不能为空")
+ private String category;
+
@ApiModelProperty(value = "规格型号")
private String specificationModel;
@@ -51,7 +55,7 @@
@ApiModelProperty(value = "数量")
@NotNull(message = "数量不能为空")
- private BigDecimal quantity;
+ private Integer quantity;
@ApiModelProperty(value = "单价")
@NotNull(message = "单价不能为空")
@@ -60,17 +64,20 @@
@ApiModelProperty(value = "使用年限（年）")
private Integer usefulLife;
- @ApiModelProperty(value = "权属单位/部门ID")
- private Integer ownershipDeptId;
+ @ApiModelProperty(value = "总金额")
+ private BigDecimal totalValue;
+
+ @ApiModelProperty(value = "权属单位/部门名称")
+ private String ownershipDeptName;
@ApiModelProperty(value = "使用人")
private String userName;
- @ApiModelProperty(value = "使用部门/位置ID")
- private Integer useDeptId;
+ @ApiModelProperty(value = "使用/位置类型 0-部门，1-仓库，2-录入地址")
+ private Integer addressType;
- @ApiModelProperty(value = "仓库ID")
- private Integer warehouseId;
+ @ApiModelProperty(value = "使用部门/位置名称")
+ private String useDeptName;
@ApiModelProperty(value = "仓库名称")
private String warehouseName;
@@ -99,40 +106,5 @@
@ApiModelProperty(value = "入账金额")
private BigDecimal accountingAmount;
-
- // 通用资产扩展表字段
- @ApiModelProperty(value = "供应商名称")
- private String supplierName;
-
- @ApiModelProperty(value = "采购日期")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private LocalDate purchaseDate;
-
- @ApiModelProperty(value = "保修期（月）")
- private Integer warrantyPeriod;
-
- @ApiModelProperty(value = "保修到期日期")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private LocalDate warrantyExpireDate;
-
- @ApiModelProperty(value = "折旧方法")
- private String depreciationMethod;
-
- @ApiModelProperty(value = "折旧率")
- private BigDecimal depreciationRate;
-
- @ApiModelProperty(value = "净值")
- private BigDecimal netValue;
-
- @ApiModelProperty(value = "维护周期（月）")
- private Integer maintenanceCycle;
-
- @ApiModelProperty(value = "上次维护日期")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private LocalDate lastMaintenanceDate;
-
- @ApiModelProperty(value = "下次维护日期")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private LocalDate nextMaintenanceDate;
}
}
\ No newline at end of file
--
Gitblit v1.7.1