From 0a30f9a5e0d91d157724a7afd89bd9263f35c6d9 Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期三, 26 八月 2026 17:05:18 +0800
Subject: [PATCH] feat(mes): 生产任务报工人下拉源调整为工作站人力配置
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationWorkerController.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationWorkerController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationWorkerController.java
index 2bf066d..cedf15c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationWorkerController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationWorkerController.java
@@ -10,6 +10,8 @@
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationWorkerService;
import cn.iocoder.yudao.module.system.api.dept.PostApi;
import cn.iocoder.yudao.module.system.api.dept.dto.PostRespDTO;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -37,6 +39,9 @@
@Resource
private PostApi postApi;
+
+ @Resource
+ private AdminUserApi adminUserApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓浜哄姏璧勬簮")
@@ -72,6 +77,24 @@
return success(buildWorkstationWorkerRespVOList(list));
}
+ @GetMapping("/list-user-by-workstation")
+ @Operation(summary = "鑾峰緱宸ヤ綔绔欏搴斿矖浣嶇殑鍛樺伐鍒楄〃")
+ @Parameter(name = "workstationId", description = "宸ヤ綔绔欑紪鍙�", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:md-workstation:query')")
+ public CommonResult<List<AdminUserRespDTO>> getUserListByWorkstation(
+ @RequestParam("workstationId") Long workstationId) {
+ List<MesMdWorkstationWorkerDO> list = workstationWorkerService.getWorkstationWorkerListByWorkstationId(workstationId);
+ if (CollUtil.isEmpty(list)) {
+ return success(Collections.emptyList());
+ }
+ List<Long> postIds = cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList(list, MesMdWorkstationWorkerDO::getPostId);
+ if (CollUtil.isEmpty(postIds)) {
+ return success(Collections.emptyList());
+ }
+ List<AdminUserRespDTO> userList = adminUserApi.getUserListByPostIds(postIds);
+ return success(userList);
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesMdWorkstationWorkerRespVO> buildWorkstationWorkerRespVOList(List<MesMdWorkstationWorkerDO> list) {
--
Gitblit v1.9.3