From e0529614c187a5457ca3f587a16edeec51d69d15 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期一, 16 六月 2025 10:41:16 +0800
Subject: [PATCH] 刀具寿命
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolLedgerDetail.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolLedgerDetail.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolLedgerDetail.java
index ad1be5e..d00d0e8 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolLedgerDetail.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolLedgerDetail.java
@@ -4,10 +4,8 @@
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
@@ -36,18 +34,26 @@
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭id")
private String id;
- /**宸ュ叿缂栫爜*/
+ /**宸ュ叿缂栫爜(鍏宠仈瀛楁)*/
@Excel(name = "宸ュ叿缂栫爜", width = 15)
- @ApiModelProperty(value = "宸ュ叿缂栫爜")
+ @ApiModelProperty(value = "宸ュ叿缂栫爜(鍏宠仈瀛楁,瀛榯ms_base_tools琛ㄤ富閿甶d)")
private String toolCode;
+ /**宸ュ叿缂栫爜*/
+ @ApiModelProperty(value = "宸ュ叿缂栫爜(tms_base_tools琛╰ool_code瀛楁)")
+ @TableField(exist = false)
+ private String toolNum;
/**宸ュ叿缂栧彿*/
@Excel(name = "宸ュ叿缂栧彿", width = 15)
@ApiModelProperty(value = "宸ュ叿缂栧彿")
private String toolId;
+ /**宸ュ叿涓枃鍚嶇О*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "宸ュ叿涓枃鍚嶇О")
+ private String toolName;
/**鏁伴噺*/
@Excel(name = "鏁伴噺", width = 15)
@ApiModelProperty(value = "鏁伴噺")
- private Integer quantity;
+ private BigDecimal quantity;
/**鐘舵��*/
@Excel(name = "鐘舵��", width = 15)
@ApiModelProperty(value = "鐘舵��")
@@ -56,6 +62,10 @@
@Excel(name = "搴撳尯/搴撳彿", width = 15)
@ApiModelProperty(value = "搴撳尯/搴撳彿")
private String warehouseId;
+ /**浠撳簱鍚嶇О*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "浠撳簱鍚嶇О")
+ private String warehouseName;
/**搴撲綅鍙�*/
@Excel(name = "搴撲綅鍙�", width = 15)
@ApiModelProperty(value = "搴撲綅鍙�")
@@ -80,4 +90,23 @@
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "鏇存柊鏃堕棿")
private Date updateTime;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍨嬪彿/鍥惧彿")
+ private String toolModel;
+
+ /**棰濆畾瀵垮懡*/
+ @Excel(name = "棰濆畾瀵垮懡", width = 15)
+ @ApiModelProperty(value = "棰濆畾瀵垮懡")
+ private BigDecimal ratedLife;
+
+ /**浣跨敤瀵垮懡*/
+ @Excel(name = "浣跨敤瀵垮懡", width = 15)
+ @ApiModelProperty(value = "浣跨敤瀵垮懡")
+ private BigDecimal useLife;
+
+ /**鍓╀綑瀵垮懡*/
+ @Excel(name = "鍓╀綑瀵垮懡", width = 15)
+ @ApiModelProperty(value = "鍓╀綑瀵垮懡")
+ private BigDecimal remainingPercentage;
}
--
Gitblit v1.9.3