From 68b27795ae929f5300fc6fb301b31aada74a2e2f Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 10 三月 2026 15:26:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

---
 tms/src/main/java/com/ruoyi/tms/service/impl/TmsReceivableFeeServiceImpl.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsReceivableFeeServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsReceivableFeeServiceImpl.java
index ca5256b..cd87ec8 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsReceivableFeeServiceImpl.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsReceivableFeeServiceImpl.java
@@ -76,6 +76,24 @@
         return tmsReceivableFee;
     }
 
+
+    @Override
+    public TmsReceivableFee selectTmsReceivableFeeByDispatchNo(String dispatchNo) {
+        TmsReceivableFee tmsReceivableFee = tmsReceivableFeeMapper.selectOne(new LambdaUpdateWrapper<TmsReceivableFee>()
+                .eq(TmsReceivableFee::getDispatchNo, dispatchNo)
+                .ne(TmsReceivableFee::getStatus, 2)
+                .last("limit 1")
+        );
+        if(tmsReceivableFee != null){
+            List<TmsReceivableFeeItem> tmsReceivableFeeItems = tmsReceivableFeeItemMapper.selectTmsReceivableFeeItemList(new TmsReceivableFeeItem() {{
+                setHeadId(tmsReceivableFee.getId());
+            }});
+            tmsReceivableFee.setItems(tmsReceivableFeeItems);
+            return tmsReceivableFee;
+        }
+        return null;
+    }
+
     /**
      * 鏌ヨ搴旀敹璐圭敤 璁板綍鏁�
      *

--
Gitblit v1.8.0