From eee03bbfea8b15d1a56ab63bd09a35c6c861c4cb Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 09 十一月 2026 13:01:08 +0800
Subject: [PATCH] feat(mes): 不合格品处置联动入库与生产订单
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
index 149e109..93515fb 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
@@ -55,6 +55,8 @@
import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskPauseRecordRespVO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import cn.iocoder.yudao.module.hrm.api.employee.HrmEmployeeApi;
+import cn.iocoder.yudao.module.hrm.api.employee.dto.HrmEmployeeSimpleRespDTO;
import java.io.IOException;
import java.math.BigDecimal;
@@ -71,6 +73,30 @@
@RequestMapping("/mes/pro/task")
@Validated
public class MesProTaskController {
+
+ @Resource
+ private cn.iocoder.yudao.module.mes.dal.mysql.pro.task.MesProTaskMapper pendingCountMapper;
+
+ @GetMapping("/unfinished-workstation-counts")
+ @Operation(summary = "鑾峰緱鍚勫伐浣滅珯鏈畬鎴愪换鍔℃暟閲�")
+ public CommonResult<List<cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProWorkstationPendingCountVO>> getPendingWorkstationCounts() {
+ Long userId = cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId();
+ // 鎶ュ伐浜轰互銆屽憳宸ョ鐞嗐�嶄腑鐨勫憳宸ヤ负鍑嗭細鐧诲綍璐﹀彿鍏堟槧灏勫埌鍛樺伐锛屽啀鎸夊憳宸ョ紪鍙疯繃婊�
+ Long assigneeId = null;
+ if (userId != null && !permissionApi.hasAnyRoles(userId,
+ cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum.SUPER_ADMIN.getCode())) {
+ HrmEmployeeSimpleRespDTO employee = hrmEmployeeApi.getEmployeeByUserId(userId);
+ if (employee == null) {
+ return success(Collections.emptyList());
+ }
+ assigneeId = employee.getId();
+ }
+ return success(pendingCountMapper.selectPendingCounts(assigneeId,
+ cn.iocoder.yudao.module.mes.enums.pro.MesProTaskStatusEnum.PREPARE.getStatus(),
+ cn.iocoder.yudao.module.mes.enums.pro.MesProTaskStatusEnum.PRODUCING.getStatus(),
+ cn.iocoder.yudao.module.mes.enums.pro.MesProTaskStatusEnum.PARTIAL_FINISHED.getStatus(),
+ cn.iocoder.yudao.module.mes.enums.pro.MesProTaskStatusEnum.PAUSED.getStatus()));
+ }
@Resource
private cn.iocoder.yudao.module.mes.service.pro.task.schedule.MesProBatchScheduleService batchScheduleService;
@@ -113,6 +139,8 @@
private MesProTaskPauseRecordMapper pauseRecordMapper;
@Resource
private AdminUserApi adminUserApi;
+ @Resource
+ private HrmEmployeeApi hrmEmployeeApi;
@Resource
private cn.iocoder.yudao.module.system.api.permission.PermissionApi permissionApi;
@@ -208,9 +236,13 @@
@Operation(summary = "鑾峰緱寰呮姤宸ュ彴璐﹀垎椤�", description = "宸叉帓浜т笖浠嶆湁寰呮姤宸ユ暟閲忕殑浠诲姟锛堢姸鎬�=杩涜涓級")
public CommonResult<PageResult<MesProTaskRespVO>> getPendingFeedbackPage(@Valid MesProTaskPageReqVO pageReqVO) {
Long loginUserId = cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId();
- // 濡傛灉褰撳墠鐧诲綍浜轰笉鏄秴绾х鐞嗗憳锛屽垯浠呮煡璇㈠垎閰嶇粰鑷繁鐨勭敓浜у伐鍗�
+ // 濡傛灉褰撳墠鐧诲綍浜轰笉鏄秴绾х鐞嗗憳锛屽垯浠呮煡璇㈠垎閰嶇粰鑷繁鐨勭敓浜у伐鍗曪紙鐧诲綍璐﹀彿鍏堟槧灏勫埌鍛樺伐锛�
if (loginUserId != null && !permissionApi.hasAnyRoles(loginUserId, cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum.SUPER_ADMIN.getCode())) {
- pageReqVO.setAssigneeUserId(loginUserId);
+ HrmEmployeeSimpleRespDTO employee = hrmEmployeeApi.getEmployeeByUserId(loginUserId);
+ if (employee == null) {
+ return success(PageResult.empty());
+ }
+ pageReqVO.setAssigneeUserId(employee.getId());
}
PageResult<MesProTaskDO> pageResult = taskService.getPendingFeedbackPage(pageReqVO);
List<MesProTaskRespVO> respVOList = buildTaskRespVOList(pageResult.getList());
@@ -381,7 +413,8 @@
Set<Long> allAssigneeUserIds = new HashSet<>();
assigneeMap.values().forEach(assignees ->
assignees.forEach(assignee -> allAssigneeUserIds.add(assignee.getUserId())));
- Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(allAssigneeUserIds);
+ // 鎶ュ伐浜哄瓨鐨勬槸鍛樺伐缂栧彿锛屽悕绉颁粠銆屽憳宸ョ鐞嗐�嶅彇
+ Map<Long, HrmEmployeeSimpleRespDTO> employeeMap = hrmEmployeeApi.getEmployeeMap(allAssigneeUserIds);
// 鎷兼帴 VO
return convertList(list, task -> {
@@ -420,10 +453,10 @@
List<Long> assigneeUserIds = convertList(assignees, cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskAssigneeDO::getUserId);
vo.setAssigneeUserIds(assigneeUserIds);
List<String> assigneeUserNames = new ArrayList<>();
- for (Long userId : assigneeUserIds) {
- AdminUserRespDTO user = userMap.get(userId);
- if (user != null && user.getNickname() != null) {
- assigneeUserNames.add(user.getNickname());
+ for (Long employeeId : assigneeUserIds) {
+ HrmEmployeeSimpleRespDTO employee = employeeMap.get(employeeId);
+ if (employee != null && employee.getName() != null) {
+ assigneeUserNames.add(employee.getName());
}
}
vo.setAssigneeUserNames(assigneeUserNames);
--
Gitblit v1.9.3