From ae33e68baf21878ce145d75ac377d14c1e2b2a82 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 十二月 2023 14:59:26 +0800
Subject: [PATCH] 设备台账
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java | 71 ++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 23 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java
index e5e5261..3a6f19e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -12,11 +13,8 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.eam.entity.DailyMaintenanceOrder;
-import org.jeecg.modules.eam.entity.FinishTransferOrder;
-import org.jeecg.modules.eam.entity.PrecisionInspection;
-import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService;
-import org.jeecg.modules.eam.service.IPrecisionInspectionService;
+import org.jeecg.modules.eam.entity.*;
+import org.jeecg.modules.eam.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -43,6 +41,15 @@
@Autowired
private IDailyMaintenanceOrderService dailyMaintenanceOrderService;
+
+ @Autowired
+ private IPrecisionInspectionDetailService precisionInspectionDetailService;
+
+ @Autowired
+ private IPrecisionParametersService precisionParametersService;
+
+ @Autowired
+ private IEamEquipmentService equipmentService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -168,13 +175,23 @@
return super.importExcel(request, response, PrecisionInspection.class);
}
- /**
- * 鏃ュ父鐐规
- * qsw 2023-4-26
- */
+
@GetMapping("getPrecisionInspectionList")
public Result<?> getPrecisionInspectionList(@RequestParam(name = "maintenanceOrderId", required = true) String maintenanceOrderId) {
List<Map<String, Object>> precisionInspectionList = precisionInspectionService.getPrecisionInspectionList(maintenanceOrderId);
+ for (Map<String, Object> map : precisionInspectionList) {
+ String id = (String) map.get("id");
+ List<PrecisionInspectionDetail> precisionInspectionDetails = precisionInspectionDetailService.lambdaQuery()
+ .eq(PrecisionInspectionDetail::getPrecisionInspectionId, id)
+ .eq(PrecisionInspectionDetail::getDelFlag, "0").list();
+ for (PrecisionInspectionDetail precisionInspectionDetail : precisionInspectionDetails) {
+ String precisionParametersId = precisionInspectionDetail.getPrecisionParametersId();
+ PrecisionParameters precisionParameters = precisionParametersService.getById(precisionParametersId);
+ precisionInspectionDetail.setPrecisionParametersName(precisionParameters.getName());
+ }
+
+ map.put("precisionInspectionDetails",precisionInspectionDetails);
+ }
return Result.ok(precisionInspectionList);
}
@@ -187,50 +204,58 @@
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = sysUser.getId();
+ String receipts = precisionInspection.getReceipts();//绮惧害妫�楠屽崟鍗曟嵁id
PrecisionInspection preInspection = precisionInspectionService.getById(precisionInspection.getId());
DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(preInspection.getMaintenanceOrderId());
+ String maintenanceOrderUda4 = maintenanceOrder.getMaintenanceOrderUda4();
+ Equipment equipment = equipmentService.getById(maintenanceOrder.getEquipmentId());
String precisionInspectionStatus = maintenanceOrder.getPrecisionInspectionStatus();
- if ("0".equals(precisionInspectionStatus)){
+ if ("0".equals(precisionInspectionStatus)){
+ List<PrecisionInspectionDetail> precisionInspectionDetailList = precisionInspection.getPrecisionInspectionDetailList();
+ for (PrecisionInspectionDetail precisionInspectionDetail : precisionInspectionDetailList) {
+ precisionInspectionDetailService.updateById(precisionInspectionDetail);
+ }
preInspection.setPrecisionInspectionUser(userId);
- precisionInspectionService.updateById(preInspection);
maintenanceOrder.setPrecisionInspectionStatus("1");
- dailyMaintenanceOrderService.updateById(maintenanceOrder);
}else if("1".equals(precisionInspectionStatus)){
preInspection.setRepairDirectorUser(userId);
- precisionInspectionService.updateById(preInspection);
maintenanceOrder.setPrecisionInspectionStatus("2");
- dailyMaintenanceOrderService.updateById(maintenanceOrder);
- }else if("2".equals(precisionInspectionStatus)){
+ }
+
+ if("2".equals(precisionInspectionStatus)){
preInspection.setEachTolerance(precisionInspection.getEachTolerance());
preInspection.setPartTolerance(precisionInspection.getPartTolerance());
preInspection.setEquipmentInspectorUser(userId);
- precisionInspectionService.updateById(preInspection);
maintenanceOrder.setPrecisionInspectionStatus("3");
- dailyMaintenanceOrderService.updateById(maintenanceOrder);
} else if("3".equals(precisionInspectionStatus)){
preInspection.setSparePart(precisionInspection.getSparePart());
preInspection.setProcessPass(precisionInspection.getProcessPass());
preInspection.setMeetProcessRequire(precisionInspection.getMeetProcessRequire());
+ preInspection.setSparePart(precisionInspection.getSparePart());
preInspection.setUseUnitDirectorUser(userId);
- precisionInspectionService.updateById(preInspection);
maintenanceOrder.setPrecisionInspectionStatus("4");
- dailyMaintenanceOrderService.updateById(maintenanceOrder);
}else if("4".equals(precisionInspectionStatus)){
preInspection.setEquipmentInspectorSignUser(userId);
preInspection.setJudgmentResult(precisionInspection.getJudgmentResult());
- precisionInspectionService.updateById(preInspection);
maintenanceOrder.setPrecisionInspectionStatus("5");
- maintenanceOrder.setStatus("8");
- dailyMaintenanceOrderService.updateById(maintenanceOrder);
+// maintenanceOrder.setStatus("8");
+ //鏇存柊璁惧鎶�鏈姸鎬�
+ equipment.setTechnologyStatus(precisionInspection.getJudgmentResult());
}
-
+ if(StringUtils.isBlank(maintenanceOrderUda4)){
+ maintenanceOrder.setMaintenanceOrderUda4(receipts);
+ }
+ dailyMaintenanceOrderService.updateById(maintenanceOrder);
+ preInspection.setRemark(precisionInspection.getRemark());
+ precisionInspectionService.updateById(preInspection);
+ equipmentService.updateById(equipment);
return Result.OK("瀹℃壒鎴愬姛!");
}
--
Gitblit v1.9.3