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/arrivalnotice/MesWmArrivalNoticeController.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java
index bc4256e..8f35b03 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java
@@ -14,9 +14,10 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO;
import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
-import cn.iocoder.yudao.module.erp.api.purchase.ErpSupplierApi;
+import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderRespDTO;
-import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
+import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -45,7 +46,7 @@
@Resource
private MesWmArrivalNoticeService arrivalNoticeService;
@Resource
- private ErpSupplierApi supplierApi;
+ private SrmSupplierApi srmSupplierApi;
@Resource
private ErpPurchaseOrderApi purchaseOrderApi;
@@ -76,7 +77,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鍒拌揣閫氱煡鍗�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-arrival-notice:query')")
public CommonResult<MesWmArrivalNoticeRespVO> getArrivalNotice(@RequestParam("id") Long id) {
MesWmArrivalNoticeDO notice = arrivalNoticeService.getArrivalNotice(id);
if (notice == null) {
@@ -87,7 +87,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鍒拌揣閫氱煡鍗曞垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:wm-arrival-notice:query')")
public CommonResult<PageResult<MesWmArrivalNoticeRespVO>> getArrivalNoticePage(
@Valid MesWmArrivalNoticePageReqVO pageReqVO) {
PageResult<MesWmArrivalNoticeDO> pageResult = arrivalNoticeService.getArrivalNoticePage(pageReqVO);
@@ -130,9 +129,9 @@
return Collections.emptyList();
}
// 1. 鑾峰緱渚涘簲鍟嗕俊鎭紙ERP 閲囪喘渚涘簲鍟嗭級
- Map<Long, ErpSupplierRespDTO> supplierMap = supplierApi.getSupplierList(
+ Map<Long, SrmSupplierRespDTO> supplierMap = srmSupplierApi.getSupplierList(
convertSet(list, MesWmArrivalNoticeDO::getVendorId)).getCheckedData().stream()
- .collect(java.util.stream.Collectors.toMap(ErpSupplierRespDTO::getId, v -> v, (a, b) -> a));
+ .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, v -> v, (a, b) -> a));
// 2. 鑾峰緱閲囪喘璁㈠崟淇℃伅
List<Long> purchaseOrderIds = list.stream()
.map(MesWmArrivalNoticeDO::getPurchaseOrderId)
@@ -146,8 +145,13 @@
return BeanUtils.toBean(list, MesWmArrivalNoticeRespVO.class, vo -> {
MapUtils.findAndThen(supplierMap, vo.getVendorId(), supplier ->
vo.setVendorName(supplier.getName()));
- MapUtils.findAndThen(purchaseOrderMap, vo.getPurchaseOrderId(), purchaseOrder ->
- vo.setPurchaseOrderNo(purchaseOrder.getNo()));
+ MapUtils.findAndThen(purchaseOrderMap, vo.getPurchaseOrderId(), purchaseOrder -> {
+ vo.setPurchaseOrderNo(purchaseOrder.getNo());
+ // 鍘嗗彶鍗曟嵁鏈揩鐓у悎鍚屽彿鏃讹紝鍥炲～閲囪喘璁㈠崟涓婄殑鍚堝悓鍙�
+ if (cn.hutool.core.util.StrUtil.isBlank(vo.getContractNo())) {
+ vo.setContractNo(purchaseOrder.getContractNo());
+ }
+ });
});
}
--
Gitblit v1.9.3