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/packages/MesWmPackageController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java
index 70d546b..4a340ec 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java
@@ -8,10 +8,10 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackagePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackageRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackageSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
+import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.packages.MesWmPackageDO;
-import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
import cn.iocoder.yudao.module.mes.service.wm.packages.MesWmPackageService;
import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
@@ -44,7 +44,7 @@
@Resource
private MesWmPackageService packageService;
@Resource
- private MesMdClientService clientService;
+ private CrmCustomerApi customerApi;
@Resource
private MdmUnitMeasureApi mdmUnitMeasureApi;
@@ -131,7 +131,7 @@
return Collections.emptyList();
}
// 鎵归噺鏌ヨ瀹㈡埛
- Map<Long, MesMdClientDO> clientMap = clientService.getClientMap(
+ Map<Long, CrmCustomerRespDTO> clientMap = customerApi.getCustomerMap(
convertSet(list, MesWmPackageDO::getClientId));
// 鎵归噺鏌ヨ璁￠噺鍗曚綅锛堝昂瀵� + 閲嶉噺锛�
Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureList(
@@ -143,8 +143,7 @@
// 鏋勫缓杩斿洖缁撴灉
return BeanUtils.toBean(list, MesWmPackageRespVO.class, vo -> {
MapUtils.findAndThen(clientMap, vo.getClientId(),
- client -> vo.setClientCode(client.getCode()).setClientName(client.getName())
- .setClientNickname(client.getNickname()));
+ client -> vo.setClientName(client.getName()));
MapUtils.findAndThen(unitMeasureMap, vo.getSizeUnitId(),
unit -> vo.setSizeUnitName(unit.getName()));
MapUtils.findAndThen(unitMeasureMap, vo.getWeightUnitId(),
--
Gitblit v1.9.3