From 5706372636fb594320db25d2e2aab8b94e3ef294 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期四, 14 九月 2023 18:11:15 +0800
Subject: [PATCH] 预测性维护工单
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkPlanWarnServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkPlanWarnServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkPlanWarnServiceImpl.java
index 0a56743..392c020 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkPlanWarnServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkPlanWarnServiceImpl.java
@@ -74,9 +74,9 @@
}
if (needWarnFlag) {
//鍒ゆ柇鏄惁鐢熸垚宸ュ崟 ,灏嗘姤璀︿俊鎭浠�
- boolean flag = this.createOrder(predictiveWorkPlan.getId(), predictiveWorkPlan.getEquipmentId());
- if (flag) {
- this.backInfo(predictiveWorkPlan.getId(), insertList);
+ PredictiveWorkOrder predictiveWorkOrder = this.createOrder(predictiveWorkPlan.getId(), predictiveWorkPlan.getEquipmentId());
+ if (predictiveWorkOrder != null) {
+ this.backInfo(predictiveWorkPlan.getId(), predictiveWorkOrder.getId(),insertList);
}
}
}
@@ -101,11 +101,12 @@
this.saveBatch(insertList);
}
- private void backInfo(String workPlanId, List<MdcEquipmentAlarmVo> predictiveWorkPlanWarnList) {
+ private void backInfo(String workPlanId, String workOrderId,List<MdcEquipmentAlarmVo> predictiveWorkPlanWarnList) {
List<PredictiveWorkPlanWarnHistory> list = new ArrayList<>();
for (MdcEquipmentAlarmVo mdcEquipmentAlarmVo : predictiveWorkPlanWarnList) {
PredictiveWorkPlanWarnHistory predictiveWorkPlanWarnHistory = new PredictiveWorkPlanWarnHistory();
predictiveWorkPlanWarnHistory.setWorkPlanId(workPlanId);
+ predictiveWorkPlanWarnHistory.setWorkOrderId(workOrderId);
predictiveWorkPlanWarnHistory.setWarnId(mdcEquipmentAlarmVo.getAlarmNo());
predictiveWorkPlanWarnHistory.setWarnCode(mdcEquipmentAlarmVo.getAlarmNo());
predictiveWorkPlanWarnHistory.setWarnName(mdcEquipmentAlarmVo.getAlarmContent());
@@ -115,7 +116,7 @@
predictiveWorkPlanWarnHistoryService.saveBatch(list);
}
- private boolean createOrder(String workPlanId, String equipmentId) {
+ private PredictiveWorkOrder createOrder(String workPlanId, String equipmentId) {
LambdaQueryChainWrapper<PredictiveWorkOrder> lambdaQuery = predictiveWorkOrderService.lambdaQuery();
lambdaQuery.eq(PredictiveWorkOrder::getWorkPlanId, workPlanId).eq(PredictiveWorkOrder::getEquipmentId, equipmentId);
//宸插垱寤� 0 宸蹭笅鍙� 1 鏈紑濮� 2 鎵ц涓� 3
@@ -127,9 +128,9 @@
predictiveWorkOrder.setEquipmentId(equipmentId);
predictiveWorkOrder.setWorkPlanId(workPlanId);
predictiveWorkOrderService.add(predictiveWorkOrder);
- return true;
+ return predictiveWorkOrder;
}
- return false;
+ return null;
}
//鍗曚綅缁熶竴鎹㈢畻涓虹
--
Gitblit v1.9.3