diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsReportDeviceEfficiency.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsReportDeviceEfficiency.java index 9ea84660..b9cb2f39 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsReportDeviceEfficiency.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsReportDeviceEfficiency.java @@ -1,12 +1,14 @@ package org.dromara.dms.domain; -import com.baomidou.mybatisplus.annotation.TableName; +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.tenant.core.TenantEntity; +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serial; -import java.util.Date; /** * 设备效率报对象 dms_report_device_efficiency @@ -75,62 +77,62 @@ public class DmsReportDeviceEfficiency extends TenantEntity { /** * 产量(件) */ - private Long outputQty; + private BigDecimal outputQty; /** * 工序标准机时(小时/件) */ - private Long processStdMachineHours; + private BigDecimal processStdMachineHours; /** * 调试时间(小时) */ - private Long debugHours; + private BigDecimal debugHours; /** * 运行时长(小时) */ - private Long runHours; + private BigDecimal runHours; /** * 待机时长(小时) */ - private Long standbyHours; + private BigDecimal standbyHours; /** * 故障时长(小时) */ - private Long faultHours; + private BigDecimal faultHours; /** * 关机时长(小时) */ - private Long shutdownHours; + private BigDecimal shutdownHours; /** * 产出机时(小时)= 产量 × 工序标准机时 */ - private Long outputMachineHours; + private BigDecimal outputMachineHours; /** * 合计时长(小时)= 运行时长 + 待机时长 + 故障时长 */ - private Long totalHours; + private BigDecimal totalHours; /** * 开机率 = (运行时长 + 调试时间) / 合计时长 */ - private Long uptimeRate; + private BigDecimal uptimeRate; /** * 综合效率 = 产出机时 / (运行+待机+故障+关机+调试) */ - private Long overallEfficiency; + private BigDecimal overallEfficiency; /** * 运行效率 = 产出机时 / 运行时长 */ - private Long runtimeEfficiency; + private BigDecimal runtimeEfficiency; /** * 备注 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsReportDeviceEfficiencyBo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsReportDeviceEfficiencyBo.java index f5841b87..9a101fb7 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsReportDeviceEfficiencyBo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsReportDeviceEfficiencyBo.java @@ -8,6 +8,7 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -86,73 +87,73 @@ public class DmsReportDeviceEfficiencyBo extends BaseEntity { * 产量(件) */ @NotNull(message = "产量(件)不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long outputQty; + private BigDecimal outputQty; /** * 工序标准机时(小时/件) */ @NotNull(message = "工序标准机时(小时/件)不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long processStdMachineHours; + private BigDecimal processStdMachineHours; /** * 调试时间(小时) */ @NotNull(message = "调试时间(小时)不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long debugHours; + private BigDecimal debugHours; /** * 运行时长(小时) */ @NotNull(message = "运行时长(小时)不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long runHours; + private BigDecimal runHours; /** * 待机时长(小时) */ @NotNull(message = "待机时长(小时)不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long standbyHours; + private BigDecimal standbyHours; /** * 故障时长(小时) */ @NotNull(message = "故障时长(小时)不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long faultHours; + private BigDecimal faultHours; /** * 关机时长(小时) */ @NotNull(message = "关机时长(小时)不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long shutdownHours; + private BigDecimal shutdownHours; /** * 产出机时(小时)= 产量 × 工序标准机时 */ @NotNull(message = "产出机时(小时)= 产量 × 工序标准机时不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long outputMachineHours; + private BigDecimal outputMachineHours; /** * 合计时长(小时)= 运行时长 + 待机时长 + 故障时长 */ @NotNull(message = "合计时长(小时)= 运行时长 + 待机时长 + 故障时长不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long totalHours; + private BigDecimal totalHours; /** * 开机率 = (运行时长 + 调试时间) / 合计时长 */ @NotNull(message = "开机率 = (运行时长 + 调试时间) / 合计时长不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long uptimeRate; + private BigDecimal uptimeRate; /** * 综合效率 = 产出机时 / (运行+待机+故障+关机+调试) */ @NotNull(message = "综合效率 = 产出机时 / (运行+待机+故障+关机+调试)不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long overallEfficiency; + private BigDecimal overallEfficiency; /** * 运行效率 = 产出机时 / 运行时长 */ @NotNull(message = "运行效率 = 产出机时 / 运行时长不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long runtimeEfficiency; + private BigDecimal runtimeEfficiency; /** * 备注 diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsReportDeviceEfficiencyVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsReportDeviceEfficiencyVo.java index da6706aa..52f4b63a 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsReportDeviceEfficiencyVo.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsReportDeviceEfficiencyVo.java @@ -1,5 +1,6 @@ package org.dromara.dms.domain.vo; +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import org.dromara.dms.domain.DmsReportDeviceEfficiency; @@ -99,81 +100,81 @@ public class DmsReportDeviceEfficiencyVo implements Serializable { */ @ExcelProperty(value = "产量", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "件=") - private Long outputQty; + private BigDecimal outputQty; /** * 工序标准机时(小时/件) */ @ExcelProperty(value = "工序标准机时", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "小=时/件") - private Long processStdMachineHours; + private BigDecimal processStdMachineHours; /** * 调试时间(小时) */ @ExcelProperty(value = "调试时间", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "小=时") - private Long debugHours; + private BigDecimal debugHours; /** * 运行时长(小时) */ @ExcelProperty(value = "运行时长", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "小=时") - private Long runHours; + private BigDecimal runHours; /** * 待机时长(小时) */ @ExcelProperty(value = "待机时长", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "小=时") - private Long standbyHours; + private BigDecimal standbyHours; /** * 故障时长(小时) */ @ExcelProperty(value = "故障时长", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "小=时") - private Long faultHours; + private BigDecimal faultHours; /** * 关机时长(小时) */ @ExcelProperty(value = "关机时长", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "小=时") - private Long shutdownHours; + private BigDecimal shutdownHours; /** * 产出机时(小时)= 产量 × 工序标准机时 */ @ExcelProperty(value = "产出机时", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "小=时") - private Long outputMachineHours; + private BigDecimal outputMachineHours; /** * 合计时长(小时)= 运行时长 + 待机时长 + 故障时长 */ @ExcelProperty(value = "合计时长", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "小=时") - private Long totalHours; + private BigDecimal totalHours; /** * 开机率 = (运行时长 + 调试时间) / 合计时长 */ @ExcelProperty(value = "开机率 = (运行时长 + 调试时间) / 合计时长") - private Long uptimeRate; + private BigDecimal uptimeRate; /** * 综合效率 = 产出机时 / (运行+待机+故障+关机+调试) */ @ExcelProperty(value = "综合效率 = 产出机时 / (运行+待机+故障+关机+调试)") - private Long overallEfficiency; + private BigDecimal overallEfficiency; /** * 运行效率 = 产出机时 / 运行时长 */ @ExcelProperty(value = "运行效率 = 产出机时 / 运行时长") - private Long runtimeEfficiency; + private BigDecimal runtimeEfficiency; /** * 备注