From 5140e16bd1cb2bdf974d47a4342f9e27ef804655 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 18 七月 2026 15:54:07 +0800
Subject: [PATCH] feat(erp): 增加销售订单MPS集成与发货通知单控制功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueController.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueController.java
index c581503..cef9968 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueController.java
@@ -12,9 +12,11 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.MesWmReturnIssueRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.MesWmReturnIssueSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueDO;
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
+import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import cn.iocoder.yudao.module.mes.service.wm.returnissue.MesWmReturnIssueService;
import io.swagger.v3.oas.annotations.Operation;
@@ -48,6 +50,8 @@
private MesMdWorkstationService workstationService;
@Resource
private MesProWorkOrderService workOrderService;
+ @Resource
+ private MesProTaskService taskService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鐢熶骇閫�鏂欏崟")
@@ -153,10 +157,14 @@
convertSet(list, MesWmReturnIssueDO::getWorkstationId));
Map<Long, MesProWorkOrderDO> workOrderMap = workOrderService.getWorkOrderMap(
convertSet(list, MesWmReturnIssueDO::getWorkOrderId));
+ Map<Long, MesProTaskDO> taskMap = taskService.getTaskMap(
+ convertSet(list, MesWmReturnIssueDO::getTaskId));
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmReturnIssueRespVO.class, vo -> {
MapUtils.findAndThen(workstationMap, vo.getWorkstationId(),
workstation -> vo.setWorkstationName(workstation.getName()));
+ MapUtils.findAndThen(taskMap, vo.getTaskId(), task ->
+ vo.setTaskCode(task.getCode()).setTaskName(task.getName()));
MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(),
workOrder -> vo.setWorkOrderCode(workOrder.getCode()));
});
--
Gitblit v1.9.3