From 6074864314f5452fd023c34ab11118c393969bcc Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 08 九月 2025 11:36:21 +0800
Subject: [PATCH] 排产工单模块工艺点检涉及接口
---
src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index 732defb..c911f91 100644
--- a/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -367,4 +367,25 @@
}}).collect(Collectors.toList());
return Result.ok(equipmentMapList);
}
+
+ @AutoLog(value = "鏌ヨ鎺掍骇宸ュ崟鎵�灞炰骇绾夸笅闇�瑕佸伐鑹虹偣妫�鐨勮澶囧垪琛�")
+ @ApiOperation(value = "鏌ヨ鎺掍骇宸ュ崟鎵�灞炰骇绾夸笅闇�瑕佸伐鑹虹偣妫�鐨勮澶囧垪琛�", notes = "鏌ヨ鎺掍骇宸ュ崟鎵�灞炰骇绾夸笅闇�瑕佸伐鑹虹偣妫�鐨勮澶囧垪琛�")
+ @GetMapping(value = "/listProductionLineProcessCheckEquipment")
+ public Result<?> listProductionLineProcessCheckEquipment(@RequestParam("orderId") String orderId) {
+ MesProductionWorkOrder workOrder = mesProductionWorkOrderService.getById(orderId);
+ if (workOrder == null) {
+ return Result.error("宸ュ崟涓嶅瓨鍦紒");
+ }
+ List<Map<String, Object>> equipmentMapList = eamEquipmentService.list(new LambdaQueryWrapper<EamEquipment>()
+ .eq(EamEquipment::getOrgId, workOrder.getFactoryId())
+ .eq(EamEquipment::getDelFlag, CommonConstant.DEL_FLAG_0)
+ .apply("EXISTS (SELECT 1 FROM eam_equipment_process_parameters t WHERE t.equipment_id = eam_equipment.id)")
+ .apply("NOT EXISTS (SELECT 1 FROM eam_process_check t WHERE t.equipment_id = eam_equipment.id AND t.work_order_id = {0})", orderId))
+ .stream().map(e -> (Map<String, Object>) new HashMap<String, Object>() {{
+ put("value", e.getId());
+ put("label", e.getEquipmentCode() + "[" + e.getEquipmentName() + "]");
+ put("text", e.getEquipmentCode() + "[" + e.getEquipmentName() + "]");
+ }}).collect(Collectors.toList());
+ return Result.ok(equipmentMapList);
+ }
}
--
Gitblit v1.9.3