From acbe0c6c601ff1368002d701631a43a2c00b61f5 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 15 十月 2025 15:27:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetMainInventoryVO.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetMainInventoryVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetMainInventoryVO.java
index a5e79a9..4aea4e3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetMainInventoryVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetMainInventoryVO.java
@@ -20,9 +20,11 @@
@ApiModelProperty(value = "资产ID")
private Integer id;
+ @ApiModelProperty(value = "盘点任务关联表ID")
+ private Integer assetInventoryTaskItemId;
+
@ApiModelProperty(value = "资产编码")
private String assetCode;
-
@ApiModelProperty(value = "资产名称")
private String assetName;
@@ -85,8 +87,23 @@
@ApiModelProperty(value = "使用部门")
private String useDeptName;
- @ApiModelProperty(value = "盘点人")
+ @ApiModelProperty(value = "使用部门/位置ID")
+ private Integer useDeptId;
+
+ @ApiModelProperty(value = "仓库ID，关联warehouse表")
+ private Integer warehouseId;
+
+ @ApiModelProperty(value = "仓库名称（冗余字段）")
+ private String warehouseName;
+
+ @ApiModelProperty(value = "所在位置")
+ private String address;
+
+ @ApiModelProperty(value = "使用人")
private String userName;
+
+ @ApiModelProperty(value = "盘点人")
+ private String checkUserName;
@ApiModelProperty(value = "盘点状态 盘点结果 0-未盘点，1-正常，2-异常 未找到资产")
private Integer inventoryStatus;
@@ -96,5 +113,8 @@
@ApiModelProperty(value = "实存使用人")
private String realUserName;
+
+ @ApiModelProperty(value = "异常说明")
+ private String exceptionExplain;
}
--
Gitblit v1.7.1