From 286375a43369462cd75147271949cf819916912f Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 12 一月 2024 16:39:17 +0800
Subject: [PATCH] 问题项修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 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 40e49fd..31ca3f5 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;
@@ -13,10 +14,7 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.*;
-import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService;
-import org.jeecg.modules.eam.service.IPrecisionInspectionDetailService;
-import org.jeecg.modules.eam.service.IPrecisionInspectionService;
-import org.jeecg.modules.eam.service.IPrecisionParametersService;
+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;
@@ -49,6 +47,12 @@
@Autowired
private IPrecisionParametersService precisionParametersService;
+
+ @Autowired
+ private IEamEquipmentService equipmentService;
+
+ @Autowired
+ private IPrecisionParametersTemplateDetailService precisionParametersTemplateDetailService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -187,6 +191,14 @@
String precisionParametersId = precisionInspectionDetail.getPrecisionParametersId();
PrecisionParameters precisionParameters = precisionParametersService.getById(precisionParametersId);
precisionInspectionDetail.setPrecisionParametersName(precisionParameters.getName());
+
+ List<PrecisionParametersTemplateDetail> list = precisionParametersTemplateDetailService.lambdaQuery()
+ .eq(PrecisionParametersTemplateDetail::getPrecisionParametersId, precisionParametersId)
+ .eq(PrecisionParametersTemplateDetail::getDelFlag, "0").list();
+ if(list.size()>0){
+ precisionInspectionDetail.setTolerance(list.get(0).getTolerance());
+ }
+
}
map.put("precisionInspectionDetails",precisionInspectionDetails);
@@ -203,8 +215,11 @@
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)){
@@ -219,7 +234,9 @@
preInspection.setRepairDirectorUser(userId);
maintenanceOrder.setPrecisionInspectionStatus("2");
- }else if("2".equals(precisionInspectionStatus)){
+ }
+
+ if("2".equals(precisionInspectionStatus)){
preInspection.setEachTolerance(precisionInspection.getEachTolerance());
preInspection.setPartTolerance(precisionInspection.getPartTolerance());
preInspection.setEquipmentInspectorUser(userId);
@@ -229,6 +246,7 @@
preInspection.setSparePart(precisionInspection.getSparePart());
preInspection.setProcessPass(precisionInspection.getProcessPass());
preInspection.setMeetProcessRequire(precisionInspection.getMeetProcessRequire());
+ preInspection.setSparePart(precisionInspection.getSparePart());
preInspection.setUseUnitDirectorUser(userId);
maintenanceOrder.setPrecisionInspectionStatus("4");
@@ -238,12 +256,17 @@
maintenanceOrder.setPrecisionInspectionStatus("5");
// maintenanceOrder.setStatus("8");
+ //鏇存柊璁惧鎶�鏈姸鎬�
+ equipment.setTechnologyStatus(precisionInspection.getJudgmentResult());
}
- preInspection.setRemark(precisionInspection.getRemark());
+ 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