From 19a5be30c6229dde4adeb2502bc65b2e9a82e9ec Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 三月 2024 11:42:33 +0800
Subject: [PATCH] xg
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 86 +++++++++++++++++++++++++++++-------------
1 files changed, 59 insertions(+), 27 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
index 4b5836c..0598abc 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
@@ -25,6 +25,9 @@
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.eam.vo.CalibrationOrderPage;
+import org.jeecg.modules.eam.vo.SysFileNameVo;
+import org.jeecg.modules.system.entity.SysDepart;
+import org.jeecg.modules.system.service.ISysDepartService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -70,6 +73,15 @@
@Autowired
private IPrecisionParametersTemplateDetailService precisionParametersTemplateDetailService;
+
+ @Autowired
+ private ITechnologyStatusService technologyStatusService;
+
+ @Autowired
+ private ISysFileNameService sysFileNameService;
+
+ @Autowired
+ private ISysDepartService sysDepartService;
// @Autowired
// private IUploadRelaService uploadRelaService;
// @Autowired
@@ -458,37 +470,41 @@
String managementMode = record.getManagementMode();
String equipmentId = record.getEquipmentId();
Equipment equipment = equipmentService.getById(equipmentId);
+ String useId = equipment.getUseId();
+ SysDepart depart = sysDepartService.getById(useId);
if(equipment != null){
record.setEquipmentNum(equipment.getNum());
record.setEquipmentName(equipment.getName());
record.setEquipmentModel(equipment.getModel());
record.setEquipmentSpecification(equipment.getSpecification());
+ record.setEquipmentImportance(equipment.getEquipmentImportanceId());
+ record.setUseDepartName(ObjectUtils.isNotNull(depart)?depart.getDepartName():"");
}
- List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId);
- record.setPrecisionParameterList(precisionParameterList);
- if("4".equals(status)){
- if("data".equals(managementMode)){
- List<CalibrationOrderDetail> calibrationOrderDetails = calibrationOrderDetailService.lambdaQuery()
- .eq(CalibrationOrderDetail::getCalibrationOrderId, id)
- .eq(CalibrationOrderDetail::getJudgmentResult, "fail")
- .eq(CalibrationOrderDetail::getDelFlag,"0").list();
- if(calibrationOrderDetails.size()>0){
- record.setCalibrationResult("寮傚父");
- }else{
- record.setCalibrationResult("姝ｅ父");
- }
- }else{
- List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery()
- .eq(CalibrationOrderReport::getCalibrationOrderId, id)
- .eq(CalibrationOrderReport::getJudgmentResult, "fail")
- .eq(CalibrationOrderReport::getDelFlag, "0").list();
- if(calibrationOrderReports.size()>0){
- record.setCalibrationResult("寮傚父");
- }else{
- record.setCalibrationResult("姝ｅ父");
- }
- }
- }
+// List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId);
+// record.setPrecisionParameterList(precisionParameterList);
+// if("4".equals(status)){
+// if("data".equals(managementMode)){
+// List<CalibrationOrderDetail> calibrationOrderDetails = calibrationOrderDetailService.lambdaQuery()
+// .eq(CalibrationOrderDetail::getCalibrationOrderId, id)
+// .eq(CalibrationOrderDetail::getJudgmentResult, "fail")
+// .eq(CalibrationOrderDetail::getDelFlag,"0").list();
+// if(calibrationOrderDetails.size()>0){
+// record.setCalibrationResult("寮傚父");
+// }else{
+// record.setCalibrationResult("姝ｅ父");
+// }
+// }else{
+// List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery()
+// .eq(CalibrationOrderReport::getCalibrationOrderId, id)
+// .eq(CalibrationOrderReport::getJudgmentResult, "fail")
+// .eq(CalibrationOrderReport::getDelFlag, "0").list();
+// if(calibrationOrderReports.size()>0){
+// record.setCalibrationResult("寮傚父");
+// }else{
+// record.setCalibrationResult("姝ｅ父");
+// }
+// }
+// }
}
return Result.OK(pageList);
}
@@ -503,7 +519,7 @@
for (CalibrationOrderDetail calibrationOrderDetail : calibrationOrderDetails) {
calibrationOrderDetailService.removeById(calibrationOrderDetail);
}
- addAndEdit(calibrationOrder);
+// addAndEdit(calibrationOrder);
return Result.OK("缂栬緫鎴愬姛!");
}
@@ -532,10 +548,26 @@
public Result<String> addNew(@RequestBody CalibrationOrder calibrationOrder) {
calibrationOrder.setStatus("1");
calibrationOrderService.save(calibrationOrder);
- addAndEdit(calibrationOrder);
+
+ String equipmentId = calibrationOrder.getEquipmentId();
+ Equipment equipment = equipmentService.getById(equipmentId);
+ String equipmentImportance = equipment.getEquipmentImportanceId();
+ if("D".equals(equipmentImportance)){
+ this.createTechnologyStatus(calibrationOrder);
+ }
+
+// addAndEdit(calibrationOrder);
return Result.OK("娣诲姞鎴愬姛锛�");
}
+ void createTechnologyStatus(CalibrationOrder calibrationOrder){
+ List<SysFileNameVo> sysFileName = sysFileNameService.getSysFileName("9");
+ TechnologyStatus technologyStatus = new TechnologyStatus();
+ technologyStatus.setOrderId(calibrationOrder.getId());
+ technologyStatus.setReceipts(sysFileName.get(0).getReceipts());
+ technologyStatusService.save(technologyStatus);
+ }
+
/**
* 璁惧妫�瀹氬伐鍗� 鍒涘缓鏃堕�氳繃璁惧鑾峰彇璁惧绮惧害鍙傛暟
* qsw 2023-7-18
--
Gitblit v1.9.3