From dff404ac7e0571e7033a42ed189529e70fdc09ee Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 05 六月 2025 17:47:02 +0800
Subject: [PATCH] 备件借用归还
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartReceive.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartReceive.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartReceive.java
index 6d00c6e..12d2b8a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartReceive.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartReceive.java
@@ -1,16 +1,21 @@
package org.jeecg.modules.eam.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* @Description: 澶囧搧澶囦欢棰嗙敤鍗�
@@ -31,8 +36,8 @@
* 鍒犻櫎鏍囪
*/
@Excel(name = "鍒犻櫎鏍囪", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鏍囪")
- private Integer delFlag;
+ @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
+ private Integer delFlag = CommonConstant.DEL_FLAG_0;
/**
* 棰嗙敤鍗曠紪鐮�
*/
@@ -56,12 +61,14 @@
*/
@Excel(name = "棰嗙敤鐘舵��", width = 15)
@ApiModelProperty(value = "棰嗙敤鐘舵��")
+ @Dict(dicCode = "receive_status")
private String receiveStatus;
/**
* 鏄惁闇�瑕佸綊杩�;鏄細瀛樺湪褰掕繕鍔ㄤ綔锛屽惁锛氱洿鎺ュ畬鎴�
*/
@Excel(name = "鏄惁闇�瑕佸綊杩�;鏄細瀛樺湪褰掕繕鍔ㄤ綔锛屽惁锛氱洿鎺ュ畬鎴�", width = 15)
@ApiModelProperty(value = "鏄惁闇�瑕佸綊杩�;鏄細瀛樺湪褰掕繕鍔ㄤ綔锛屽惁锛氱洿鎺ュ畬鎴�")
+ @Dict(dicCode = "give_back_flag")
private String giveBackFlag;
/**
* 瀹℃牳浜�
@@ -80,4 +87,17 @@
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
+
+ /**
+ * 澶囦欢棰嗙敤鏄庣粏鍗�
+ */
+ @TableField(exist = false)
+ private List<Map<String, Object>> sparePartReceiveDetailList;
+
+ @TableField(exist = false)
+ private List<EamSparePartReceiveDetail> sparePartReceiveDetails;
+
+ @TableField(exist = false)
+ private List<EamSparePartReceiveDetail> removeDetailList;
+
}
--
Gitblit v1.9.3