From 7c77e020b81e42fb65aa966742ff7c93e73668e1 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期一, 26 五月 2025 17:57:55 +0800
Subject: [PATCH] 设备调拨功能增加
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentTransfer.java | 160 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 110 insertions(+), 50 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentTransfer.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentTransfer.java
index 1415cf9..8fc1465 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentTransfer.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentTransfer.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,144 @@
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-13
+ * @Date: 2025-05-13
* @Version: V1.0
*/
@Data
@TableName("eam_equipment_transfer")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@ApiModel(value="eam_equipment_transfer瀵硅薄", description="璁惧褰掑睘鍙樺姩")
+@ApiModel(value = "eam_equipment_transfer瀵硅薄", description = "璁惧褰掑睘鍙樺姩")
public class EamEquipmentTransfer 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 oldDepartId;
- /**璋冨叆閮ㄩ棬*/
- @Excel(name = "璋冨叆閮ㄩ棬", width = 15)
+ @Dict(dicCode = "mdc_production, production_name, id")
+ private String oldDepartId;
+ /**
+ * 璋冨叆閮ㄩ棬
+ */
+ @Excel(name = "璋冨叆閮ㄩ棬", width = 15)
@ApiModelProperty(value = "璋冨叆閮ㄩ棬")
- private String newDepartId;
- /**鐢宠浜�*/
- @Excel(name = "鐢宠浜�", width = 15)
+ @Dict(dicCode = "mdc_production, production_name, id")
+ private String newDepartId;
+ /**
+ * 鐢宠浜�
+ */
+ @Excel(name = "鐢宠浜�", width = 15)
@ApiModelProperty(value = "鐢宠浜�")
- private String reportUser;
- /**鍙樺姩鍘熷洜*/
- @Excel(name = "鍙樺姩鍘熷洜", width = 15)
+ @Dict(dicCode = "sys_user, realname, username")
+ private String reportUser;
+ /**
+ * 鍙樺姩鍘熷洜
+ */
+ @Excel(name = "鍙樺姩鍘熷洜", width = 15)
@ApiModelProperty(value = "鍙樺姩鍘熷洜")
- private String transferReason;
- /**鍙樺姩鐘舵��*/
- @Excel(name = "鍙樺姩鐘舵��", width = 15)
+ private String transferReason;
+ /**
+ * 鍙樺姩鐘舵��
+ */
+ @Excel(name = "鍙樺姩鐘舵��", width = 15)
@ApiModelProperty(value = "鍙樺姩鐘舵��")
- private String transferStatus;
- /**鍙樺姩鏃ユ湡*/
+ @Dict(dicCode = "equipment_transfer_status")
+ private String transferStatus;
+ /**
+ * 鍙樺姩鏃ユ湡
+ */
@ApiModelProperty(value = "鍙樺姩鏃ユ湡")
- private Date transferTime;
- /**瀹℃牳浜�*/
- @Excel(name = "瀹℃牳浜�", width = 15)
+ private Date transferTime;
+ /**
+ * 瀹℃牳浜�
+ */
+ @Excel(name = "瀹℃牳浜�", width = 15)
@ApiModelProperty(value = "瀹℃牳浜�")
- private String approvalUser;
- /**瀹℃牳鏃堕棿*/
+ @Dict(dicCode = "sys_user, realname, username")
+ private String approvalUser;
+ /**
+ * 瀹℃牳绫诲瀷
+ */
+ @ApiModelProperty(value = "瀹℃牳绫诲瀷")
+ @Dict(dicCode = "approved_rejected")
+ private String approvalDealType;
+ /**
+ * 瀹℃牳鎰忚
+ */
+ @ApiModelProperty(value = "瀹℃牳鎰忚")
+ 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