From 45ce8d6fdcd1f8025b11e9e3719b856caa883414 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 08 七月 2024 09:04:46 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentServiceImpl.java | 12 ++++++------
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java | 10 ++++++----
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentServiceImpl.java
index c1de4e2..6f0602d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentServiceImpl.java
@@ -52,25 +52,25 @@
List<WsEquipmentStatus> equipmentStatusList = this.baseMapper.selectEquipmentStatus();
if (equipmentStatusList != null && !equipmentStatusList.isEmpty()) {
for (WsEquipmentStatus wsEquipmentStatus : equipmentStatusList) {
- // 1-鍔犲伐 3-寰呮満 9-鍏虫満 10-鎶ヨ
+ // 1-鍔犲伐 2-寰呮満 3-鍏虫満 4-鎶ヨ
if (wsEquipmentStatus.getEquipmentStatus() != null) {
switch (wsEquipmentStatus.getEquipmentStatus()) {
case "1":
case "2":
- wsEquipmentStatus.setEquipmentStatus("3");
+ wsEquipmentStatus.setEquipmentStatus("2");
break;
case "3":
wsEquipmentStatus.setEquipmentStatus("1");
break;
case "22":
- wsEquipmentStatus.setEquipmentStatus("10");
+ wsEquipmentStatus.setEquipmentStatus("4");
break;
default:
- wsEquipmentStatus.setEquipmentStatus("9");
+ wsEquipmentStatus.setEquipmentStatus("3");
break;
}
} else {
- wsEquipmentStatus.setEquipmentStatus("9");
+ wsEquipmentStatus.setEquipmentStatus("3");
}
}
}
@@ -90,7 +90,7 @@
String equipmentRunTime = wsEquipmentUtilizationRate.getEquipmentRunTime();
wsEquipmentUtilizationRate.setStatisType("D");
wsEquipmentUtilizationRate.setEquipmentRunTime(new BigDecimal(equipmentRunTime).divide(new BigDecimal("60"), 0, RoundingMode.HALF_UP).toString());
- wsEquipmentUtilizationRate.setEquipmentRate(new BigDecimal(equipmentRunTime).divide(new BigDecimal("86400"), 2, RoundingMode.HALF_UP) + "%");
+ wsEquipmentUtilizationRate.setEquipmentRate(new BigDecimal(equipmentRunTime).divide(new BigDecimal("86400"), 2, RoundingMode.HALF_UP).toString());
wsEquipmentUtilizationRate.setEquipmentCalendar(date);
}
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java
index 9c4526c..b722add 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java
@@ -89,7 +89,6 @@
}
}
// 鑾峰彇璁惧鍒楄〃
-// List<MdcEquipment> equipmentList = mdcEquipmentService.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, "2140198"));
List<MdcEquipment> equipmentList = mdcEquipmentService.list();
for (MdcEquipment mdcEquipment : equipmentList) {
String equipmentId = mdcEquipment.getEquipmentId();
@@ -116,7 +115,7 @@
mdcOverallEquipmentEfficiency.setShiftTimeCount(new BigDecimal("8"));
}
- // TODO 璁＄畻鍔犵彮鏃堕棿
+ // 璁＄畻鍔犵彮鏃堕棿
BigDecimal overtime = mdcEquipmentOvertimeService.computeOvertime(equipmentId, validDate);
mdcOverallEquipmentEfficiency.setOvertime(overtime);
@@ -161,7 +160,7 @@
*/
// mdcOverallEquipmentEfficiency.getShiftTimeCount() - plannedMaintenanceDuration - conferenceTrainingDuration - otherRestDuration
// 璐熻嵎鏃堕棿(鍒嗛挓)
- BigDecimal loadTime = mdcOverallEquipmentEfficiency.getMonthActualWorkDayTimeCount().subtract(plannedMaintenanceDuration).subtract(conferenceTrainingDuration).subtract(otherRestDuration);
+ BigDecimal loadTime = mdcOverallEquipmentEfficiency.getMonthActualWorkDayTimeCount().subtract(plannedMaintenanceDuration).subtract(conferenceTrainingDuration).subtract(otherRestDuration).add(overtime);
if (loadTime.compareTo(BigDecimal.ZERO) < 0) {
loadTime = BigDecimal.ZERO;
}
@@ -211,11 +210,14 @@
}
} else {
// 锛堟棫锛夋�ц兘寮�鍔ㄧ巼 = 涓昏酱杩愯鏃堕棿/璐熻嵎鏃堕棿
+ // 锛堟棫锛夋�ц兘寮�鍔ㄧ巼 = 鐝鍐呰繍琛屾椂闂�/涓昏酱杩愯鏃堕棿
if (loadTime.compareTo(BigDecimal.ZERO) != 0) {
- mdcOverallEquipmentEfficiency.setPerformanceRate(spindleRunDuration.divide(loadTime, 4, RoundingMode.HALF_UP));
+// mdcOverallEquipmentEfficiency.setPerformanceRate(spindleRunDuration.divide(loadTime, 4, RoundingMode.HALF_UP));
+ mdcOverallEquipmentEfficiency.setPerformanceRate(BigDecimal.ONE);
} else {
mdcOverallEquipmentEfficiency.setPerformanceRate(BigDecimal.ZERO);
}
+
}
// 搴熷搧鏁� unqualifiedQuantity
--
Gitblit v1.9.3