From 5677ab158fb78d1267c16bbbf29eb690e0b4039f Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 十二月 2023 16:53:39 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
index 9becbb6..849cf67 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
@@ -70,6 +70,14 @@
@Autowired
private ISysBaseAPI sysBaseApi;
+ @Autowired
+ private IDailyMaintenanceOrderDetailService maintenanceOrderDetailService;
+
+ @Autowired
+ private IMaintenanceStandardDetailService maintenanceStandardDetailService;
+
+
+
/*---------------------------------涓昏〃澶勭悊-begin-------------------------------------*/
@@ -230,10 +238,21 @@
dailyMaintenanceOrder.setMaintenanceCycleId(maintenanceStandardDetailList.get(0).getMaintenanceCycleId());
}
dailyMaintenanceOrder.setMaintenanceOrderUda1(equipmentMaintenancePlan.getId());
+ dailyMaintenanceOrder.setMaintenanceOrderUda2(equipmentMaintenancePlanDetail.getId());
dailyMaintenanceOrder.setDelFlag(CommonConstant.DEL_FLAG_0);
dailyMaintenanceOrder.setPrecisionInspectionStatus(CommonConstant.STATUS_0);
dailyMaintenanceOrder.setStoveExemptStatus(CommonConstant.STATUS_0);
+ dailyMaintenanceOrder.setConfirmStatus(CommonConstant.STATUS_0);
dailyMaintenanceOrderService.save(dailyMaintenanceOrder);
+ for(MaintenanceStandardDetail maintenanceStandardDetail:maintenanceStandardDetailList){
+ DailyMaintenanceOrderDetail dailyMaintenanceOrderDetail = new DailyMaintenanceOrderDetail();
+ dailyMaintenanceOrderDetail.setDailyMaintenanceOrderId(dailyMaintenanceOrder.getId());
+ dailyMaintenanceOrderDetail.setMaintenanceStandardDetailId(maintenanceStandardDetail.getId());
+ dailyMaintenanceOrderDetail.setMaintenanceStandardId(maintenanceStandard.getId());
+ dailyMaintenanceOrderDetail.setMaintenanceProjectId(maintenanceStandardDetail.getMaintenanceProjectId());
+ dailyMaintenanceOrderDetail.setDelFlag(0);
+ maintenanceOrderDetailService.save(dailyMaintenanceOrderDetail);
+ }
}
equipmentMaintenancePlanService.updateById(equipmentMaintenancePlan);
String msg = "鍗曟嵁鍙蜂负銆�"+equipmentMaintenancePlan.getNum()+"銆戠殑淇濆吇璁″垝宸茬敓鎴愪繚鍏诲伐鍗�";
--
Gitblit v1.9.3