OEE条件判断

Lius

20 小时以前 5d5606559262e4c6366cf059cda94d28159bbbe9

OEE条件判断

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDowntimeServiceImpl.java

@@ -66,8 +66,6 @@
        List<MdcDowntime> mdcDowntimeList = this.baseMapper.findPlanTimeDuration(equipmentId, validDate, closeType);
        if (mdcDowntimeList != null && !mdcDowntimeList.isEmpty()) {
            for (MdcDowntime mdcDowntime : mdcDowntimeList) {
//                Date startDate = DateUtils.toDate(mdcDowntime.getTheDate() + " " + mdcDowntime.getStartTime(), DateUtils.STR_DATE_TIME_SMALL);
//                Date endDate = DateUtils.toDate(mdcDowntime.getTheDate() + " " + mdcDowntime.getEndTime(), DateUtils.STR_DATE_TIME_SMALL);
                result = mdcDowntime.getDownLong() + result;
            }
        }

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java

@@ -204,21 +204,20 @@
                    int actuateLong = loadLong - noPlanCloseLong;
                    mdcOeeInfo.setActuateLong(actuateLong);
                    // 时间开动率 --- 开动时间/负荷时间
                    BigDecimal timeActuationRate = new BigDecimal(actuateLong).divide(new BigDecimal(loadLong), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP);
                    mdcOeeInfo.setTimeActuationRate(timeActuationRate.compareTo(new BigDecimal(100)) > 0 ? new BigDecimal(100) : timeActuationRate);
                    BigDecimal timeActuationRate = BigDecimal.ZERO;
                    if (loadLong == 0) {
                        mdcOeeInfo.setTimeActuationRate(timeActuationRate);
                    } else {
                        timeActuationRate = new BigDecimal(actuateLong).divide(new BigDecimal(loadLong), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP);
                        mdcOeeInfo.setTimeActuationRate(timeActuationRate.compareTo(new BigDecimal(100)) > 0 ? new BigDecimal(100) : timeActuationRate);
                    }
                    // 有效运行时间 --- 按需求维护零件加工总时长||系统主轴负载时间
                    Integer effectiveRunLong = 0;
//                    Integer totalProcessLong = mdcPartProcessInfoService.selectTotalProcessLong(equipmentId, validDate);
                    //查询设备运行时间
                    effectiveRunLong = mdcEquipmentStatisticalInfoService.selectProcessLong(equipmentId, validDate.replace("-", ""));
                    if (effectiveRunLong == null) {
                        effectiveRunLong = 0;
                    }
//                    if (totalProcessLong == 0) {
//
//                    } else {
//                        effectiveRunLong = totalProcessLong;
//                    }
                    mdcOeeInfo.setEffectiveRunLong(effectiveRunLong);
                    // 性能开动率 --- 有效运行时间/开动时间
                    BigDecimal performanceRate = BigDecimal.ZERO;
@@ -227,16 +226,6 @@
                    }
                    mdcOeeInfo.setPerformanceRate(performanceRate.compareTo(new BigDecimal(100)) > 0 ? new BigDecimal(100) : performanceRate);
                    // 加工零件数量 --- 按维护数据统计当天
//                    Integer processCount = mdcPartProcessInfoService.selectTotalProcessCount(equipmentId, validDate);
//                    mdcOeeInfo.setProcessCount(processCount);
//                    // 合格零件数量 --- 按维护数据统计当天
//                    Integer passCount = mdcPartProcessInfoService.selectTotalPassCount(equipmentId, validDate);
//                    mdcOeeInfo.setPassCount(passCount);
//                    // 合格率 --- 合格数/加工数
//                    BigDecimal passRate = BigDecimal.ZERO;
//                    if (processCount != 0 && passCount != 0) {
//                        passRate = new BigDecimal(passCount).divide(new BigDecimal(processCount), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP);
//                    }
                    // 加工零件数量
                    Integer processCount = mdcJcRcJobreportService.selectTotalProcessCount(equipmentId, validDate);
                    mdcOeeInfo.setProcessCount(processCount);