From 03587b58b343956f910a653c37b9a7bcd84e4af9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 19 九月 2025 18:54:03 +0800
Subject: [PATCH] 资产管理-资产领用列表 阿里云OSS文件上传
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageDTO.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageDTO.java
index 8aef70f..9daa4d7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageDTO.java
@@ -36,11 +36,6 @@
@NotBlank(message = "申请人姓名不能为空")
private String applicantName;
- @ApiModelProperty(value = "申请日期")
- @NotNull(message = "申请日期不能为空")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private LocalDate applicationDate;
-
@ApiModelProperty(value = "入库备注")
@Size(max = 500, message = "入库备注不能超过500字符")
private String applicationReason;
@@ -64,4 +59,18 @@
@NotNull(message = "入库日期不能为空")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate storageTime;
-}
\ No newline at end of file
+
+ // 新增：统一的资产所在单位信息（用于整单校验）
+ @ApiModelProperty(value = "位置类型 0-部门，1-仓库，2-录入地址")
+ @NotNull(message = "位置类型不能为空")
+ private Integer addressType;
+
+ @ApiModelProperty(value = "使用部门/位置名称")
+ private String useDeptName;
+
+ @ApiModelProperty(value = "仓库名称")
+ private String warehouseName;
+
+ @ApiModelProperty(value = "所在位置")
+ private String address;
+}
--
Gitblit v1.7.1