From 21cbdad6f59a045910b22bb3bf771e47d56c096f Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 13 六月 2025 11:36:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartScrap.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartScrap.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartScrap.java
index a281cf2..23aeae2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartScrap.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartScrap.java
@@ -1,11 +1,15 @@
package org.jeecg.modules.eam.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -32,8 +36,10 @@
* 鍒犻櫎鏍囪
*/
@Excel(name = "鍒犻櫎鏍囪", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鏍囪")
- private Integer delFlag;
+ @JsonIgnore
+ @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", hidden = true)
+ @TableLogic
+ private Integer delFlag = CommonConstant.DEL_FLAG_0;
/**
* 鍗曟嵁鍙�
*/
@@ -41,11 +47,11 @@
@ApiModelProperty(value = "鍗曟嵁鍙�")
private String scrapCode;
/**
- * 搴撳瓨ID
+ * 澶囦欢ID
*/
- @Excel(name = "搴撳瓨ID", width = 15)
- @ApiModelProperty(value = "搴撳瓨ID")
- private String inventoryId;
+ @Excel(name = "澶囦欢ID", width = 15)
+ @ApiModelProperty(value = "澶囦欢ID")
+ private String sparePartsId;
/**
* 鎶ュ簾鍘熷洜
*/
@@ -58,6 +64,13 @@
@Excel(name = "鎶ュ簾鏁伴噺", width = 15)
@ApiModelProperty(value = "鎶ュ簾鏁伴噺")
private BigDecimal scrapNum;
+
+ /**
+ * 鎶ュ簾鍗曠姸鎬� 1锛氬緟鎶ュ簾锛�2锛氬凡鎶ュ簾
+ */
+ @Excel(name = "鎶ュ簾鍗曠姸鎬� 1锛氬緟鎶ュ簾锛�2锛氬凡鎶ュ簾", width = 15)
+ @ApiModelProperty(value = "鎶ュ簾鍗曠姸鎬� 1锛氬緟鎶ュ簾锛�2锛氬凡鎶ュ簾")
+ private String scrapStatus;
/**
* 鐢宠浜�
*/
@@ -75,4 +88,13 @@
*/
@ApiModelProperty(value = "瀹℃牳鏃堕棿")
private Date approvalTime;
+
+ @TableField(exist = false)
+ private String partCode;
+ @TableField(exist = false)
+ private String partName;
+ @TableField(exist = false)
+ private String partModel;
+ @TableField(exist = false)
+ private String partSpecification;
}
--
Gitblit v1.9.3