From 178278bf8d570ace8cc59ee865035b49333a4421 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期二, 27 五月 2025 17:32:25 +0800
Subject: [PATCH] 设备报废功能增加
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java | 159 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 109 insertions(+), 50 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java
index 1cf0b3c..8d245d6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -8,85 +9,143 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
import java.util.Date;
+
/**
* @Description: 璁惧鎶ュ簾(杞)
* @Author: jeecg-boot
- * @Date: 2025-05-15
+ * @Date: 2025-05-15
* @Version: V1.0
*/
@Data
@TableName("eam_equipment_scrap")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@ApiModel(value="eam_equipment_scrap瀵硅薄", description="璁惧鎶ュ簾(杞)")
+@ApiModel(value = "eam_equipment_scrap瀵硅薄", description = "璁惧鎶ュ簾(杞)")
public class EamEquipmentScrap implements Serializable {
-
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
+
+ /**
+ * 涓婚敭
+ */
+ @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
- private String id;
- /**鍒涘缓浜�*/
- @Excel(name = "鍒涘缓浜�", width = 15)
+ private String id;
+ /**
+ * 鍒涘缓浜�
+ */
+ @Excel(name = "鍒涘缓浜�", width = 15)
@ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
+ private String createBy;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**鏇存柊浜�*/
- @Excel(name = "鏇存柊浜�", width = 15)
+ private Date createTime;
+ /**
+ * 鏇存柊浜�
+ */
+ @Excel(name = "鏇存柊浜�", width = 15)
@ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃堕棿*/
+ private String updateBy;
+ /**
+ * 鏇存柊鏃堕棿
+ */
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
- /**鍒犻櫎鏍囪*/
- @Excel(name = "鍒犻櫎鏍囪", width = 15)
+ private Date updateTime;
+ /**
+ * 鍒犻櫎鏍囪
+ */
+ @Excel(name = "鍒犻櫎鏍囪", width = 15)
@ApiModelProperty(value = "鍒犻櫎鏍囪")
- private Integer delFlag;
- /**鍗曟嵁鍙�*/
- @Excel(name = "鍗曟嵁鍙�", width = 15)
+ private Integer delFlag;
+ /**
+ * 鍗曟嵁鍙�
+ */
+ @Excel(name = "鍗曟嵁鍙�", width = 15)
@ApiModelProperty(value = "鍗曟嵁鍙�")
- private String code;
- /**璁惧ID*/
- @Excel(name = "璁惧ID", width = 15)
+ private String code;
+ /**
+ * 璁惧ID
+ */
+ @Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
- private String equipmentId;
- /**杞/鎶ュ簾*/
- @Excel(name = "杞/鎶ュ簾", width = 15)
+ private String equipmentId;
+ /**
+ * 杞/鎶ュ簾
+ */
+ @Excel(name = "杞/鎶ュ簾", width = 15)
@ApiModelProperty(value = "杞/鎶ュ簾")
- private String scrapType;
- /**鐢宠浜�*/
- @Excel(name = "鐢宠浜�", width = 15)
+ @Dict(dicCode = "scrap_sell")
+ private String scrapType;
+ /**
+ * 鐢宠浜�
+ */
+ @Excel(name = "鐢宠浜�", width = 15)
@ApiModelProperty(value = "鐢宠浜�")
- private String reportUser;
- /**澶勭疆鏃堕棿*/
+ @Dict(dicCode = "sys_user, realname, username")
+ private String reportUser;
+ /**
+ * 澶勭疆鏃堕棿
+ */
@ApiModelProperty(value = "澶勭疆鏃堕棿")
- private Date scrapTime;
- /**澶勭疆鐞嗙敱*/
- @Excel(name = "澶勭疆鐞嗙敱", width = 15)
+ private Date scrapTime;
+ /**
+ * 澶勭疆鐞嗙敱
+ */
+ @Excel(name = "澶勭疆鐞嗙敱", width = 15)
@ApiModelProperty(value = "澶勭疆鐞嗙敱")
- private String scrapReason;
- /**澶勭疆閲戦*/
- @Excel(name = "澶勭疆閲戦", width = 15)
+ private String scrapReason;
+ /**
+ * 澶勭疆閲戦
+ */
+ @Excel(name = "澶勭疆閲戦", width = 15)
@ApiModelProperty(value = "澶勭疆閲戦")
- private java.math.BigDecimal scrapAmount;
- /**瀹℃牳浜�*/
- @Excel(name = "瀹℃牳浜�", width = 15)
+ private java.math.BigDecimal scrapAmount;
+ /**
+ * 鎶ュ簾鐘舵��
+ */
+ @Excel(name = "鎶ュ簾鐘舵��", width = 15)
+ @ApiModelProperty(value = "鎶ュ簾鐘舵��")
+ @Dict(dicCode = "equipment_scrap_status")
+ private String scrapStatus;
+ /**
+ * 瀹℃牳浜�
+ */
+ @Excel(name = "瀹℃牳浜�", width = 15)
@ApiModelProperty(value = "瀹℃牳浜�")
- private String approvalUser;
- /**瀹℃牳鎰忚*/
- @Excel(name = "瀹℃牳鎰忚", width = 15)
+ @Dict(dicCode = "sys_user, realname, username")
+ private String approvalUser;
+ /**
+ * 瀹℃牳绫诲瀷
+ */
+ @Excel(name = "瀹℃牳绫诲瀷", width = 15)
+ @ApiModelProperty(value = "瀹℃牳绫诲瀷")
+ private String approvalDealType;
+ /**
+ * 瀹℃牳鎰忚
+ */
+ @Excel(name = "瀹℃牳鎰忚", width = 15)
@ApiModelProperty(value = "瀹℃牳鎰忚")
- private String approvalComment;
- /**瀹℃牳鏃堕棿*/
+ private String approvalComment;
+ /**
+ * 瀹℃牳鏃堕棿
+ */
@ApiModelProperty(value = "瀹℃牳鏃堕棿")
- private Date approvalTime;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
+ private Date approvalTime;
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
- private String remark;
+ private String remark;
+
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
}
--
Gitblit v1.9.3