From 41ab7abd0b0ec0fefb03b60bbaf42c02fbda666b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 15:53:16 +0800
Subject: [PATCH] feat(production): 添加生产订单与销售台账关联功能

---
 src/main/java/com/ruoyi/device/pojo/DeviceLedger.java |   65 +++++++++++++++++++++++++++++---
 1 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
index 01233be..61239ac 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
@@ -4,22 +4,20 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * 璁惧鍙拌处瀹炰綋绫�
  */
 @Data
 @TableName("device_ledger")
-@ApiModel
+@Schema
 public class DeviceLedger {
 
     /**
@@ -31,14 +29,26 @@
     /**
      * 璁惧鍚嶇О
      */
-    @ApiModelProperty("璁惧鍚嶇О")
+    @Schema(description = "璁惧鍚嶇О")
     private String deviceName;
 
     /**
      * 瑙勬牸鍨嬪彿
      */
-    @ApiModelProperty("瑙勬牸鍨嬪彿")
+    @Schema(description = "瑙勬牸鍨嬪彿")
     private String deviceModel;
+
+    /**
+     * 璁惧鍝佺墝
+     */
+    @Schema(description = "璁惧鍝佺墝")
+    private String deviceBrand;
+
+    /**
+     * 瀛樻斁浣嶇疆
+     */
+    @Schema(description = "瀛樻斁浣嶇疆")
+    private String storageLocation;
 
     /**
      * 渚涘簲鍟嗗悕绉�
@@ -108,4 +118,47 @@
      */
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
+
+    /* ***************************     杩愯绠＄悊        ***************************   */
+
+    @Schema(description = "鐘舵��")
+    private String status;
+
+    @Schema(description = "璁″垝杩愯鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate planRuntimeTime;
+
+    @Schema(description = "寮�濮嬭繍琛屾椂闂�")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime startRuntimeTime;
+
+    @Schema(description = "缁撴潫杩愯鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime endRuntimeTime;
+
+    @Schema(description = "杩愯鏃堕暱")
+    private String runtimeDuration;
+
+    @Schema(description = "鏄惁鎶樻棫 1-鏄� 2-鍚�")
+    private Integer isDepr;
+
+    @Schema(description = "姣忓勾鎶樻棫閲戦")
+    private BigDecimal annualDepreciationAmount;
+
+    @TableField(exist = false)
+    @Schema(description = "绱鎶樻棫")
+    private BigDecimal deprAmount;
+
+    @TableField(exist = false)
+    @Schema(description = "鍑�鍊�")
+    private BigDecimal netValue;
+
+    @Schema(description = "璁惧绫诲瀷")
+    private String type;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }

--
Gitblit v1.9.3