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 |  120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 120 insertions(+), 0 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
new file mode 100644
index 0000000..4aea4e3
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetMainInventoryVO.java
@@ -0,0 +1,120 @@
+package com.ruoyi.system.vo.asset;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * 审批通过资产分页视图对象
+ */
+@Data
+@ApiModel("资产盘点资产视图对象")
+public class AssetMainInventoryVO implements Serializable {
+    private static final long serialVersionUID = -1287342342234234234L;
+
+    @ApiModelProperty(value = "资产ID")
+    private Integer id;
+
+    @ApiModelProperty(value = "盘点任务关联表ID")
+    private Integer assetInventoryTaskItemId;
+
+    @ApiModelProperty(value = "资产编码")
+    private String assetCode;
+
+    @ApiModelProperty(value = "资产名称")
+    private String assetName;
+
+    @ApiModelProperty(value = "资产大类（关联的资产类型的父级类型）")
+    private String parentAssetType;
+
+    @ApiModelProperty(value = "资产类型")
+    private String assetTypeName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String specificationModel;
+
+    @ApiModelProperty(value = "类别")
+    private String category;
+
+    @ApiModelProperty(value = "计量单位")
+    private String measurementUnit;
+
+    @ApiModelProperty(value = "数量")
+    private Integer quantity;
+
+    @ApiModelProperty(value = "单价")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty(value = "总价值（数量*单价）")
+    private BigDecimal totalValue;
+
+    @ApiModelProperty(value = "会计凭证号")
+    private String accountingVoucherNo;
+
+    @ApiModelProperty(value = "会计科目")
+    private String accountingSubject;
+
+    @ApiModelProperty(value = "入账状态")
+    private String accountingStatus;
+
+    @ApiModelProperty(value = "入账金额")
+    private BigDecimal accountingAmount;
+
+    @ApiModelProperty(value = "入账时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate accountingDate;
+
+    @ApiModelProperty(value = "资产状态")
+    private String assetStatus;
+
+    @ApiModelProperty(value = "归属部门")
+    private String ownershipDeptName;
+
+    @ApiModelProperty(value = "权属单位/部门ID")
+    private Integer ownershipDeptId;
+
+    @ApiModelProperty(value = "资产类别ID，关联asset_type表")
+    private Integer assetTypeId;
+
+    @ApiModelProperty(value = "位置类型 0-部门，1-仓库，2-录入地址")
+    private Integer addressType;
+
+    @ApiModelProperty(value = "使用部门")
+    private String useDeptName;
+
+    @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;
+
+    @ApiModelProperty(value = "实存部门")
+    private String realDeptName;
+
+    @ApiModelProperty(value = "实存使用人")
+    private String realUserName;
+
+    @ApiModelProperty(value = "异常说明")
+    private String exceptionExplain;
+}
+

--
Gitblit v1.7.1