From 04ef88cee361ec8730c400d96250a6c1cd9f9d80 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 08 九月 2023 16:23:47 +0800
Subject: [PATCH] 设备台账 1.ABC标识变更记录功能 2.质保日期变更记录功能 3.质保到期提醒 4.ABC标识与关键设备标识联动 5.设备质保期字段添加
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
index d6914d6..06c690a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
@@ -92,6 +92,18 @@
@Autowired
private ISysUserService sysUserService;
+ @Autowired
+ private IPrecisionInspectionService precisionInspectionService;
+
+ @Autowired
+ private IEamEquipmentService equipmentService;
+
+ @Autowired
+ private IEquipmentPrecisionParametersService equipmentPrecisionParametersService;
+
+ @Autowired
+ private IPrecisionInspectionDetailService precisionInspectionDetailService;
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -219,6 +231,7 @@
dailyMaintenanceOrder.setPlanEndTime(date);//鍒涘缓绫诲瀷锛�1鎵嬪姩鍒涘缓锛�2鑷姩鍒涘缓锛�
dailyMaintenanceOrder.setCreateType("1");//鍒涘缓绫诲瀷锛�1鎵嬪姩鍒涘缓锛�2鑷姩鍒涘缓锛�
dailyMaintenanceOrder.setConfirmStatus("0");//绉讳氦纭鐘舵�侊紙0鏈‘璁わ紝1涓讳换纭锛�2妫�楠屽憳纭锛�
+ dailyMaintenanceOrder.setPrecisionInspectionStatus("0");//绮惧害妫�楠屽崟娴佺▼鐘舵�侊紙0鏈‘璁わ紝1绮惧害妫�楠岃�咃紝2缁翠慨瀹や富浠伙紝3璁惧妫�楠屽憳锛�4浣跨敤鍗曚綅鎶�鏈富绠★紝5璁惧妫�楠屽憳锛堢洊绔狅級锛�
dailyMaintenanceOrderService.save(dailyMaintenanceOrder);
List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
for (DailyMaintenanceOrderDetail dailyMaintenanceOrderDetail : dailyMaintenanceOrderDetails) {
@@ -442,9 +455,25 @@
List<FinishTransferOrder> finishTransferOrders = finishTransferOrderService.lambdaQuery()
.eq(FinishTransferOrder::getMaintenanceOrderId, id)
+ .eq(FinishTransferOrder::getDelFlag,0)
.eq(FinishTransferOrder::getEquipmentId, maintenanceOrder.getEquipmentId()).list();
for (FinishTransferOrder finishTransferOrder : finishTransferOrders) {
finishTransferOrderService.removeById(finishTransferOrder);
+ }
+
+ List<PrecisionInspection> precisionInspectionList = precisionInspectionService.lambdaQuery()
+ .eq(PrecisionInspection::getMaintenanceOrderId, id)
+ .eq(PrecisionInspection::getDelFlag,0)
+ .eq(PrecisionInspection::getEquipmentId, maintenanceOrder.getEquipmentId()).list();
+ for (PrecisionInspection precisionInspection : precisionInspectionList) {
+ List<PrecisionInspectionDetail> precisionInspectionDetails = precisionInspectionDetailService.lambdaQuery()
+ .eq(PrecisionInspectionDetail::getPrecisionInspectionId, precisionInspection.getId())
+ .eq(PrecisionInspectionDetail::getDelFlag,0)
+ .list();
+ for (PrecisionInspectionDetail precisionInspectionDetail : precisionInspectionDetails) {
+ precisionInspectionDetailService.removeById(precisionInspectionDetail);
+ }
+ precisionInspectionService.removeById(precisionInspection);
}
if (b) {
@@ -488,6 +517,8 @@
finishTransferOrder.setDelFlag(0);
finishTransferOrderService.save(finishTransferOrder);
+ this.createPrecisionInspection(maintenanceOrder);
+
if (!b) {
return Result.error("鎶ュ伐澶辫触!");
} else {
@@ -495,6 +526,29 @@
}
}
+ void createPrecisionInspection(DailyMaintenanceOrder dailyMaintenanceOrder){
+ PrecisionInspection precisionInspection = new PrecisionInspection();
+ precisionInspection.setMaintenanceOrderId(dailyMaintenanceOrder.getId());
+ precisionInspection.setEquipmentId(dailyMaintenanceOrder.getEquipmentId());
+ precisionInspectionService.save(precisionInspection);
+
+ List<EquipmentPrecisionParameters> equipmentPrecisionParameters = equipmentPrecisionParametersService.lambdaQuery()
+ .eq(EquipmentPrecisionParameters::getEquipmentId, dailyMaintenanceOrder.getEquipmentId())
+ .eq(EquipmentPrecisionParameters::getDelFlag, "0").list();
+ PrecisionInspectionDetail precisionInspectionDetail = null;
+ for (EquipmentPrecisionParameters equipmentPrecisionParameter : equipmentPrecisionParameters) {
+ precisionInspectionDetail = new PrecisionInspectionDetail();
+ precisionInspectionDetail.setPrecisionInspectionId(precisionInspection.getId());
+ precisionInspectionDetail.setEquipmentId(dailyMaintenanceOrder.getEquipmentId());
+ precisionInspectionDetail.setPrecisionParametersId(equipmentPrecisionParameter.getPrecisionParametersId());
+
+ String upperLimit = equipmentPrecisionParameter.getUpperLimit()+"";
+ String lowerLimit = equipmentPrecisionParameter.getLowerLimit()+"";
+ precisionInspectionDetail.setTolerance("["+upperLimit+"鈥�"+lowerLimit+"]");
+ precisionInspectionDetailService.save(precisionInspectionDetail);
+ }
+ }
+
/**
* 鏃ュ父淇濆吇宸ュ崟 鑾峰彇璁惧鍙扮珯宸茬粦瀹氱殑瀵硅薄閮ㄩ棬
* qsw 2023-7-11
--
Gitblit v1.9.3