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 | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
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 62e7c98..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
@@ -64,12 +64,15 @@
IPage<Equipment> pageEquipment(IPage<Map> pageData,@Param("params") Map<String, Object> params);
+ IPage<Map<String, Object>> getEquipmentListAllStandard(IPage<Map> pageData, @Param("params") Map<String,Object> params);
+
List<Equipment> getEquipmentList( Page<Equipment> page,
@Param("num") String num,
@Param("name")String name,
@Param("model")String model,
@Param("workCenterId")String workCenterId,
@Param("factoryModelId")String factoryModelId,
+ @Param("areaId")String areaId,
@Param("manageId")String manageId,
@Param("useId")String useId,
@Param("equipmentImportanceId")String equipmentImportanceId,
@@ -79,7 +82,35 @@
@Param("warrantyStart")Date warrantyStart,
@Param("warrantyEnd")Date warrantyEnd,
@Param("lineId")String lineId,
- @Param("sql")String sql
+ @Param("isLineEquip")String isLineEquip,
+ @Param("isLine")String isLine,
+ @Param("equipmentCategoryId")String equipmentCategoryId,
+ @Param("equipNums") List<String> equipNums,
+ @Param("sql")String sql,
+ @Param("userWorkCenterIds")List<String> userWorkCenterIds
+ );
+
+ List<Equipment> getEquipmentTZList( Page<Equipment> page,
+ @Param("num") String num,
+ @Param("name")String name,
+ @Param("model")String model,
+ @Param("workCenterIds")List<String> workCenterIds,
+ @Param("factoryModelId")String factoryModelId,
+ @Param("areaId")String areaId,
+ @Param("manageId")String manageId,
+ @Param("useId")String useId,
+ @Param("equipmentImportanceId")String equipmentImportanceId,
+ @Param("technologyStatus")String technologyStatus,
+ @Param("equipmentStatus")String equipmentStatus,
+ @Param("specificEquipment")String specificEquipment,
+ @Param("warrantyStart")Date warrantyStart,
+ @Param("warrantyEnd")Date warrantyEnd,
+ @Param("lineId")String lineId,
+ @Param("isLineEquip")String isLineEquip,
+ @Param("isLine")String isLine,
+ @Param("equipmentCategoryId")String equipmentCategoryId,
+ @Param("equipNums") List<String> equipNums,
+ @Param("sql")String sql
);
List<DailyInspectionStandardDetail> getStandardList(Page<DailyInspectionStandardDetail> page,@Param("mainId") String mainId,@Param("type")String type);
}
--
Gitblit v1.9.3