From 2d727903343feb01fedc988370091395c368faf2 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 17 十二月 2024 16:06:42 +0800
Subject: [PATCH] OEE功能及设备管理调整
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcPlanCloseServiceImpl.java | 35 ++++++++++++++---------------------
1 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcPlanCloseServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcPlanCloseServiceImpl.java
index e678fbc..e54d198 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcPlanCloseServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcPlanCloseServiceImpl.java
@@ -165,28 +165,21 @@
return mv;
}
+ /**
+ * 璁＄畻 璁″垝/闈炶鍒掑仠鏈哄綋澶╂�绘椂闀�
+ * @param equipmentId
+ * @param validDate
+ * @param closeType
+ * @return
+ */
@Override
- public BigDecimal findPlanTimeDuration(BigDecimal actualWorkDayCount, String planCloseType) {
- BigDecimal result = new BigDecimal("0");
-// List<MdcPlanClose> mdcPlanCloses = this.baseMapper.selectList(new LambdaQueryWrapper<MdcPlanClose>().in(MdcPlanClose::getPlanCloseType, Arrays.asList(planCloseType.split(","))));
-// if (mdcPlanCloses != null && !mdcPlanCloses.isEmpty()) {
-// for (MdcPlanClose mdcPlanClose : mdcPlanCloses) {
-// switch (mdcPlanClose.getPlanCloseTimeType()) {
-// case MdcConstant.DAY:
-// result = result.add(actualWorkDayCount.multiply(new BigDecimal(mdcPlanClose.getPlanCloseTimeLong())));
-// break;
-// case MdcConstant.WEEK:
-// result = result.add(new BigDecimal("4").multiply(new BigDecimal(mdcPlanClose.getPlanCloseTimeLong())));
-// break;
-// case MdcConstant.MONTH:
-// result = result.add(new BigDecimal(mdcPlanClose.getPlanCloseTimeLong()));
-// break;
-// default:
-// break;
-// }
-// }
-// }
- return result;
+ public Integer findPlanTimeDuration(String equipmentId, String validDate, String closeType) {
+ Integer planTimeDuration = this.baseMapper.findPlanTimeDuration(equipmentId, validDate, closeType);
+ if (planTimeDuration == null) {
+ return 0;
+ } else {
+ return planTimeDuration;
+ }
}
}
--
Gitblit v1.9.3