From df1fb5c1dac2432f6e92173dd1e36023bd55fd7a Mon Sep 17 00:00:00 2001
From: lixiangyu <lixiangyu@xalxzn.com>
Date: 星期一, 18 八月 2025 17:21:54 +0800
Subject: [PATCH] feat(CuttingInbound): 添加订单状态字典注解
---
src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 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..d281e7e 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;
@@ -15,6 +12,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -58,14 +56,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;
/**鎵规鍙�*/
@@ -79,7 +80,7 @@
/**鏁伴噺*/
@Excel(name = "鏁伴噺", width = 15)
@ApiModelProperty(value = "鏁伴噺")
- private Double quantity;
+ private BigDecimal quantity;
/**鎶ュ伐浜�*/
@Excel(name = "鎶ュ伐浜�", width = 15)
@ApiModelProperty(value = "鎶ュ伐浜�")
@@ -92,6 +93,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 +101,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