From 5e6c3ac5d7c7a2702a0bad5195e954c9e95d2306 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期日, 15 六月 2025 17:55:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/PreparationOrderDetail.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/PreparationOrderDetail.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/PreparationOrderDetail.java
index 2865536..b8f107d 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/PreparationOrderDetail.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/PreparationOrderDetail.java
@@ -2,10 +2,13 @@
import java.io.Serializable;
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 lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.util.Date;
@@ -19,6 +22,7 @@
* @Version: V1.0
*/
@Data
+@Accessors(chain = true)
@TableName("tms_preparation_order_detail")
@ApiModel(value="tms_preparation_order_detail瀵硅薄", description="鍒�鍏峰噯澶囧崟鏄庣粏")
public class PreparationOrderDetail implements Serializable {
@@ -33,7 +37,7 @@
private String preparationOrderId;
/**鍒�鍏风紪鐮�*/
@Excel(name = "鍒�鍏风紪鐮�", width = 15)
- @ApiModelProperty(value = "鍒�鍏风紪鐮�")
+ @ApiModelProperty(value = "鍒�鍏风紪鐮�(tms_base_tool琛╥d瀛楁)")
private String toolCode;
/**鍒�鍏风紪鍙�*/
@Excel(name = "鍒�鍏风紪鍙�", width = 15)
@@ -63,4 +67,34 @@
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "鏇存柊鏃堕棿")
private Date updateTime;
+
+ /**鍒�鍏风紪鐮�(tms_base_tool琛╰ool_code瀛楁)*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍒�鍏风紪鐮�(tms_base_tool琛╰ool_code瀛楁)")
+ private String toolNum;
+ /**涓枃鍚嶇О*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "涓枃鍚嶇О")
+ private String chineseName;
+ /**鍨嬪彿/鍥惧彿*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍨嬪彿/鍥惧彿")
+ private String toolModel;
+ /**宸ュ叿绫诲瀷*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "宸ュ叿绫诲瀷")
+ @Dict(dicCode = "application_type")
+ private String applicationType;
+ /**鍒�鍏锋潗鏂�*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍒�鍏锋潗鏂�")
+ private String toolMaterial;
+ /**闆朵欢鏉愭枡*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "闆朵欢鏉愭枡")
+ private String partMaterial;
+ /**鍘傚*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍘傚")
+ private String supplierId;
}
--
Gitblit v1.9.3