From 325c6107782d4a2284bb24be688e7a87462dc202 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期日, 28 九月 2025 14:48:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/vo/AssetStatisticsDetailVO.java |   63 +++++++++++++++++++++++++++++++
 1 files changed, 63 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/AssetStatisticsDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/AssetStatisticsDetailVO.java
new file mode 100644
index 0000000..a330026
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/AssetStatisticsDetailVO.java
@@ -0,0 +1,63 @@
+package com.ruoyi.system.vo;
+
+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(value = "资产汇总分页返回VO")
+public class AssetStatisticsDetailVO implements Serializable {
+    @ApiModelProperty(value = "出入库类型")
+    private String typeName;
+    @ApiModelProperty(value = "出入库类型 0-入库,1-出库")
+    private Integer type;
+    @ApiModelProperty(value = "资产名称")
+    private String assetName;
+    @ApiModelProperty(value = "规格型号")
+    private String specificationModel;
+    @ApiModelProperty(value = "资产类型")
+    private String assetTypeName;
+    @ApiModelProperty(value = "资产类型id")
+    private Integer assetTypeId;
+    @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 LocalDate accountingDate;
+
+    @ApiModelProperty(value = "会计凭证号")
+    private String accountingVoucherNo;
+
+    @ApiModelProperty(value = "会计科目")
+    private String accountingSubject;
+
+    @ApiModelProperty(value = "入账金额")
+    private BigDecimal accountingAmount;
+    @ApiModelProperty(value = "入账状态")
+    private String accountingStatus;
+    @ApiModelProperty(value = "资产状态")
+    private String assetStatus;
+    @ApiModelProperty(value = "归属部门")
+    private String ownershipDeptName;
+    @ApiModelProperty(value = "使用人")
+    private String userName;
+    @ApiModelProperty(value = "使用部门/位置")
+    private String useName;
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+    @ApiModelProperty(value = "位置类型 0-部门,1-仓库,2-录入地址")
+    private Integer addressType;
+}

--
Gitblit v1.7.1