From d39e4f7d839167c16425086dfa2f8747bccfdff9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 17:39:01 +0800
Subject: [PATCH] feat: 打通销售采购财务闭环并完成累计业务优化
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/MesWmOutsourceReceiptController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/MesWmOutsourceReceiptController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/MesWmOutsourceReceiptController.java
index 34ed7dd..4e4cc69 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/MesWmOutsourceReceiptController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/MesWmOutsourceReceiptController.java
@@ -11,10 +11,10 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourcereceipt.vo.MesWmOutsourceReceiptPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourcereceipt.vo.MesWmOutsourceReceiptRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourcereceipt.vo.MesWmOutsourceReceiptSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
+import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.outsourcereceipt.MesWmOutsourceReceiptDO;
-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.outsourcereceipt.MesWmOutsourceReceiptService;
import io.swagger.v3.oas.annotations.Operation;
@@ -45,7 +45,7 @@
@Resource
private MesWmOutsourceReceiptService outsourceReceiptService;
@Resource
- private MesMdVendorService vendorService;
+ private SrmSupplierApi srmSupplierApi;
@Resource
private MesProWorkOrderService workOrderService;
@@ -76,7 +76,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱澶栧崗鍏ュ簱鍗�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-outsource-receipt:query')")
public CommonResult<MesWmOutsourceReceiptRespVO> getOutsourceReceipt(@RequestParam("id") Long id) {
MesWmOutsourceReceiptDO receipt = outsourceReceiptService.getOutsourceReceipt(id);
if (receipt == null) {
@@ -87,7 +86,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱澶栧崗鍏ュ簱鍗曞垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:wm-outsource-receipt:query')")
public CommonResult<PageResult<MesWmOutsourceReceiptRespVO>> getOutsourceReceiptPage(
@Valid MesWmOutsourceReceiptPageReqVO pageReqVO) {
PageResult<MesWmOutsourceReceiptDO> pageResult = outsourceReceiptService.getOutsourceReceiptPage(pageReqVO);
@@ -149,8 +147,9 @@
return Collections.emptyList();
}
// 1. 鑾峰緱鍏宠仈鏁版嵁
- Map<Long, MesMdVendorDO> vendorMap = vendorService.getVendorMap(
- convertSet(list, MesWmOutsourceReceiptDO::getVendorId));
+ Map<Long, SrmSupplierRespDTO> vendorMap = srmSupplierApi.getSupplierList(
+ convertSet(list, MesWmOutsourceReceiptDO::getVendorId)).getCheckedData().stream()
+ .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, s -> s));
Map<Long, MesProWorkOrderDO> workOrderMap = workOrderService.getWorkOrderMap(
convertSet(list, MesWmOutsourceReceiptDO::getWorkOrderId));
// 2. 鏋勫缓缁撴灉
--
Gitblit v1.9.3