From f02d0df2f1dfc7a8b775cf50d45375e57628a5ef Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 10 十一月 2026 11:26:22 +0800
Subject: [PATCH] feat(ncr): 完善NCR处置联动逻辑与关闭校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationWorkerController.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 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 cedf15c..465d010 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
@@ -4,14 +4,15 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.hrm.api.employee.HrmEmployeeApi;
+import cn.iocoder.yudao.module.hrm.api.employee.dto.HrmEmployeeSimpleRespDTO;
+import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.worker.MesMdWorkstationEmployeeRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.worker.MesMdWorkstationWorkerRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.worker.MesMdWorkstationWorkerSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationWorkerDO;
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;
@@ -21,6 +22,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -41,7 +43,7 @@
private PostApi postApi;
@Resource
- private AdminUserApi adminUserApi;
+ private HrmEmployeeApi hrmEmployeeApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓浜哄姏璧勬簮")
@@ -70,7 +72,6 @@
@GetMapping("/list-by-workstation")
@Operation(summary = "鑾峰緱浜哄姏璧勬簮鍒楄〃")
@Parameter(name = "workstationId", description = "宸ヤ綔绔欑紪鍙�", required = true)
- @PreAuthorize("@ss.hasPermission('mes:md-workstation:query')")
public CommonResult<List<MesMdWorkstationWorkerRespVO>> getWorkstationWorkerList(
@RequestParam("workstationId") Long workstationId) {
List<MesMdWorkstationWorkerDO> list = workstationWorkerService.getWorkstationWorkerListByWorkstationId(workstationId);
@@ -78,10 +79,9 @@
}
@GetMapping("/list-user-by-workstation")
- @Operation(summary = "鑾峰緱宸ヤ綔绔欏搴斿矖浣嶇殑鍛樺伐鍒楄〃")
+ @Operation(summary = "鑾峰緱宸ヤ綔绔欏搴斿矖浣嶇殑鍛樺伐鍒楄〃锛堝彇鑷憳宸ョ鐞嗘暟鎹紝涓嶈姹傚紑閫氱郴缁熻处鍙凤級")
@Parameter(name = "workstationId", description = "宸ヤ綔绔欑紪鍙�", required = true)
- @PreAuthorize("@ss.hasPermission('mes:md-workstation:query')")
- public CommonResult<List<AdminUserRespDTO>> getUserListByWorkstation(
+ public CommonResult<List<MesMdWorkstationEmployeeRespVO>> getUserListByWorkstation(
@RequestParam("workstationId") Long workstationId) {
List<MesMdWorkstationWorkerDO> list = workstationWorkerService.getWorkstationWorkerListByWorkstationId(workstationId);
if (CollUtil.isEmpty(list)) {
@@ -91,8 +91,17 @@
if (CollUtil.isEmpty(postIds)) {
return success(Collections.emptyList());
}
- List<AdminUserRespDTO> userList = adminUserApi.getUserListByPostIds(postIds);
- return success(userList);
+ List<HrmEmployeeSimpleRespDTO> employees = hrmEmployeeApi.getEmployeeListByPostIds(postIds);
+ List<MesMdWorkstationEmployeeRespVO> result = new ArrayList<>(employees.size());
+ for (HrmEmployeeSimpleRespDTO employee : employees) {
+ MesMdWorkstationEmployeeRespVO vo = new MesMdWorkstationEmployeeRespVO();
+ vo.setId(employee.getId());
+ vo.setNickname(employee.getName());
+ vo.setDeptId(employee.getDeptId());
+ vo.setPhone(employee.getPhone());
+ result.add(vo);
+ }
+ return success(result);
}
// ==================== 鎷兼帴 VO ====================
--
Gitblit v1.9.3