From 09e22d89710364548fa896917506a372795a7bd3 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 26 一月 2024 09:37:36 +0800
Subject: [PATCH] 加班管理功能调整
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
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 348d6b2..919e18b 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
@@ -107,10 +107,14 @@
mdcOverallEquipmentEfficiency.setShift(shift);
}
- BigDecimal shiftTimeCount = mdcDeviceCalendarService.computeShiftTimeCount(equipmentId, validDate);
- mdcOverallEquipmentEfficiency.setShiftTimeCount(shiftTimeCount);
+// BigDecimal shiftTimeCount = mdcDeviceCalendarService.computeShiftTimeCount(equipmentId, validDate);
+ if (StringUtils.isEmpty(mdcOverallEquipmentEfficiency.getShift())) {
+ mdcOverallEquipmentEfficiency.setShiftTimeCount(BigDecimal.ZERO);
+ } else {
+ mdcOverallEquipmentEfficiency.setShiftTimeCount(new BigDecimal("8"));
+ }
- // 璁＄畻鍔犵彮鏃堕棿
+ // TODO 璁＄畻鍔犵彮鏃堕棿
BigDecimal overtime = mdcEquipmentOvertimeService.computeOvertime(equipmentId, validDate);
mdcOverallEquipmentEfficiency.setOvertime(overtime);
@@ -119,7 +123,7 @@
mdcOverallEquipmentEfficiency.setActualWorkDayCount(actualWorkDayCount);
// 鏈堝害瀹為檯鐝骇鎬绘椂闂�(鍒嗛挓)
- mdcOverallEquipmentEfficiency.setMonthActualWorkDayTimeCount(mdcOverallEquipmentEfficiency.getShiftTimeCount().add(overtime));
+ mdcOverallEquipmentEfficiency.setMonthActualWorkDayTimeCount(mdcOverallEquipmentEfficiency.getShiftTimeCount().multiply(actualWorkDayCount).multiply(new BigDecimal("60")).add(overtime));
// 鏁呴殰鍋滄満鏃堕暱缁熻(鍒嗛挓)
BigDecimal breakdownDownDuration = mdcNoplanCloseService.findNoplanTimeDuration(equipmentId, validDate, MdcConstant.BREAKDOWN_DOWN);
@@ -156,6 +160,9 @@
// mdcOverallEquipmentEfficiency.getShiftTimeCount() - plannedMaintenanceDuration - conferenceTrainingDuration - otherRestDuration
// 璐熻嵎鏃堕棿(鍒嗛挓)
BigDecimal loadTime = mdcOverallEquipmentEfficiency.getShiftTimeCount().subtract(plannedMaintenanceDuration).subtract(conferenceTrainingDuration).subtract(otherRestDuration);
+ if (loadTime.compareTo(BigDecimal.ZERO) < 0) {
+ loadTime = BigDecimal.ZERO;
+ }
mdcOverallEquipmentEfficiency.setLoadTime(loadTime.divide(new BigDecimal("60"), 1, RoundingMode.HALF_UP));
// 鏃堕棿寮�鍔ㄧ巼 = 涓昏酱杩愯鏃堕棿/璐熻嵎鏃堕棿
@@ -169,8 +176,13 @@
mdcOverallEquipmentEfficiency.setTimeActuationRate(timeActuationRate);
}
+ BigDecimal processQuantity;
// 鍔犲伐闆朵欢鏁�(浠�) processQuantity
- BigDecimal processQuantity = mdcPassRateService.findProcessQuantity(equipmentId, validDate);
+ if ("FANUC".equals(mdcEquipment.getDriveType())) {
+ processQuantity = processCountService.findCount(equipmentId, validDate);
+ } else {
+ processQuantity = mdcPassRateService.findProcessQuantity(equipmentId, validDate);
+ }
mdcOverallEquipmentEfficiency.setProcessQuantity(processQuantity);
// 鏍囧噯鍔犲伐鏃堕棿(鍒嗛挓)
@@ -217,7 +229,7 @@
// 璁惧缁煎悎鏁堢巼 = 鏃堕棿寮�鍔ㄧ巼 脳 鎬ц兘寮�鍔ㄧ巼 脳 鍚堟牸鍝佺巼
mdcOverallEquipmentEfficiency.setOverallEquipmentEfficiency(timeActuationRate.multiply(mdcOverallEquipmentEfficiency.getPerformanceRate()).multiply(mdcOverallEquipmentEfficiency.getPassRate()).setScale(4, RoundingMode.HALF_UP));
if (mdcOverallEquipmentEfficiency.getOverallEquipmentEfficiency().compareTo(BigDecimal.ZERO) == 0) {
- mdcOverallEquipmentEfficiency.setOverallEquipmentEfficiency(BigDecimal.ONE);
+ mdcOverallEquipmentEfficiency.setOverallEquipmentEfficiency(BigDecimal.ZERO);
}
result.add(mdcOverallEquipmentEfficiency);
--
Gitblit v1.9.3