From 32863d68c09f45cd501fd3db59c7f13e57130fe4 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 10 九月 2025 17:51:36 +0800
Subject: [PATCH] 热处理报工优化
---
src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 a153d3a..1d76dd4 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java
@@ -101,17 +101,17 @@
@Excel(name = "鏄惁閫氳繃榻愬鎬ф鏌�", width = 15, dicCode = "yn")
@Dict(dicCode = "yn")
@ApiModelProperty(value = "鏄惁閫氳繃榻愬鎬ф鏌�")
- private String completenessCheckFlag = CommonConstant.DEFAULT_0;
+ private String completenessCheckFlag;
/**鏄惁閫氳繃璁惧鐐规*/
@Excel(name = "鏄惁閫氳繃璁惧鐐规", width = 15, dicCode = "yn")
@Dict(dicCode = "yn")
@ApiModelProperty(value = "鏄惁閫氳繃璁惧鐐规")
- private String equipmentInspectionFlag = CommonConstant.DEFAULT_0;
+ private String equipmentInspectionFlag;
/**鏄惁閫氳繃宸ヨ壓鐐规*/
@Excel(name = "鏄惁閫氳繃宸ヨ壓鐐规", width = 15, dicCode = "yn")
@Dict(dicCode = "yn")
@ApiModelProperty(value = "鏄惁閫氳繃宸ヨ壓鐐规")
- private String processInspectionFlag = CommonConstant.DEFAULT_0;
+ private String processInspectionFlag;
/**瀹為檯鎶ュ伐鏁伴噺*/
@Excel(name = "瀹為檯鎶ュ伐鏁伴噺", width = 15)
@ApiModelProperty(value = "瀹為檯鎶ュ伐鏁伴噺")
@@ -119,7 +119,7 @@
/**宸茬敓浜ф墭鏁帮紙褰撳墠鐝宸茬敓浜х殑鎵樻暟閲忥紝姣忔鎶ュ伐鏃舵洿鏂帮級*/
@Excel(name = "宸茬敓浜ф墭鏁�", width = 15)
@ApiModelProperty(value = "宸茬敓浜ф墭鏁�")
- private Integer finishedPallets = 0;
+ private Integer finishedPallets;
/**鍙戝竷浜�*/
@Excel(name = "鍙戝竷浜�", width = 15)
@ApiModelProperty(value = "鍙戝竷浜�")
@@ -153,6 +153,10 @@
/**浜х嚎鍚嶇О*/
@TableField(exist = false)
private String factoryName;
+ /**浜х嚎绫诲瀷*/
+ @TableField(exist = false)
+ @Dict(dicCode = "production_type")
+ private String productionType;
/**鐝粍鍚嶇О*/
@TableField(exist = false)
private String groupName;
@@ -162,4 +166,12 @@
/**鐝鍚嶇О*/
@TableField(exist = false)
private String shiftName;
+
+ /**鐢熶骇宸ュ崟*/
+ @TableField(exist = false)
+ private String text;
+
+ /**鐢熶骇宸ュ崟id*/
+ @TableField(exist = false)
+ private String value;
}
--
Gitblit v1.9.3