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/batch/MesWmBatchController.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/MesWmBatchController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/MesWmBatchController.java
index 415c15d..398a808 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/MesWmBatchController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/MesWmBatchController.java
@@ -7,21 +7,21 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchRespVO;
-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.erp.api.purchase.ErpSupplierApi;
+import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO;
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.tm.tool.MesTmToolDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
-import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
-import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService;
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;
@@ -60,9 +60,9 @@
@Resource
private MdmUnitMeasureApi mdmUnitMeasureApi;
@Resource
- private MesMdVendorService vendorService;
+ private ErpSupplierApi supplierApi;
@Resource
- private MesMdClientService clientService;
+ private CrmCustomerApi customerApi;
@Resource
private MesProWorkOrderService workOrderService;
@Resource
@@ -116,9 +116,10 @@
// 1. 鑾峰緱鍏宠仈鏁版嵁
Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
convertSet(list, MesWmBatchDO::getItemId));
- Map<Long, MesMdVendorDO> vendorMap = vendorService.getVendorMap(
- convertSet(list, MesWmBatchDO::getVendorId));
- Map<Long, MesMdClientDO> clientMap = clientService.getClientMap(
+ Map<Long, ErpSupplierRespDTO> vendorMap = supplierApi.getSupplierList(
+ convertSet(list, MesWmBatchDO::getVendorId)).getCheckedData().stream()
+ .collect(Collectors.toMap(ErpSupplierRespDTO::getId, s -> s));
+ Map<Long, CrmCustomerRespDTO> clientMap = customerApi.getCustomerMap(
convertSet(list, MesWmBatchDO::getClientId));
Map<Long, MesProWorkOrderDO> workOrderMap = workOrderService.getWorkOrderMap(
convertSet(list, MesWmBatchDO::getWorkOrderId));
@@ -140,9 +141,9 @@
unitMeasure -> vo.setUnitName(unitMeasure.getName()));
});
MapUtils.findAndThen(vendorMap, vo.getVendorId(),
- vendor -> vo.setVendorCode(vendor.getCode()).setVendorName(vendor.getName()));
+ vendor -> vo.setVendorName(vendor.getName()));
MapUtils.findAndThen(clientMap, vo.getClientId(),
- client -> vo.setClientCode(client.getCode()).setClientName(client.getName()));
+ client -> vo.setClientName(client.getName()));
MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(),
workOrder -> vo.setWorkOrderCode(workOrder.getCode()));
MapUtils.findAndThen(taskMap, vo.getTaskId(),
--
Gitblit v1.9.3