From 4636b03d801662db1b8712d7a9ae9105462eca37 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 18 十一月 2025 09:53:26 +0800
Subject: [PATCH] 提交

---
 tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java
index 14b546d..8033882 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.tms.service.impl;
 
+import java.util.Collections;
 import java.util.List;
 
 import cn.hutool.core.bean.BeanUtil;
@@ -9,6 +10,7 @@
 import javax.annotation.Resource;
 
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.service.ISystemDataNoService;
 import com.ruoyi.tms.domain.TmsDispatchOrder;
 import com.ruoyi.tms.domain.TmsFinance;
@@ -52,7 +54,8 @@
     private TmsDispatchOrderMapper tmsDispatchOrderMapper;
     @Autowired
     ISystemDataNoService systemDataNoService;
-
+    @Autowired
+    private ISysUserService userService;
     /**
      * 鏌ヨ璐圭敤鏄庣粏
      *
@@ -92,6 +95,32 @@
         return tmsFinanceDetailMapper.selectTmsFinanceDetailList(tmsFinanceDetail);
     }
 
+    @Override
+    public List<TmsFinanceDetail> getTmsFinanceDetailList(Integer dispatchId) {
+        Integer deviceId = userService.getDeviceId(SecurityUtils.getUserId());
+        if (deviceId == null){
+            return null;
+        }
+        LambdaQueryWrapper<TmsFinanceDetail> eq = new LambdaQueryWrapper<TmsFinanceDetail>()
+
+                .eq(TmsFinanceDetail::getFinanceType, 2)
+                .eq(TmsFinanceDetail::getCreateId, SecurityUtils.getUserId());
+        if (dispatchId !=null){
+            eq.eq(TmsFinanceDetail::getDispatchOrderId, dispatchId);
+        }
+        List<TmsFinanceDetail> tmsFinanceDetails = tmsFinanceDetailMapper.selectList(eq);
+        if (tmsFinanceDetails != null && !tmsFinanceDetails.isEmpty()){
+            tmsFinanceDetails.forEach(tmsFinanceDetail -> {
+                TmsDispatchOrder tmsDispatchOrder = tmsDispatchOrderMapper.selectById(tmsFinanceDetail.getDispatchOrderId());
+                if (tmsDispatchOrder != null){
+                    tmsFinanceDetail.setDispatchNo(tmsDispatchOrder.getDispatchNo());
+                    tmsFinanceDetail.setCustomerName(tmsDispatchOrder.getCustomerName());
+                }
+            });
+        }
+        return tmsFinanceDetails;
+    }
+
     /**
      * 鏌ヨ璐圭敤鏄庣粏鍒楄〃 寮傛 瀵煎嚭
      *

--
Gitblit v1.8.0