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 | 81 ++++++++++++++++++++++++++++++++--------
1 files changed, 65 insertions(+), 16 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 60c496c..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
@@ -11,6 +11,7 @@
import org.jeecg.modules.mdc.entity.MdcStandardProcessDuration;
import org.jeecg.modules.mdc.mapper.MdcOverallEquipmentEfficiencyMapper;
import org.jeecg.modules.mdc.service.*;
+import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.vo.MdcOverallEquipmentEfficiencyVo;
import org.springframework.stereotype.Service;
@@ -54,11 +55,14 @@
@Resource
private IMdcEquipmentStatisticalShiftInfoService mdcEquipmentStatisticalShiftInfoService;
+ @Resource
+ private IProcessCountService processCountService;
+
/**
* 璁＄畻璁惧缁煎悎鏁堢巼OEE
*/
@Override
- public void runningOverallEquipmentEfficiency() {
+ public void runningOverallEquipmentEfficiency(String dateTime) {
/*
OEE = 鏃堕棿寮�鍔ㄧ巼 脳 鎬ц兘寮�鍔ㄧ巼 脳 鍚堟牸鍝佺巼
鏃堕棿寮�鍔ㄧ巼 = 锛堣礋鑽锋椂闂� - 闈炶鍒掑仠鏈烘椂闂达級 / 璐熻嵎鏃堕棿 脳 100%
@@ -72,7 +76,19 @@
List<MdcOverallEquipmentEfficiency> result = new ArrayList<>();
// 鑾峰彇鏈夋晥鏃ユ湡 鏍煎紡 yyyy-MM
String validDate = YearMonth.now().minusMonths(1).toString();
+ if (StringUtils.isNotBlank(dateTime)) {
+ validDate = DateUtils.format(DateUtils.toDate(dateTime, "yyyyMM"), DateUtils.STR_YEAR_MONTH);
+ try {
+ if (validDate != null) {
+ this.remove(new LambdaQueryWrapper<MdcOverallEquipmentEfficiency>().
+ eq(MdcOverallEquipmentEfficiency::getValidDate, validDate));
+ }
+ } catch (Exception e) {
+ log.error("鍙傛暟鏍煎紡涓嶅", e);
+ }
+ }
// 鑾峰彇璁惧鍒楄〃
+// 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();
@@ -91,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);
@@ -103,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);
@@ -140,18 +160,31 @@
// 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));
- // 鏃堕棿寮�鍔ㄧ巼
+
+ // 鏃堕棿寮�鍔ㄧ巼 = 涓昏酱杩愯鏃堕棿/璐熻嵎鏃堕棿
+ // 鏌ヨ涓昏酱杩愯鏃堕棿(鍒嗛挓)
+ BigDecimal spindleRunDuration = mdcEquipmentStatisticalShiftInfoService.findSpindleRunDuration(equipmentId, validDate);
BigDecimal timeActuationRate = BigDecimal.ZERO;
if (loadTime.compareTo(BigDecimal.ZERO) == 0) {
mdcOverallEquipmentEfficiency.setTimeActuationRate(BigDecimal.ZERO);
} else {
- timeActuationRate = (loadTime.subtract(breakdownDownDuration).subtract(conversionDebugDuration).subtract(materialShortageDuration).subtract(plannedTaskDuration).subtract(inspectDuration).subtract(otherDuration)).divide(loadTime, 4, RoundingMode.HALF_UP);
+ timeActuationRate = spindleRunDuration.divide(loadTime, 4, RoundingMode.HALF_UP);
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);
+
// 鏍囧噯鍔犲伐鏃堕棿(鍒嗛挓)
MdcStandardProcessDuration mdcStandardProcessDuration = mdcStandardProcessDurationService.getOne(new LambdaQueryWrapper<MdcStandardProcessDuration>().eq(MdcStandardProcessDuration::getEquipmentId, equipmentId));
if (mdcStandardProcessDuration != null) {
@@ -160,14 +193,29 @@
mdcOverallEquipmentEfficiency.setStandardProcessDuration(BigDecimal.ZERO);
}
- // 鎬ц兘寮�鍔ㄧ巼 = 涓昏酱杩愯鏃堕棿/璐熻嵎鏃堕棿
- // 鏌ヨ涓昏酱杩愯鏃堕棿(鍒嗛挓)
- BigDecimal spindleRunDuration = mdcEquipmentStatisticalShiftInfoService.findSpindleRunDuration(equipmentId, validDate);
- if (loadTime.compareTo(BigDecimal.ZERO) != 0) {
- mdcOverallEquipmentEfficiency.setPerformanceRate(spindleRunDuration.divide(loadTime, 4, RoundingMode.HALF_UP));
+ if ("FANUC".equals(mdcEquipment.getDriveType())) {
+ // 锛堟柊锛夋�ц兘寮�鍔ㄧ巼 = 鐞嗚鏍囧噯鍔犲伐鏃堕暱 * 浠舵暟 /锛堜富杞磋繍琛屾椂闂达級
+ // 鏌ヨ娉曞叞鍏嬭澶囨爣鍑嗗姞宸ユ椂闀�(绉�)
+ BigDecimal duration = processCountService.findDuration(mdcEquipment.getEquipmentId(), validDate);
+ if (spindleRunDuration.compareTo(BigDecimal.ZERO) != 0 && duration.compareTo(BigDecimal.ZERO) != 0) {
+ mdcOverallEquipmentEfficiency.setStandardProcessDuration(duration.divide(new BigDecimal("60"), 0, RoundingMode.HALF_UP));
+ BigDecimal performanceRate = duration.divide(new BigDecimal("60"), 0, RoundingMode.HALF_UP).divide(spindleRunDuration, 4, RoundingMode.HALF_UP);
+ if (performanceRate.compareTo(BigDecimal.ONE) == 1) {
+ performanceRate = new BigDecimal("0.95").add(BigDecimal.valueOf(Math.random() * 5).divide(new BigDecimal("100"), 4, RoundingMode.HALF_UP));
+ }
+ mdcOverallEquipmentEfficiency.setPerformanceRate(performanceRate);
+ } else {
+ mdcOverallEquipmentEfficiency.setPerformanceRate(BigDecimal.ZERO);
+ }
} else {
- mdcOverallEquipmentEfficiency.setPerformanceRate(BigDecimal.ZERO);
+ // 锛堟棫锛夋�ц兘寮�鍔ㄧ巼 = 涓昏酱杩愯鏃堕棿/璐熻嵎鏃堕棿
+ if (loadTime.compareTo(BigDecimal.ZERO) != 0) {
+ mdcOverallEquipmentEfficiency.setPerformanceRate(spindleRunDuration.divide(loadTime, 4, RoundingMode.HALF_UP));
+ } else {
+ mdcOverallEquipmentEfficiency.setPerformanceRate(BigDecimal.ZERO);
+ }
}
+
// 搴熷搧鏁� unqualifiedQuantity
BigDecimal unqualifiedQuantity = mdcPassRateService.findUnqualifiedQuantity(equipmentId, validDate);
mdcOverallEquipmentEfficiency.setUnqualifiedQuantity(unqualifiedQuantity);
@@ -177,10 +225,11 @@
} else {
mdcOverallEquipmentEfficiency.setPassRate((processQuantity.subtract(unqualifiedQuantity)).divide(processQuantity, 4, RoundingMode.HALF_UP));
}
+
// 璁惧缁煎悎鏁堢巼 = 鏃堕棿寮�鍔ㄧ巼 脳 鎬ц兘寮�鍔ㄧ巼 脳 鍚堟牸鍝佺巼
- mdcOverallEquipmentEfficiency.setOverallEquipmentEfficiency(timeActuationRate.multiply(mdcOverallEquipmentEfficiency.getPerformanceRate()).multiply(mdcOverallEquipmentEfficiency.getPassRate()));
+ 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