From be5783c8a7e13bbc76d33c95643d75779cce21db Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueLineController.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueLineController.java
index 23aa6e7..ea53e5e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueLineController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueLineController.java
@@ -12,6 +12,7 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueLineDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueLinePageVO;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
@@ -88,8 +89,8 @@
@PreAuthorize("@ss.hasPermission('mes:wm-return-issue:query')")
public CommonResult<PageResult<MesWmReturnIssueLineRespVO>> getReturnIssueLinePage(
@Valid MesWmReturnIssueLinePageReqVO pageReqVO) {
- PageResult<MesWmReturnIssueLineDO> pageResult = issueLineService.getReturnIssueLinePage(pageReqVO);
- return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal()));
+ PageResult<MesWmReturnIssueLinePageVO> pageResult = issueLineService.getReturnIssueLinePage(pageReqVO);
+ return success(new PageResult<>(buildRespVOListFromPageVO(pageResult.getList()), pageResult.getTotal()));
}
@GetMapping("/list-by-issue")
@@ -104,6 +105,40 @@
// ==================== 鎷兼帴 VO ====================
+ /**
+ * 鍒嗛〉鏌ヨ缁撴灉鏋勫缓 RespVO锛圫QL 宸插叧鑱� mdm_item锛宑ode/name/specification 鐩存帴浠� PageVO 鍙栵級
+ */
+ private List<MesWmReturnIssueLineRespVO> buildRespVOListFromPageVO(List<MesWmReturnIssueLinePageVO> list) {
+ if (CollUtil.isEmpty(list)) {
+ return Collections.emptyList();
+ }
+ // 1. 鑾峰緱鍏宠仈鏁版嵁锛堣閲忓崟浣嶃�佺敓浜т换鍔★級
+ Map<Long, MesMdItemDO> itemMap = mdmItemService.getItemMap(
+ convertSet(list, MesWmReturnIssueLinePageVO::getItemId));
+ Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
+ convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ Map<Long, MesProTaskDO> taskMap = taskService.getTaskMap(
+ convertSet(list, MesWmReturnIssueLinePageVO::getTaskId));
+ // 2. 鏋勫缓缁撴灉
+ return BeanUtils.toBean(list, MesWmReturnIssueLineRespVO.class, vo -> {
+ // code/name/specification 浠� PageVO 鐩存帴鏄犲皠锛堝瓧娈靛悕涓嶅悓闇�鎵嬪姩璧嬪�硷級
+ list.stream()
+ .filter(v -> java.util.Objects.equals(v.getId(), vo.getId()))
+ .findFirst()
+ .ifPresent(pageVO -> {
+ vo.setItemCode(pageVO.getCode());
+ vo.setItemName(pageVO.getName());
+ vo.setSpecification(pageVO.getSpecification());
+ });
+ // 璁￠噺鍗曚綅浠嶉渶浠� itemMap 鑾峰彇
+ MapUtils.findAndThen(itemMap, vo.getItemId(), item ->
+ MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
+ unit -> vo.setUnitMeasureName(unit.getName())));
+ MapUtils.findAndThen(taskMap, vo.getTaskId(), task ->
+ vo.setTaskCode(task.getCode()).setTaskName(task.getName()));
+ });
+ }
+
private List<MesWmReturnIssueLineRespVO> buildRespVOList(List<MesWmReturnIssueLineDO> list) {
if (CollUtil.isEmpty(list)) {
return Collections.emptyList();
--
Gitblit v1.9.3