From 87733eb3623593da247c051593d64b8ff9e1d3a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 06 十一月 2026 19:00:39 +0800
Subject: [PATCH] feat(crm,mes): 扩展客户字段与重构批次号生成逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java
index a83a15b..123b59c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java
@@ -48,6 +48,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -148,6 +149,7 @@
return success(null);
}
MesProBatchRespVO respVO = buildBatchRespVOList(Collections.singletonList(batch)).get(0);
+ respVO.setBindingMode(batchService.getBindingMode(id));
// 濉厖浜哄憳閰嶇疆
respVO.setWorkers(buildWorkerRespVOList(batchService.getBatchWorkerListByBatchId(id)));
return success(respVO);
@@ -245,9 +247,16 @@
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
convertSet(list, MesProBatchDO::getOwnerUserId));
Map<Long, MesMdmItemDO> itemMap = mdmItemService.getItemMap(convertSet(list, MesProBatchDO::getItemId));
+ // 鎵规涓嬪凡鐢熸垚鐨勬寮忔墭鐩樼爜锛堟壒閲忔煡璇紝閬垮厤閫愯鏌ヨ锛�
+ Map<Long, List<String>> palletCodeMap = palletService.getPalletListByBatchIds(
+ convertSet(list, MesProBatchDO::getId)).stream()
+ .filter(pallet -> StrUtil.isNotBlank(pallet.getCode()))
+ .collect(Collectors.groupingBy(MesProPalletDO::getBatchId,
+ Collectors.mapping(MesProPalletDO::getCode, Collectors.toList())));
return BeanUtils.toBean(list, MesProBatchRespVO.class, vo -> {
MapUtils.findAndThen(userMap, vo.getOwnerUserId(), user -> vo.setOwnerUserName(user.getNickname()));
MapUtils.findAndThen(itemMap, vo.getItemId(), item -> { vo.setItemCode(item.getCode()); vo.setItemName(item.getName()); });
+ vo.setPalletCodes(palletCodeMap.getOrDefault(vo.getId(), Collections.emptyList()));
});
}
--
Gitblit v1.9.3