From e26943154c5c1970114e22bb08c2b0cc3f5545d2 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 08 十月 2024 15:11:59 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java
index 7499f8d..08d1ab2 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java
@@ -18,6 +18,7 @@
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.service.IMdcProductionService;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -73,6 +74,7 @@
* 璁＄畻璁惧缁煎悎鏁堢巼OEE
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public void runningOverallEquipmentEfficiency(String dateTime) {
/*
OEE = 鏃堕棿寮�鍔ㄧ巼 脳 鎬ц兘寮�鍔ㄧ巼 脳 鍚堟牸鍝佺巼
@@ -89,14 +91,11 @@
String validDate = YearMonth.now().minusMonths(1).toString();
if (StringUtils.isNotBlank(dateTime)) {
validDate = DateUtils.format(DateUtils.toDate(dateTime, "yyyyMM"), DateUtils.STR_YEAR_MONTH);
- try {
- if (validDate != null) {
- this.remove(new LambdaQueryWrapper<MdcOverallEquipmentEfficiency>().
- eq(MdcOverallEquipmentEfficiency::getValidDate, validDate));
- }
- } catch (Exception e) {
- log.error("鍙傛暟鏍煎紡涓嶅", e);
- }
+ }
+ try {
+ this.remove(new LambdaQueryWrapper<MdcOverallEquipmentEfficiency>().eq(MdcOverallEquipmentEfficiency::getValidDate, validDate));
+ } catch (Exception e) {
+ log.error("鍙傛暟鏍煎紡涓嶅", e);
}
// 鑾峰彇璁惧鍒楄〃
List<MdcEquipment> equipmentList = mdcEquipmentService.list();
@@ -402,7 +401,7 @@
oeeStatisticsChartVo.setKey(mdcProduction.getProductionName());
BigDecimal oee = this.baseMapper.findAvgOee(date, equipmentTypeList, mdcProduction.getId());
if (oee != null) {
- oeeStatisticsChartVo.setValue(oee);
+ oeeStatisticsChartVo.setValue(oee.multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP));
}
result.add(oeeStatisticsChartVo);
}
--
Gitblit v1.9.3