From cb7eb6fa3477e624f7112a2eac632783b96bf4b4 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 15 一月 2024 16:19:35 +0800
Subject: [PATCH] 点检标准 多sheet页导入
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java | 149 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 114 insertions(+), 35 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
index bc83a23..15fe908 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
@@ -33,6 +33,7 @@
//import org.jeecg.modules.system.entity.SysUploadRela;
//import org.jeecg.modules.system.service.IUploadRelaService;
//import org.jeecg.modules.system.service.IUploadService;
+import org.jeecg.modules.eam.vo.SysFileNameVo;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -81,6 +82,14 @@
@Autowired
@Lazy
private IdentityService sysIdentityService;
+
+ @Autowired
+ @Lazy
+ private IEamEquipmentService equipmentService;
+
+ @Autowired
+ @Lazy
+ private IDailyInspectionStandardService dailyInspectionStandardService;
// @Autowired
// private IUploadRelaService uploadRelaService;
@@ -178,30 +187,65 @@
}
inspectionOrder.setInspectionDeadline(date);
inspectionOrder.setInspectionStandardType("1");
+ inspectionOrder.setStatus("3");//3:鏈紑濮�
inspectionOrderService.save(inspectionOrder);
- List<InspectionOrderDetail> inspectionOrderDetailList = inspectionOrder.getInspectionOrderDetailList();
- for (InspectionOrderDetail inspectionOrderDetail : inspectionOrderDetailList) {
- String id = inspectionOrder.getId();
- String inspectionStandardDetailId = inspectionOrderDetail.getInspectionStandardDetailId();
- String inspectionProjectId = inspectionOrderDetail.getInspectionProjectId();
- DailyInspectionStandardDetail dailyInspectionStandardDetail = dailyInspectionStandardDetailService.getById(inspectionStandardDetailId);
- InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId);
+ String equipmentId = inspectionOrder.getEquipmentId();
+ Equipment equipment = equipmentService.getById(equipmentId);
+ String isLineEquip = equipment.getIsLineEquip();
+ if("no".equals(isLineEquip)){
+ List<InspectionOrderDetail> inspectionOrderDetailList = inspectionOrder.getInspectionOrderDetailList();
+ for (InspectionOrderDetail inspectionOrderDetail : inspectionOrderDetailList) {
+ String id = inspectionOrder.getId();
+ String inspectionStandardDetailId = inspectionOrderDetail.getInspectionStandardDetailId();
+ String inspectionProjectId = inspectionOrderDetail.getInspectionProjectId();
- inspectionOrderDetail.setId("");
- inspectionOrderDetail.setInspectionOrderId(id);
- inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation());
- inspectionOrderDetail.setPhoto(dailyInspectionStandardDetail.getPhoto());
- inspectionOrderDetail.setInspectionMethod(inspectionProject.getInspectionMethod());
- inspectionOrderDetail.setInspectionTool(inspectionProject.getInspectionTool());
- inspectionOrderDetail.setAnalysisMethod(inspectionProject.getAnalysisMethod());
- inspectionOrderDetail.setTestValueType(inspectionProject.getTestValueType());
- inspectionOrderDetail.setDetectionStandard(inspectionProject.getDetectionStandard());
- inspectionOrderDetail.setAcceptabilityLimit(inspectionProject.getAcceptabilityLimit());
+ DailyInspectionStandardDetail dailyInspectionStandardDetail = dailyInspectionStandardDetailService.getById(inspectionStandardDetailId);
+ InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId);
- inspectionOrderDetailService.save(inspectionOrderDetail);
+ inspectionOrderDetail.setId("");
+ inspectionOrderDetail.setInspectionOrderId(id);
+ inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation());
+ inspectionOrderDetail.setPhoto(dailyInspectionStandardDetail.getPhoto());
+ inspectionOrderDetail.setInspectionMethod(inspectionProject.getInspectionMethod());
+ inspectionOrderDetail.setInspectionTool(inspectionProject.getInspectionTool());
+ inspectionOrderDetail.setAnalysisMethod(inspectionProject.getAnalysisMethod());
+ inspectionOrderDetail.setTestValueType(inspectionProject.getTestValueType());
+ inspectionOrderDetail.setDetectionStandard(inspectionProject.getDetectionStandard());
+ inspectionOrderDetail.setAcceptabilityLimit(inspectionProject.getAcceptabilityLimit());
+
+ inspectionOrderDetailService.save(inspectionOrderDetail);
+ }
+ }else{
+ String lineId = equipment.getLineId();
+ List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
+ .eq(DailyInspectionStandard::getEquipmentId, lineId)
+ .eq(DailyInspectionStandard::getVersionStatus, "2")
+ .eq(DailyInspectionStandard::getDelFlag, "0").list();
+ if(dailyInspectionStandards.size()>0) {
+ DailyInspectionStandard dailyInspectionStandard = dailyInspectionStandards.get(0);
+ //淇濆瓨鐐规宸ュ崟瀛愯〃鏁版嵁
+ List<DailyInspectionStandardDetail> dailyInspectionStandardDetailList = dailyInspectionStandardDetailService.lambdaQuery()
+ .eq(DailyInspectionStandardDetail::getDailyInspectionStandardId,dailyInspectionStandard.getId())
+ .eq(DailyInspectionStandardDetail::getInspectionCycleId,inspectionOrder.getInspectionCycleId())
+ .eq(DailyInspectionStandardDetail::getDelFlag,"0").list();
+ for(DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetailList){
+ String inspectionProjectId = dailyInspectionStandardDetail.getInspectionProjectId();
+
+ InspectionOrderDetail inspectionOrderDetail = new InspectionOrderDetail();
+ inspectionOrderDetail.setInspectionOrderId(inspectionOrder.getId());
+ inspectionOrderDetail.setInspectionProjectId(inspectionProjectId);
+ inspectionOrderDetail.setInspectionStandardDetailId(dailyInspectionStandardDetail.getId());
+ inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation());
+ inspectionOrderDetail.setPhoto(dailyInspectionStandardDetail.getPhoto());
+ InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId);
+ if(inspectionProject != null){
+ inspectionOrderDetail.setDetectionStandard(inspectionProject.getDetectionStandard());
+ }
+ inspectionOrderDetailService.save(inspectionOrderDetail);
+ }
+ }
}
-
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -241,25 +285,59 @@
inspectionOrderDetailService.updateById(inspectionOrderDetail);
}
- List<InspectionOrderDetail> inspectionOrderDetailList = inspectionOrder.getInspectionOrderDetailList();
- for (InspectionOrderDetail inspectionOrderDetail : inspectionOrderDetailList) {
- String inspectionStandardDetailId = inspectionOrderDetail.getInspectionStandardDetailId();
- String inspectionProjectId = inspectionOrderDetail.getInspectionProjectId();
+ String equipmentId = inspectionOrder.getEquipmentId();
+ Equipment equipment = equipmentService.getById(equipmentId);
+ String isLineEquip = equipment.getIsLineEquip();
+ if("no".equals(isLineEquip)){
+ List<InspectionOrderDetail> inspectionOrderDetailList = inspectionOrder.getInspectionOrderDetailList();
+ for (InspectionOrderDetail inspectionOrderDetail : inspectionOrderDetailList) {
+ String inspectionStandardDetailId = inspectionOrderDetail.getInspectionStandardDetailId();
+ String inspectionProjectId = inspectionOrderDetail.getInspectionProjectId();
- DailyInspectionStandardDetail dailyInspectionStandardDetail = dailyInspectionStandardDetailService.getById(inspectionStandardDetailId);
- InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId);
+ DailyInspectionStandardDetail dailyInspectionStandardDetail = dailyInspectionStandardDetailService.getById(inspectionStandardDetailId);
+ InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId);
- inspectionOrderDetail.setId("");
- inspectionOrderDetail.setInspectionOrderId(id);
- inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation());
- inspectionOrderDetail.setInspectionMethod(inspectionProject.getInspectionMethod());
- inspectionOrderDetail.setInspectionTool(inspectionProject.getInspectionTool());
- inspectionOrderDetail.setAnalysisMethod(inspectionProject.getAnalysisMethod());
- inspectionOrderDetail.setTestValueType(inspectionProject.getTestValueType());
- inspectionOrderDetail.setDetectionStandard(inspectionProject.getDetectionStandard());
- inspectionOrderDetail.setAcceptabilityLimit(inspectionProject.getAcceptabilityLimit());
+ inspectionOrderDetail.setId("");
+ inspectionOrderDetail.setInspectionOrderId(id);
+ inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation());
+ inspectionOrderDetail.setInspectionMethod(inspectionProject.getInspectionMethod());
+ inspectionOrderDetail.setInspectionTool(inspectionProject.getInspectionTool());
+ inspectionOrderDetail.setAnalysisMethod(inspectionProject.getAnalysisMethod());
+ inspectionOrderDetail.setTestValueType(inspectionProject.getTestValueType());
+ inspectionOrderDetail.setDetectionStandard(inspectionProject.getDetectionStandard());
+ inspectionOrderDetail.setAcceptabilityLimit(inspectionProject.getAcceptabilityLimit());
- inspectionOrderDetailService.save(inspectionOrderDetail);
+ inspectionOrderDetailService.save(inspectionOrderDetail);
+ }
+ }else{
+ String lineId = equipment.getLineId();
+ List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
+ .eq(DailyInspectionStandard::getEquipmentId, lineId)
+ .eq(DailyInspectionStandard::getVersionStatus, "2")
+ .eq(DailyInspectionStandard::getDelFlag, "0").list();
+ if(dailyInspectionStandards.size()>0) {
+ DailyInspectionStandard dailyInspectionStandard = dailyInspectionStandards.get(0);
+ //淇濆瓨鐐规宸ュ崟瀛愯〃鏁版嵁
+ List<DailyInspectionStandardDetail> dailyInspectionStandardDetailList = dailyInspectionStandardDetailService.lambdaQuery()
+ .eq(DailyInspectionStandardDetail::getDailyInspectionStandardId,dailyInspectionStandard.getId())
+ .eq(DailyInspectionStandardDetail::getInspectionCycleId,inspectionOrder.getInspectionCycleId())
+ .eq(DailyInspectionStandardDetail::getDelFlag,"0").list();
+ for(DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetailList){
+ String inspectionProjectId = dailyInspectionStandardDetail.getInspectionProjectId();
+
+ InspectionOrderDetail inspectionOrderDetail = new InspectionOrderDetail();
+ inspectionOrderDetail.setInspectionOrderId(inspectionOrder.getId());
+ inspectionOrderDetail.setInspectionProjectId(inspectionProjectId);
+ inspectionOrderDetail.setInspectionStandardDetailId(dailyInspectionStandardDetail.getId());
+ inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation());
+ inspectionOrderDetail.setPhoto(dailyInspectionStandardDetail.getPhoto());
+ InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId);
+ if(inspectionProject != null){
+ inspectionOrderDetail.setDetectionStandard(inspectionProject.getDetectionStandard());
+ }
+ inspectionOrderDetailService.save(inspectionOrderDetail);
+ }
+ }
}
}
String inspectionUserId = inspectionOrder.getInspectionUserId();
@@ -478,6 +556,7 @@
equipmentReportRepair.setNum(num);
equipmentReportRepair.setStatus("1");
equipmentReportRepair.setSource("2");
+ equipmentReportRepair.setType("2");//绫诲瀷锛�1琚姩鎶ヤ慨锛�2涓诲姩鎶ヤ慨锛�
equipmentReportRepair.setIsCreateOrder(0);
equipmentReportRepair.setEquipmentId(inspectionOrder.getEquipmentId());
equipmentReportRepair.setFaultDescription(orderDetail.getAbnormalDesc());
--
Gitblit v1.9.3