From 10f6e465c9753ff99099a22aabe72ede4e25eab7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 23 九月 2025 13:59:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationStorageAsset.java |  140 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 140 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationStorageAsset.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationStorageAsset.java
new file mode 100644
index 0000000..dac7d99
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationStorageAsset.java
@@ -0,0 +1,140 @@
+package com.ruoyi.system.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 资产入库申请主表
+ * </p>
+ *
+ * @author mitao
+ * @since 2025-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("oa_approval_application_storage_asset")
+@ApiModel(value="OaApprovalApplicationStorageAsset对象", description="资产入库申请主表")
+public class OaApprovalApplicationStorageAsset implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "审批申请记录ID")
+    private Integer approvalApplicationId;
+
+    @ApiModelProperty(value = "资产原编码")
+    private String assetOriginalCode;
+
+    @ApiModelProperty(value = "资产名称")
+    private String assetName;
+
+    @ApiModelProperty(value = "规格型号")
+    private String specificationModel;
+
+    @ApiModelProperty(value = "类别")
+    private String category;
+
+    @ApiModelProperty(value = "资产类别ID，关联asset_type表")
+    private Integer assetTypeId;
+
+    @ApiModelProperty(value = "类别名称（冗余字段）")
+    private String assetCategory;
+
+    @ApiModelProperty(value = "资产主类型：0-通用资产，1-房产资产，2-车辆资产")
+    private Integer assetMainType;
+
+    @ApiModelProperty(value = "计量单位")
+    private String measurementUnit;
+
+    @ApiModelProperty(value = "数量")
+    private BigDecimal quantity;
+
+    @ApiModelProperty(value = "单价")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty(value = "总价值（数量*单价）")
+    private BigDecimal totalValue;
+
+    @ApiModelProperty(value = "使用年限（年）")
+    private Integer usefulLife;
+
+    @ApiModelProperty(value = "权属单位/部门ID")
+    private Integer ownershipDeptId;
+
+    @ApiModelProperty(value = "使用人")
+    private String userName;
+
+    @ApiModelProperty(value = "位置类型 0-部门，1-仓库，2-录入地址")
+    private Integer addressType;
+
+    @ApiModelProperty(value = "使用部门/位置ID")
+    private Integer useDeptId;
+
+    @ApiModelProperty(value = "仓库名称（冗余字段）")
+    private String warehouseName;
+
+    @ApiModelProperty(value = "所在位置")
+    private String address;
+
+    @ApiModelProperty(value = "仓库ID，关联warehouse表")
+    private Integer warehouseId;
+
+    @ApiModelProperty(value = "资产状态")
+    private String assetStatus;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+    @ApiModelProperty(value = "入账状态")
+    private String accountingStatus;
+
+    @ApiModelProperty(value = "入账时间")
+    private LocalDate accountingDate;
+
+    @ApiModelProperty(value = "会计凭证号")
+    private String accountingVoucherNo;
+
+    @ApiModelProperty(value = "会计科目")
+    private String accountingSubject;
+
+    @ApiModelProperty(value = "入账金额")
+    private BigDecimal accountingAmount;
+
+    @ApiModelProperty(value = "附件URL列表（多个附件使用英文逗号拼接）")
+    private String attachmentUrls;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    @ApiModelProperty(value = "更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+    @ApiModelProperty(value = "是否删除 0-否，1-是")
+    @TableLogic
+    private Boolean disabled;
+
+
+}

--
Gitblit v1.7.1