Lius
2025-04-27 0b2ebd27d2afc72aaeb9cd7b1eeec30a90748f3a
update
已修改2个文件
7 ■■■■■ 文件已修改
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDowntimeMapper.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDowntimeMapper.xml
@@ -35,8 +35,7 @@
            mdc_downtime t1
                LEFT JOIN mdc_downtime_reason t2 ON t1.reason_id = t2.id
        WHERE
            t1.status = 1
            AND t1.equipment_id = #{equipmentId}
            t1.equipment_id = #{equipmentId}
            AND t2.downtime_type = #{closeType}
            AND t1.the_date = #{validDate}
    </select>
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java
@@ -244,7 +244,7 @@
                    Integer passCount = mdcJcRcJobreportService.selectTotalPassCount(equipmentId, validDate);
                    mdcOeeInfo.setPassCount(passCount);
                    // 合格率 --- 合格数/加工数
                    BigDecimal passRate = BigDecimal.ONE;
                    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);