From 5d73eadd31ee11766818bbce0ff625a98a9ad9f2 Mon Sep 17 00:00:00 2001
From: houshuai <17802598606@163.com>
Date: 星期四, 10 七月 2025 14:54:20 +0800
Subject: [PATCH] 生产管控模块 基本搭建3
---
src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java b/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java
index 36fb341..d95a708 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java
@@ -1,9 +1,6 @@
package org.jeecg.modules.mes.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -58,14 +55,17 @@
private Integer delFlag;
/**璁㈠崟ID*/
@Excel(name = "璁㈠崟ID", width = 15)
+ @Dict(dictTable = "mes_production_order", dicCode = "id", dicText = "order_code")
@ApiModelProperty(value = "璁㈠崟ID")
private String orderId;
/**宸ュ崟ID*/
@Excel(name = "宸ュ崟ID", width = 15)
+ @Dict(dictTable = "mes_production_work_order", dicCode = "id", dicText = "work_order_code")
@ApiModelProperty(value = "宸ュ崟ID")
private String workOrderId;
/**浜х嚎ID*/
@Excel(name = "浜х嚎ID", width = 15)
+ @Dict(dictTable = "base_factory", dicCode = "id", dicText = "factory_name")
@ApiModelProperty(value = "浜х嚎ID")
private String factoryId;
/**鎵规鍙�*/
@@ -92,6 +92,7 @@
private Date reportTime;
/**绾胯竟浠揑D*/
@Excel(name = "绾胯竟浠揑D", width = 15)
+ @Dict(dictTable = "base_line_side_warehouse", dicCode = "id", dicText = "warehouse_name")
@ApiModelProperty(value = "绾胯竟浠揑D")
private String warehouseId;
/**鎴愬搧涓嬬嚎鎵撳嵃鐘舵��*/
@@ -99,4 +100,18 @@
@Dict(dicCode = "print_status")
@ApiModelProperty(value = "鎴愬搧涓嬬嚎鎵撳嵃鐘舵��")
private String printStatus;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璁㈠崟鐢熶骇鍙�")
+ private String orderCode;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "宸ュ崟鍙�")
+ private String workOrderCode;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "浜х嚎鍚嶇О")
+ private String factoryName;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "浠撳簱鍚嶇О")
+ private String warehouseName;
+
}
--
Gitblit v1.9.3