From dfe6c610fe4a6b2c99dc9ee66ef8f6fe1c89ceda Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 22 四月 2026 11:19:29 +0800
Subject: [PATCH] feat: 入库审批添加关联订单信息和产品明细

---
 src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
index 26bdc91..db112c6 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
@@ -7,6 +7,7 @@
 import com.ruoyi.dto.DateQueryDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
@@ -18,6 +19,7 @@
  */
 @Data
 @TableName("device_ledger")
+@EqualsAndHashCode(callSuper = true)
 public class DeviceLedgerDto extends DateQueryDto {
 
     /**
@@ -35,6 +37,19 @@
      * 瑙勬牸鍨嬪彿
      */
     private String deviceModel;
+
+    /**
+     * 璁惧鍝佺墝
+     */
+    @ApiModelProperty("璁惧鍝佺墝")
+    private String deviceBrand;
+
+    /**
+     * 瀛樻斁浣嶇疆
+     */
+    @ApiModelProperty("瀛樻斁浣嶇疆")
+    private String storageLocation;
+
 
     /**
      * 渚涘簲鍟嗗悕绉�
@@ -122,4 +137,20 @@
 
     @ApiModelProperty("杩愯鏃堕暱")
     private String runtimeDuration;
+
+
+    @ApiModelProperty("鏄惁鎶樻棫 1-鏄� 2-鍚�")
+    private Integer isDepr;
+
+    @ApiModelProperty("姣忓勾鎶樻棫閲戦")
+    private BigDecimal annualDepreciationAmount;
+
+    @ApiModelProperty("璁惧绫诲瀷")
+    private String type;
+
+    @ApiModelProperty("宸ュ簭ID")
+    private Long productProcessId;
+
+    @ApiModelProperty("宸ュ簭鍚嶇О")
+    private String productProcessName;
 }

--
Gitblit v1.9.3