From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 10 七月 2025 10:43:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcOverallEquipmentEfficiency.java | 50 +++++++++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcOverallEquipmentEfficiency.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcOverallEquipmentEfficiency.java
index 0736092..6f02af1 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcOverallEquipmentEfficiency.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcOverallEquipmentEfficiency.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.mdc.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -38,6 +39,13 @@
@ApiModelProperty(value = "璁惧鍚嶇О")
private String equipmentName;
/**
+ * 杞﹂棿鍚嶇О
+ */
+ @Excel(name = "杞﹂棿鍚嶇О", width = 15)
+ @ApiModelProperty(value = "杞﹂棿鍚嶇О")
+ @TableField(exist = false)
+ private String productionName;
+ /**
* 璁惧鍨嬪彿
*/
@Excel(name = "璁惧鍨嬪彿", width = 15)
@@ -59,126 +67,126 @@
*/
@Excel(name = "姣忕彮灏忔椂", width = 15)
@ApiModelProperty(value = "姣忕彮灏忔椂")
- private BigDecimal shiftTimeCount;
+ private BigDecimal shiftTimeCount = BigDecimal.ZERO;
/**
* 鍔犵彮鏃堕棿
*/
@Excel(name = "鍔犵彮鏃堕棿", width = 15)
@ApiModelProperty(value = "鍔犵彮鏃堕棿")
- private BigDecimal overtime;
+ private BigDecimal overtime = BigDecimal.ZERO;
/**
* 瀹為檯鐝骇澶╂暟
*/
@Excel(name = "瀹為檯鐝骇澶╂暟", width = 15)
@ApiModelProperty(value = "瀹為檯鐝骇澶╂暟")
- private BigDecimal actualWorkDayCount;
+ private BigDecimal actualWorkDayCount = BigDecimal.ZERO;
/**
* 鏈堝害瀹為檯鐝骇鎬绘椂闂�
*/
@Excel(name = "鏈堝害瀹為檯鐝骇鎬绘椂闂�", width = 15)
@ApiModelProperty(value = "鏈堝害瀹為檯鐝骇鎬绘椂闂�")
- private BigDecimal monthActualWorkDayTimeCount;
+ private BigDecimal monthActualWorkDayTimeCount = BigDecimal.ZERO;
/**
* 鏁呴殰鍋滄満鏃堕暱(鍒嗛挓)
*/
@Excel(name = "鏁呴殰鍋滄満鏃堕暱", width = 15)
@ApiModelProperty(value = "鏁呴殰鍋滄満鏃堕暱(鍒嗛挓)")
- private BigDecimal breakdownDownDuration;
+ private BigDecimal breakdownDownDuration = BigDecimal.ZERO;
/**
* 鎹㈠瀷璋冭瘯鏃堕暱(鍒嗛挓)
*/
@Excel(name = "鎹㈠瀷璋冭瘯鏃堕暱(鍒嗛挓)", width = 15)
@ApiModelProperty(value = "鎹㈠瀷璋冭瘯鏃堕暱(鍒嗛挓)")
- private BigDecimal conversionDebugDuration;
+ private BigDecimal conversionDebugDuration = BigDecimal.ZERO;
/**
* 鐗╂枡鐭己鏃堕暱(鍒嗛挓)
*/
@Excel(name = "鐗╂枡鐭己鏃堕暱(鍒嗛挓)", width = 15)
@ApiModelProperty(value = "鐗╂枡鐭己鏃堕暱(鍒嗛挓)")
- private BigDecimal materialShortageDuration;
+ private BigDecimal materialShortageDuration = BigDecimal.ZERO;
/**
* 璁″垝绛変换鍔�(鍒嗛挓)
*/
@Excel(name = "璁″垝绛変换鍔�(鍒嗛挓)", width = 15)
@ApiModelProperty(value = "璁″垝绛変换鍔�(鍒嗛挓)")
- private BigDecimal plannedTaskDuration;
+ private BigDecimal plannedTaskDuration = BigDecimal.ZERO;
/**
* 妫�楠�(鍒嗛挓)
*/
@Excel(name = "妫�楠�(鍒嗛挓)", width = 15)
@ApiModelProperty(value = "妫�楠�(鍒嗛挓)")
- private BigDecimal inspectDuration;
+ private BigDecimal inspectDuration = BigDecimal.ZERO;
/**
* 鍏朵粬(鍒嗛挓)
*/
@Excel(name = "鍏朵粬(鍒嗛挓)", width = 15)
@ApiModelProperty(value = "鍏朵粬(鍒嗛挓)")
- private BigDecimal otherDuration;
+ private BigDecimal otherDuration = BigDecimal.ZERO;
/**
* 璁″垝淇濆吇
*/
@Excel(name = "璁″垝淇濆吇", width = 15)
@ApiModelProperty(value = "璁″垝淇濆吇")
- private BigDecimal plannedMaintenanceDuration;
+ private BigDecimal plannedMaintenanceDuration = BigDecimal.ZERO;
/**
* 浼氳鍩硅鏃堕暱
*/
@Excel(name = "浼氳鍩硅鏃堕暱", width = 15)
@ApiModelProperty(value = "浼氳鍩硅鏃堕暱")
- private BigDecimal conferenceTrainingDuration;
+ private BigDecimal conferenceTrainingDuration = BigDecimal.ZERO;
/**
* 鍏朵粬浼戞伅鏃堕暱
*/
@Excel(name = "鍏朵粬浼戞伅鏃堕暱", width = 15)
@ApiModelProperty(value = "鍏朵粬浼戞伅鏃堕暱")
- private BigDecimal otherRestDuration;
+ private BigDecimal otherRestDuration = BigDecimal.ZERO;
/**
* 璐熻嵎鏃堕棿
*/
@Excel(name = "璐熻嵎鏃堕棿", width = 15)
@ApiModelProperty(value = "璐熻嵎鏃堕棿")
- private BigDecimal loadTime;
+ private BigDecimal loadTime = BigDecimal.ZERO;
/**
* 鏃堕棿寮�鍔ㄧ巼
*/
@Excel(name = "鏃堕棿寮�鍔ㄧ巼", width = 15)
@ApiModelProperty(value = "鏃堕棿寮�鍔ㄧ巼")
- private BigDecimal timeActuationRate;
+ private BigDecimal timeActuationRate = BigDecimal.ZERO;
/**
* 鍔犲伐闆朵欢鏁�
*/
@Excel(name = "鍔犲伐闆朵欢鏁�", width = 15)
@ApiModelProperty(value = "鍔犲伐闆朵欢鏁�")
- private BigDecimal processQuantity;
+ private BigDecimal processQuantity = BigDecimal.ZERO;
/**
* 鏍囧噯鍔犲伐鏃堕棿(鍒嗛挓)
*/
@Excel(name = "鏍囧噯鍔犲伐鏃堕棿(鍒嗛挓)", width = 15)
@ApiModelProperty(value = "鏍囧噯鍔犲伐鏃堕棿(鍒嗛挓)")
- private BigDecimal standardProcessDuration;
+ private BigDecimal standardProcessDuration = BigDecimal.ZERO;
/**
* 鎬ц兘寮�鍔ㄧ巼
*/
@Excel(name = "鎬ц兘寮�鍔ㄧ巼", width = 15)
@ApiModelProperty(value = "鎬ц兘寮�鍔ㄧ巼")
- private BigDecimal performanceRate;
+ private BigDecimal performanceRate = BigDecimal.ZERO;
/**
* 搴熷搧鏁�
*/
@Excel(name = "搴熷搧鏁�", width = 15)
@ApiModelProperty(value = "搴熷搧鏁�")
- private BigDecimal unqualifiedQuantity;
+ private BigDecimal unqualifiedQuantity = BigDecimal.ZERO;
/**
* 鍚堟牸鐜�
*/
@Excel(name = "鍚堟牸鐜�", width = 15)
@ApiModelProperty(value = "鍚堟牸鐜�")
- private BigDecimal passRate;
+ private BigDecimal passRate = BigDecimal.ONE;
/**
* 璁惧缁煎悎鏁堢巼
*/
@Excel(name = "璁惧缁煎悎鏁堢巼", width = 15)
@ApiModelProperty(value = "璁惧缁煎悎鏁堢巼")
- private BigDecimal overallEquipmentEfficiency;
+ private BigDecimal overallEquipmentEfficiency = BigDecimal.ONE;
}
--
Gitblit v1.9.3