From 0b2ebd27d2afc72aaeb9cd7b1eeec30a90748f3a Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期日, 27 四月 2025 15:33:42 +0800
Subject: [PATCH] update

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java
index 550d3f4..01c5cfa 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java
+++ b/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);

--
Gitblit v1.9.3