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/PredictiveWorkPlanParameterServiceImpl.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkPlanParameterServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkPlanParameterServiceImpl.java
index 1863614..0ed5a3a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkPlanParameterServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/PredictiveWorkPlanParameterServiceImpl.java
@@ -79,8 +79,11 @@
             }
             if (needCreateFlag) {
                 //鐢熸垚宸ュ崟 ,灏嗗弬鏁颁俊鎭浠�
-                this.createOrder(predictiveWorkPlan.getId(), predictiveWorkPlan.getEquipmentId());
-                this.backInfo(predictiveWorkPlan.getId(), predictiveWorkPlanParameterList);
+                PredictiveWorkOrder predictiveWorkOrder = this.createOrder(predictiveWorkPlan.getId(), predictiveWorkPlan.getEquipmentId());
+                if(predictiveWorkOrder != null){
+                    this.backInfo(predictiveWorkPlan.getId(), predictiveWorkOrder.getId(),predictiveWorkPlanParameterList);
+                }
+
             }
         }
     }
@@ -104,18 +107,23 @@
         this.saveBatch(insertList);
     }
 
-    private void createOrder(String workPlanId, String equipmentId) {
+    private PredictiveWorkOrder createOrder(String workPlanId, String equipmentId) {
         PredictiveWorkOrder predictiveWorkOrder = new PredictiveWorkOrder();
         predictiveWorkOrder.setWorkPlanId(workPlanId);
         predictiveWorkOrder.setEquipmentId(equipmentId);
+        //TODO 寰呴獙璇�
         predictiveWorkOrderService.add(predictiveWorkOrder);
+        return predictiveWorkOrder;
     }
 
-    private void backInfo(String workPlanId, List<PredictiveWorkPlanParameter> predictiveWorkPlanParameterList) {
+    private void backInfo(String workPlanId,String workOrderId, List<PredictiveWorkPlanParameter> predictiveWorkPlanParameterList) {
         List<PredictiveWorkPlanParameterHistory> list = new ArrayList<>();
         for (PredictiveWorkPlanParameter predictiveWorkPlanParameter : predictiveWorkPlanParameterList) {
             PredictiveWorkPlanParameterHistory predictiveWorkPlanParameterHistory = new PredictiveWorkPlanParameterHistory();
             predictiveWorkPlanParameterHistory.setWorkPlanId(workPlanId);
+            //TODO 鍔犲睘鎬orkOrderId
+            predictiveWorkPlanParameterHistory.setWorkOrderId(workOrderId);
+            predictiveWorkPlanParameterHistory.setParameterUnit(predictiveWorkPlanParameter.getParameterUnit());
             predictiveWorkPlanParameterHistory.setParameterId(predictiveWorkPlanParameter.getParameterId());
             predictiveWorkPlanParameterHistory.setParameterCode(predictiveWorkPlanParameter.getParameterCode());
             predictiveWorkPlanParameterHistory.setParameterName(predictiveWorkPlanParameter.getParameterName());

--
Gitblit v1.9.3