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); } } 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
