From a862e80c1ee46a77fc8a2dacf59b0110b3669550 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 22 四月 2024 16:32:02 +0800
Subject: [PATCH] 参数修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 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 797eb38..538437a 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;
@@ -49,6 +50,9 @@
@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,10 @@
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();
@@ -220,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);
@@ -230,7 +246,9 @@
preInspection.setSparePart(precisionInspection.getSparePart());
preInspection.setProcessPass(precisionInspection.getProcessPass());
preInspection.setMeetProcessRequire(precisionInspection.getMeetProcessRequire());
+ preInspection.setSparePart(precisionInspection.getSparePart());
preInspection.setUseUnitDirectorUser(userId);
+ preInspection.setMeetProcessRequireRemark(precisionInspection.getMeetProcessRequireRemark());
maintenanceOrder.setPrecisionInspectionStatus("4");
}else if("4".equals(precisionInspectionStatus)){
@@ -243,8 +261,11 @@
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