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/outsourceissue/MesWmOutsourceIssueController.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java
index 6f45fb9..ea6ed6e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java
@@ -11,10 +11,10 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourceissue.vo.MesWmOutsourceIssuePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourceissue.vo.MesWmOutsourceIssueRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourceissue.vo.MesWmOutsourceIssueSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO;
+import cn.iocoder.yudao.module.erp.api.purchase.ErpSupplierApi;
+import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.outsourceissue.MesWmOutsourceIssueDO;
-import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import cn.iocoder.yudao.module.mes.service.wm.outsourceissue.MesWmOutsourceIssueService;
import io.swagger.v3.oas.annotations.Operation;
@@ -36,11 +36,6 @@
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-/**
- * MES 澶栧崗鍙戞枡鍗� Controller
- *
- * @author 鑺嬮亾婧愮爜
- */
@Tag(name = "绠＄悊鍚庡彴 - MES 澶栧崗鍙戞枡鍗�")
@RestController
@RequestMapping("/mes/wm/outsource-issue")
@@ -50,7 +45,7 @@
@Resource
private MesWmOutsourceIssueService outsourceIssueService;
@Resource
- private MesMdVendorService vendorService;
+ private ErpSupplierApi supplierApi;
@Resource
private MesProWorkOrderService workOrderService;
@@ -162,14 +157,15 @@
return Collections.emptyList();
}
// 1. 鑾峰緱鍏宠仈鏁版嵁
- Map<Long, MesMdVendorDO> vendorMap = vendorService.getVendorMap(
- convertSet(list, MesWmOutsourceIssueDO::getVendorId));
+ Map<Long, ErpSupplierRespDTO> vendorMap = supplierApi.getSupplierList(
+ convertSet(list, MesWmOutsourceIssueDO::getVendorId)).getCheckedData().stream()
+ .collect(java.util.stream.Collectors.toMap(ErpSupplierRespDTO::getId, s -> s));
Map<Long, MesProWorkOrderDO> workOrderMap = workOrderService.getWorkOrderMap(
convertSet(list, MesWmOutsourceIssueDO::getWorkOrderId));
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmOutsourceIssueRespVO.class, vo -> {
MapUtils.findAndThen(vendorMap, vo.getVendorId(), vendor ->
- vo.setVendorCode(vendor.getCode()).setVendorName(vendor.getName()));
+ vo.setVendorName(vendor.getName()));
MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(), workOrder ->
vo.setWorkOrderCode(workOrder.getCode()).setWorkOrderName(workOrder.getName()));
});
--
Gitblit v1.9.3