From 0bd71968ff07a70c421a0f41a642742fedf125bd Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 31 七月 2024 10:29:14 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 12 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 9c4526c..e1f8fc0 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
@@ -8,11 +8,12 @@
import org.jeecg.modules.mdc.constant.MdcConstant;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcOverallEquipmentEfficiency;
-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.jeecg.modules.system.entity.MdcProduction;
+import org.jeecg.modules.system.service.IMdcProductionService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -59,6 +60,9 @@
@Resource
private IProcessCountService processCountService;
+ @Resource
+ private IMdcProductionService mdcProductionService;
+
/**
* 璁＄畻璁惧缁煎悎鏁堢巼OEE
*/
@@ -89,7 +93,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();
@@ -100,6 +103,8 @@
mdcOverallEquipmentEfficiency.setEquipmentName(mdcEquipment.getEquipmentName());
mdcOverallEquipmentEfficiency.setEquipmentModel(mdcEquipment.getEquipmentModel());
mdcOverallEquipmentEfficiency.setValidDate(validDate);
+ //
+// mdcOverallEquipmentEfficiency.setProductionName();
// 鏌ヨ鐝埗鍒嗙被
List<String> shiftSubIdList = mdcDeviceCalendarService.findShiftSort(equipmentId, validDate);
@@ -116,7 +121,7 @@
mdcOverallEquipmentEfficiency.setShiftTimeCount(new BigDecimal("8"));
}
- // TODO 璁＄畻鍔犵彮鏃堕棿
+ // 璁＄畻鍔犵彮鏃堕棿
BigDecimal overtime = mdcEquipmentOvertimeService.computeOvertime(equipmentId, validDate);
mdcOverallEquipmentEfficiency.setOvertime(overtime);
@@ -161,7 +166,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;
}
@@ -188,12 +193,8 @@
mdcOverallEquipmentEfficiency.setProcessQuantity(processQuantity);
// 鏍囧噯鍔犲伐鏃堕棿(鍒嗛挓)
- MdcStandardProcessDuration mdcStandardProcessDuration = mdcStandardProcessDurationService.getOne(new LambdaQueryWrapper<MdcStandardProcessDuration>().eq(MdcStandardProcessDuration::getEquipmentId, equipmentId));
- if (mdcStandardProcessDuration != null) {
- mdcOverallEquipmentEfficiency.setStandardProcessDuration(new BigDecimal(mdcStandardProcessDuration.getDuration()).multiply(processQuantity));
- } else {
- mdcOverallEquipmentEfficiency.setStandardProcessDuration(BigDecimal.ZERO);
- }
+ BigDecimal standardProcessDuration = mdcStandardProcessDurationService.findByEquipmentId(equipmentId, validDate);
+ mdcOverallEquipmentEfficiency.setStandardProcessDuration(standardProcessDuration);
if ("FANUC".equals(mdcEquipment.getDriveType())) {
// 锛堟柊锛夋�ц兘寮�鍔ㄧ巼 = 鐞嗚鏍囧噯鍔犲伐鏃堕暱 * 浠舵暟 /锛堜富杞磋繍琛屾椂闂达級
@@ -211,11 +212,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
@@ -290,6 +294,38 @@
if (StringUtils.isNotEmpty(mdcOverallEquipmentEfficiencyVo.getDriveType())) {
mdcOverallEquipmentEfficiencyVo.setDriveTypeList(Arrays.asList(mdcOverallEquipmentEfficiencyVo.getDriveType().split(",")));
}
- return this.baseMapper.pageList(page, mdcOverallEquipmentEfficiencyVo);
+ IPage<MdcOverallEquipmentEfficiency> mdcOverallEquipmentEfficiencyIPage = this.baseMapper.pageList(page, mdcOverallEquipmentEfficiencyVo);
+// List<MdcOverallEquipmentEfficiency> list = mdcOverallEquipmentEfficiencyIPage.getRecords();
+ for (MdcOverallEquipmentEfficiency mdcOverallEquipmentEfficiency : mdcOverallEquipmentEfficiencyIPage.getRecords()) {
+ mdcOverallEquipmentEfficiency.setProductionName(this.findProductionName(mdcOverallEquipmentEfficiency.getEquipmentId()));
+ }
+ return mdcOverallEquipmentEfficiencyIPage;
}
+
+
+ /**
+ * 閫掑綊鏌ヨ璁惧杞﹂棿鍚嶇О
+ *
+ * @param equipmentId
+ * @return
+ */
+ private String findProductionName(String equipmentId) {
+ MdcProduction mdcProduction = mdcProductionService.findProductionList(equipmentId);
+ if ("2".equals(mdcProduction.getOrgType())) {
+ return mdcProduction.getProductionName();
+ } else {
+ return this.findProductionNameById(mdcProduction.getParentId());
+ }
+ }
+
+ private String findProductionNameById(String parentId) {
+ MdcProduction mdcProduction = mdcProductionService.getById(parentId);
+ if ("2".equals(mdcProduction.getOrgType())) {
+ return mdcProduction.getProductionName();
+ } else {
+ return this.findProductionNameById(parentId);
+ }
+ }
+
+
}
--
Gitblit v1.9.3