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/vo/OutStoreDetailVo.java |   48 ++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/OutStoreDetailVo.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/OutStoreDetailVo.java
index 0b201b2..a8c205f 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/OutStoreDetailVo.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/OutStoreDetailVo.java
@@ -34,45 +34,77 @@
     @ApiModelProperty(value = "涓婚敭")
     private String id;
 	/**宸ュ叿缂栫爜*/
+    @Excel(name = "宸ュ叿缂栫爜", width = 15)
     @ApiModelProperty(value = "宸ュ叿缂栫爜")
     private String toolCode;
 	/**宸ュ叿缂栧彿*/
+    @Excel(name = "宸ュ叿缂栧彿", width = 25)
     @ApiModelProperty(value = "宸ュ叿缂栧彿")
     private String toolId;
 	/**鍑哄簱绫诲瀷*/
+    @Excel(name = "鍑哄簱绫诲瀷", width = 15,dicCode = "out_storehouse_type")
     @Dict(dicCode = "out_storehouse_type")
     @ApiModelProperty(value = "鍑哄簱绫诲瀷")
     private String outStorehouseType;
 	/**搴撲綅鍙�*/
+    @Excel(name = "搴撲綅鍙�", width = 15)
     @ApiModelProperty(value = "搴撲綅鍙�")
     private String goodsShelvesCode;
 	/**鍑哄簱鏁伴噺*/
+    @Excel(name = "鍑哄簱鏁伴噺", width = 10)
     @ApiModelProperty(value = "鍑哄簱鏁伴噺")
     private BigDecimal outNumber;
 	/**鍑哄簱鐢宠鍗曞彿*/
+    @Excel(name = "鍑哄簱鐢宠鍗曞彿", width = 15)
     @ApiModelProperty(value = "鍑哄簱鐢宠鍗曞彿")
     private String outStorehouseId;
 	/**鍑哄簱鎿嶄綔鏂瑰紡;1.鎸夌敵璇峰崟 2.鎵嬪伐鎿嶄綔*/
+    @Excel(name = "鍑哄簱鎿嶄綔鏂瑰紡", width = 15)
     @ApiModelProperty(value = "鍑哄簱鎿嶄綔鏂瑰紡;1.鎸夌敵璇峰崟 2.鎵嬪伐鎿嶄綔")
     private String operateType;
-	/**鍒涘缓浜�*/
-    @ApiModelProperty(value = "鍒涘缓浜�")
-    private String createBy;
-	/**鍒涘缓鏃堕棿*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
-    private Date createTime;
+    /**宸ュ叿绫诲瀷*/
+    @Excel(name = "宸ュ叿绫诲瀷", width = 15)
+    @ApiModelProperty(value = "宸ュ叿绫诲瀷")
+    private String applicationType;
     /**涓枃鍚嶇О*/
+    @Excel(name = "涓枃鍚嶇О", width = 15)
     @ApiModelProperty(value = "涓枃鍚嶇О")
     private String chineseName;
     /**鍨嬪彿/鍥惧彿*/
+    @Excel(name = "鍨嬪彿/鍥惧彿", width = 15)
     @ApiModelProperty(value = "鍨嬪彿/鍥惧彿")
     private String toolModel;
     /**鍒�鍏锋潗鏂�*/
+    @Excel(name = "鍒�鍏锋潗鏂�", width = 15)
     @ApiModelProperty(value = "鍒�鍏锋潗鏂�")
     private String toolMaterial;
     /**闆朵欢鏉愭枡*/
+    @Excel(name = "闆朵欢鏉愭枡", width = 15)
     @ApiModelProperty(value = "闆朵欢鏉愭枡")
     private String partMaterial;
+    /**鍒涘缓浜�*/
+    @Excel(name = "鍒涘缓浜�", width = 15)
+    @ApiModelProperty(value = "鍒涘缓浜�")
+    private String createBy;
+    /**鍒涘缓鏃堕棿*/
+    @Excel(name = "鍒涘缓鏃堕棿", width = 15, format = "yyyy-MM-dd HH:mm")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    private Date createTime;
+
+    /**棰濆畾瀵垮懡*/
+    @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