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 |    9 +++++++--
 1 files changed, 7 insertions(+), 2 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 28239f9..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
@@ -145,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