From 8fb8d37784ce6c466f7142275e1eace2cb012e44 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 15 五月 2025 15:40:53 +0800
Subject: [PATCH] art: 设备管理-设备处置 报废 基础代码修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentDispose.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java
similarity index 82%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentDispose.java
rename to lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java
index becbcf8..1cf0b3c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentDispose.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java
@@ -13,17 +13,17 @@
import java.io.Serializable;
import java.util.Date;
/**
- * @Description: 璁惧澶勭疆(杞鎶ュ簾)
+ * @Description: 璁惧鎶ュ簾(杞)
* @Author: jeecg-boot
- * @Date: 2025-05-13
+ * @Date: 2025-05-15
* @Version: V1.0
*/
@Data
-@TableName("eam_equipment_dispose")
+@TableName("eam_equipment_scrap")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@ApiModel(value="eam_equipment_dispose瀵硅薄", description="璁惧澶勭疆(杞鎶ュ簾)")
-public class EamEquipmentDispose implements Serializable {
+@ApiModel(value="eam_equipment_scrap瀵硅薄", description="璁惧鎶ュ簾(杞)")
+public class EamEquipmentScrap implements Serializable {
/**涓婚敭*/
@TableId(type = IdType.ASSIGN_ID)
@@ -58,26 +58,30 @@
/**杞/鎶ュ簾*/
@Excel(name = "杞/鎶ュ簾", width = 15)
@ApiModelProperty(value = "杞/鎶ュ簾")
- private String disposeType;
+ private String scrapType;
/**鐢宠浜�*/
@Excel(name = "鐢宠浜�", width = 15)
@ApiModelProperty(value = "鐢宠浜�")
private String reportUser;
/**澶勭疆鏃堕棿*/
@ApiModelProperty(value = "澶勭疆鏃堕棿")
- private Date disposeTime;
+ private Date scrapTime;
/**澶勭疆鐞嗙敱*/
@Excel(name = "澶勭疆鐞嗙敱", width = 15)
@ApiModelProperty(value = "澶勭疆鐞嗙敱")
- private String disposeReason;
+ private String scrapReason;
/**澶勭疆閲戦*/
@Excel(name = "澶勭疆閲戦", width = 15)
@ApiModelProperty(value = "澶勭疆閲戦")
- private java.math.BigDecimal disposeAmount;
+ private java.math.BigDecimal scrapAmount;
/**瀹℃牳浜�*/
@Excel(name = "瀹℃牳浜�", width = 15)
@ApiModelProperty(value = "瀹℃牳浜�")
private String approvalUser;
+ /**瀹℃牳鎰忚*/
+ @Excel(name = "瀹℃牳鎰忚", width = 15)
+ @ApiModelProperty(value = "瀹℃牳鎰忚")
+ private String approvalComment;
/**瀹℃牳鏃堕棿*/
@ApiModelProperty(value = "瀹℃牳鏃堕棿")
private Date approvalTime;
--
Gitblit v1.9.3