From db266c5404ddfc6fb3d3e71a5828c6fbccd95d2f Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 30 Jun 2025 23:17:55 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java  | 2 +-
 .../main/resources/mapper/EmisTmsCostFeeSplitMapper.xml   | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java
index 78302b1c2..fe2d28178 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java
@@ -257,7 +257,7 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
             splitItem.setTransSignNo(waybill.getTakePieceEmployeeName()); // 运输号
 
             splitItem.setSendPlace("客户现场");
-            splitItem.setDestPlace(waybill.getStartSiteName());
+            splitItem.setDestPlace(waybill.getSendSiteName());
             splitItem.setBillMonth(DateUtils.parseDateToStr(DateUtils.YYYY_MM,waybill.getSendDate()));
             splitItem.setTradeDate(waybill.getSendDate());
 
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml
index 9e1a1225d..23858f8b2 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml
@@ -85,7 +85,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
             <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
         </where>
-        order by create_time desc
+        <if test="params.blTradeTimeAsc != null and params.blTradeTimeAsc==1 ">
+            order by billCode asc,trade_date asc
+        </if>
+        <if test="params.blTradeTimeAsc==null or (params.blTradeTimeAsc != null and params.blTradeTimeAsc!=1) ">
+            order by create_time desc
+        </if>
+
     </select>
 
     <select id="checkUnique" parameterType="EmisTmsCostFeeSplit"  resultType="int">