From 9de1d40d3a61ce166c63a2c07d02d89bf8bdabd0 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 07 三月 2025 16:16:18 +0800
Subject: [PATCH] art: 选择设备查询逻辑修改， 点检工单新增时产线逻辑修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 51bfc63..e874d7a 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
@@ -198,11 +198,13 @@
for (InspectionOrderDetail inspectionOrderDetail : inspectionOrderDetailList) {
String id = inspectionOrder.getId();
String inspectionStandardDetailId = inspectionOrderDetail.getInspectionStandardDetailId();
+ //鐐规椤圭洰id
String inspectionProjectId = inspectionOrderDetail.getInspectionProjectId();
-
+ //鐐规鏍囧噯
DailyInspectionStandardDetail dailyInspectionStandardDetail = dailyInspectionStandardDetailService.getById(inspectionStandardDetailId);
+ //鐐规椤圭洰
InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId);
-
+ //鐐规鏄庣粏娣诲姞
inspectionOrderDetail.setId("");
inspectionOrderDetail.setInspectionOrderId(id);
inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation());
@@ -217,11 +219,18 @@
inspectionOrderDetailService.save(inspectionOrderDetail);
}
}else{
+ //鐢熶骇绾胯澶囷紝鎸夌収鐢熶骇绾挎潵杩涜鐐规
String lineId = equipment.getLineId();
+ if(StringUtils.isBlank(lineId)){
+ return Result.error("鐢熶骇绾胯澶囨病鏈夊叧鑱斿埌浜х嚎缂栧彿");
+ }
List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
.eq(DailyInspectionStandard::getEquipmentId, lineId)
.eq(DailyInspectionStandard::getVersionStatus, "2")
.eq(DailyInspectionStandard::getDelFlag, "0").list();
+ if(CollectionUtils.isEmpty(dailyInspectionStandards)){
+ return Result.error("璁惧瀵瑰簲鐨勪骇绾挎病鏈夐厤缃偣妫�鏍囧噯");
+ }
if(dailyInspectionStandards.size()>0) {
DailyInspectionStandard dailyInspectionStandard = dailyInspectionStandards.get(0);
//淇濆瓨鐐规宸ュ崟瀛愯〃鏁版嵁
--
Gitblit v1.9.3