Lius
2025-04-27 0b2ebd27d2afc72aaeb9cd7b1eeec30a90748f3a
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java
@@ -169,8 +169,8 @@
    @Transactional(rollbackFor = Exception.class)
    public void computeOee(MdcOeeComputeVo mdcOeeComputeVo) {
        List<MdcOeeInfo> result = new ArrayList<>();
        String startDate = mdcOeeComputeVo.getStartDate();
        String endDate = mdcOeeComputeVo.getEndDate();
        String startDate = mdcOeeComputeVo.getStartTime();
        String endDate = mdcOeeComputeVo.getEndTime();
        List<String> dateList = DateUtils.getDatesStringList(DateUtils.getShortDate(startDate), DateUtils.getShortDate(endDate));
        if (!dateList.isEmpty()) {
            //获取设备列表
@@ -244,7 +244,7 @@
                    Integer passCount = mdcJcRcJobreportService.selectTotalPassCount(equipmentId, validDate);
                    mdcOeeInfo.setPassCount(passCount);
                    // 合格率 --- 合格数/加工数
                    BigDecimal passRate = BigDecimal.ZERO;
                    BigDecimal passRate = new BigDecimal("100");
                    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);
                    }
@@ -252,7 +252,7 @@
                    // OEE --- 时间开动率 * 性能开动率 * 一次合格率
                    BigDecimal oee = BigDecimal.ZERO;
                    if (!timeActuationRate.equals(BigDecimal.ZERO) && !performanceRate.equals(BigDecimal.ZERO) && !passRate.equals(BigDecimal.ZERO)) {
                        oee = timeActuationRate.multiply(performanceRate).multiply(passRate).divide(new BigDecimal("10000"), 4, RoundingMode.HALF_UP);
                        oee = timeActuationRate.multiply(performanceRate).multiply(passRate).divide(new BigDecimal("1000000"), 4, RoundingMode.HALF_UP);
                    }
                    mdcOeeInfo.setOee(oee);
                    result.add(mdcOeeInfo);