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 | 82 ++++++++++++++++++++++++++++++++++------
1 files changed, 69 insertions(+), 13 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 469aed2..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,49 @@
@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;
+
+ @PostMapping("/auto-schedule/preview")
+ @Operation(summary = "鎵归噺涓�閿帓浜ч瑙堬紙09鈥�18鐐癸紝鎺掗櫎鍛ㄦ湯鍜岃妭鍋囨棩锛�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-task:create')")
+ public CommonResult<cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProBatchSchedulePreviewRespVO> previewBatchSchedule(
+ @Valid @RequestBody cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProBatchScheduleReqVO request) {
+ return success(batchScheduleService.preview(request));
+ }
+
+ @PostMapping("/auto-schedule")
+ @Operation(summary = "纭鎵归噺涓�閿帓浜э紙閲嶆柊鏍￠獙棰勮锛屾暣鎵瑰師瀛愭彁浜わ級")
+ @PreAuthorize("@ss.hasPermission('mes:pro-task:create')")
+ public CommonResult<java.util.Map<String, Object>> executeBatchSchedule(
+ @Valid @RequestBody cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProBatchScheduleReqVO request) {
+ return success(java.util.Map.of("taskIds", batchScheduleService.execute(request)));
+ }
@Resource
private MesProTaskService taskService;
@@ -94,6 +139,10 @@
private MesProTaskPauseRecordMapper pauseRecordMapper;
@Resource
private AdminUserApi adminUserApi;
+ @Resource
+ private HrmEmployeeApi hrmEmployeeApi;
+ @Resource
+ private cn.iocoder.yudao.module.system.api.permission.PermissionApi permissionApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鐢熶骇浠诲姟")
@@ -116,7 +165,6 @@
@Parameter(name = "workstationId", description = "宸ヤ綔绔欑紪鍙�", required = true),
@Parameter(name = "quantity", description = "鎺掍骇鏁伴噺", required = true)
})
- @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<java.util.Map<String, Object>> calculateDuration(
@RequestParam("workstationId") Long workstationId,
@RequestParam("quantity") BigDecimal quantity) {
@@ -169,7 +217,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鐢熶骇浠诲姟")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<MesProTaskRespVO> getTask(@RequestParam("id") Long id) {
MesProTaskDO task = taskService.getTask(id);
if (task == null) {
@@ -180,7 +227,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鐢熶骇浠诲姟鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<PageResult<MesProTaskRespVO>> getTaskPage(@Valid MesProTaskPageReqVO pageReqVO) {
PageResult<MesProTaskDO> pageResult = taskService.getTaskPage(pageReqVO);
return success(new PageResult<>(buildTaskRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -188,10 +234,16 @@
@GetMapping("/pending-feedback-page")
@Operation(summary = "鑾峰緱寰呮姤宸ュ彴璐﹀垎椤�", description = "宸叉帓浜т笖浠嶆湁寰呮姤宸ユ暟閲忕殑浠诲姟锛堢姸鎬�=杩涜涓級")
- @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<PageResult<MesProTaskRespVO>> getPendingFeedbackPage(@Valid MesProTaskPageReqVO pageReqVO) {
- // 鏍规嵁褰撳墠鐧诲綍浜虹敤鎴穒d 鑾峰彇瀵瑰簲鐨勭敓浜у伐鍗曞垪琛�
- pageReqVO.setAssigneeUserId(cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId());
+ 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())) {
+ 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());
@@ -226,7 +278,6 @@
@GetMapping("/gantt-list")
@Operation(summary = "鑾峰緱鐢樼壒鍥句换鍔″垪琛�", description = "鍚庣缁勮宸ュ崟=project + 浠诲姟=task 鍒楄〃")
- @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<List<GanttDataRespVO>> listGanttTaskList(@Valid MesProWorkOrderPageReqVO reqVO) {
// 1.1 鏌ヨ鍖归厤鐨勫伐鍗曪紙涓嶅垎椤碉級
reqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
@@ -252,6 +303,7 @@
convertSet(allTasks, MesProTaskDO::getProcessId));
// 2.2 缁勮鐢樼壒鍥炬暟鎹�
List<GanttDataRespVO> ganttData = new java.util.ArrayList<>();
+ Set<Long> visibleWorkOrderIds = convertSet(workOrders, MesProWorkOrderDO::getId);
for (MesProWorkOrderDO workOrder : workOrders) {
// 2.2.a 宸ュ崟 -> project 琛�
MesMdItemDO item = itemMap.get(workOrder.getProductId());
@@ -265,7 +317,10 @@
.setQuantity(workOrder.getQuantity())
.setDuration(0L)
.setProgress(calcProgress(workOrder.getQuantityProduced(), workOrder.getQuantity()));
- if (ObjUtil.notEqual(workOrder.getParentId(), MesProWorkOrderDO.PARENT_ID_NULL)) {
+ if (workOrder.getParentId() != null
+ && !Objects.equals(workOrder.getParentId(), MesProWorkOrderDO.PARENT_ID_NULL)
+ && !Objects.equals(workOrder.getParentId(), workOrder.getId())
+ && visibleWorkOrderIds.contains(workOrder.getParentId())) {
woData.setParent(MesBizTypeConstants.PRO_WORKORDER + "_" + workOrder.getParentId());
}
ganttData.add(woData);
@@ -358,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 -> {
@@ -397,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