From 3ca99a04cff5dc72a8f1a4b4448ca592f915237f Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期六, 09 八月 2025 17:47:28 +0800
Subject: [PATCH] 生产管控 排产功能接口调整
---
src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java b/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java
index 2013fab..efccd0d 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.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;
@@ -11,6 +8,7 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -55,7 +53,7 @@
@Excel(name = "鍒犻櫎鏍囪", width = 15)
@ApiModelProperty(value = "鍒犻櫎鏍囪")
@TableLogic
- private Integer delFlag;
+ private Integer delFlag = CommonConstant.DEL_FLAG_0;
/**宸ュ崟鍙�(浠诲姟鍙�)*/
@Excel(name = "宸ュ崟鍙�(浠诲姟鍙�)", width = 15)
@ApiModelProperty(value = "宸ュ崟鍙�(浠诲姟鍙�)")
@@ -74,25 +72,28 @@
private Double planQuantity;
/**浜х嚎ID(鍐椾綑)*/
@Excel(name = "浜х嚎ID(鍐椾綑)", width = 15)
+ @Dict(dictTable = "base_factory", dicCode = "id", dicText = "factory_name")
@ApiModelProperty(value = "浜х嚎ID(鍐椾綑)")
private String factoryId;
/**鐝粍ID*/
@Excel(name = "鐝粍ID", width = 15)
+ @Dict(dictTable = "base_shift_group", dicCode = "id", dicText = "group_name")
@ApiModelProperty(value = "鐝粍ID")
private String groupId;
/**鐝ID(鍐椾綑)*/
@Excel(name = "鐝ID(鍐椾綑)", width = 15)
+ @Dict(dictTable = "base_shift", dicCode = "id", dicText = "shift_name")
@ApiModelProperty(value = "鐝ID(鍐椾綑)")
private String shiftId;
/**鎺掍骇鏃ユ湡*/
- @Excel(name = "鎺掍骇鏃ユ湡", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鎺掍骇鏃ユ湡", width = 20, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "鎺掍骇鏃ユ湡")
private Date workOrderDate;
/**宸ュ崟鐘舵��*/
- @Excel(name = "宸ュ崟鐘舵��", width = 15, dicCode = "work_order_status")
- @Dict(dicCode = "work_order_status")
+ @Excel(name = "宸ュ崟鐘舵��", width = 15, dicCode = "mes_work_order_status")
+ @Dict(dicCode = "mes_work_order_status")
@ApiModelProperty(value = "宸ュ崟鐘舵��")
private String workOrderStatus;
/**瀹為檯鎶ュ伐鏁伴噺*/
@@ -102,6 +103,7 @@
/**鍙戝竷浜�*/
@Excel(name = "鍙戝竷浜�", width = 15)
@ApiModelProperty(value = "鍙戝竷浜�")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String publisher;
/**鍙戝竷鏃堕棿*/
@Excel(name = "鍙戝竷鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@@ -112,6 +114,7 @@
/**閲嶅彂甯冧汉*/
@Excel(name = "閲嶅彂甯冧汉", width = 15)
@ApiModelProperty(value = "閲嶅彂甯冧汉")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String republisher;
/**閲嶅彂甯冩椂闂�*/
@Excel(name = "閲嶅彂甯冩椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@@ -119,4 +122,24 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "閲嶅彂甯冩椂闂�")
private Date republishTime;
+ /**閲嶅彂甯冨師鍥�*/
+ @Excel(name = "閲嶅彂甯冨師鍥�", width = 30)
+ @ApiModelProperty(value = "閲嶅彂甯冨師鍥�")
+ private String republishReason;
+
+ /**浜х嚎缂栫爜*/
+ @TableField(exist = false)
+ private String factoryCode;
+ /**浜х嚎鍚嶇О*/
+ @TableField(exist = false)
+ private String factoryName;
+ /**鐝粍鍚嶇О*/
+ @TableField(exist = false)
+ private String groupName;
+ /**鐝缂栫爜*/
+ @TableField(exist = false)
+ private String shiftCode;
+ /**鐝鍚嶇О*/
+ @TableField(exist = false)
+ private String shiftName;
}
--
Gitblit v1.9.3