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/mapper/EamEquipmentMapper.java | 3 ++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 3 ++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 6 ++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 4 ++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java | 6 ++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java | 2 ++
6 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index e4dc0fb..90cc38b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -301,6 +301,10 @@
HttpServletRequest req) {
QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
+ List<String> userWorkCenterIds = getUserWorkCenterIds();
+ if(userWorkCenterIds != null && userWorkCenterIds.size() > 0){
+ equipment.setUserWorkCenterIds(userWorkCenterIds);
+ }
IPage<Equipment> pageList = equipmentService.getEquipmentList(page, equipment);
return Result.OK(pageList);
}
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 574d216..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
@@ -221,10 +221,16 @@
}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);
//淇濆瓨鐐规宸ュ崟瀛愯〃鏁版嵁
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
index 616077c..1698a38 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
@@ -423,6 +423,8 @@
private String yseNoMaintenance2Standard;
@TableField(exist = false)
private String yseNoMaintenance3Standard;
+ @TableField(exist = false)
+ private List<String> userWorkCenterIds;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java
index c51560f..fd3a99c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java
@@ -86,7 +86,8 @@
@Param("isLine")String isLine,
@Param("equipmentCategoryId")String equipmentCategoryId,
@Param("equipNums") List<String> equipNums,
- @Param("sql")String sql
+ @Param("sql")String sql,
+ @Param("userWorkCenterIds")List<String> userWorkCenterIds
);
List<Equipment> getEquipmentTZList( Page<Equipment> page,
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
index 14d4ca6..5b80b3a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
@@ -325,6 +325,12 @@
<if test="lineId != null and lineId != ''">
and t1.line_id = #{lineId}
</if>
+ <if test="userWorkCenterIds != null and userWorkCenterIds.size > 0">
+ and t1.work_center_id in
+ <foreach collection="userWorkCenterIds" open="(" separator="," close=")" item="workCenterId">
+ #{workCenterId}
+ </foreach>
+ </if>
order by t1.create_time desc
</select>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index bff7304..db8f866 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -138,7 +138,8 @@
equipment.getIsLine(),
equipment.getEquipmentCategoryId(),
equipNums,
- sql
+ sql,
+ equipment.getUserWorkCenterIds()
));
}
--
Gitblit v1.9.3