From 01a21cf332be2ad66fada6222b77381d429d1ccb Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 21 Jun 2024 21:30:56 +0800
Subject: [PATCH] md

---
 .../src/main/resources/mapper/EmisTmsScanRecordMapper.xml  | 7 +++----
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml   | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 82e744a95..da986f775 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -150,12 +150,11 @@
         GROUP BY  a.main_bill_code
     </select>
 
-
     <!-- 获取订单最后一条扫描记录 -->
-    <select id="selectLastRecordByBillCode" parameterType="string" resultMap="EmisTmsScanRecordResult">
+    <select id="selectLastRecordBaseInfoByBillCode" parameterType="string" resultMap="BaseEmisTmsScanRecordResult">
         select id, bill_code, main_bill_code,bl_sub_bill, order_sn, scan_type, pre_or_next_station, pre_or_next_station_code, pre_or_next_station_phone, pre_or_next_man_code, pre_or_next_man_phone, scan_date, scan_man_code, scan_man_phone, scan_man, pre_or_next_man, scan_site, scan_site_code, scan_site_phone, scan_weight, weight, dest_site_code, dest_code, dispatch_or_send_man, dispatch_or_send_man_code, dispatch_or_send_man_phone, sign_date, sign_man, sign_site, sign_site_code, record_man, record_man_code, record_man_phone, record_site_code, car_no, bag_no, truck_man, truck_code, data_from, pic_url, public_trace_info, inner_trace_info, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site
         from emis_tms_scan_record a
-        where del_flag='0' and a.bill_code = #{billCode}
+        where del_flag='0' and a.main_bill_code = #{billCode}
         order by create_time desc limit 1
     </select>
 
@@ -337,7 +336,7 @@
             </foreach>
             ,
         </if>
-        create_time desc
+        bl_sub_bill asc
     </select>
 
 
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 93e48420d..aebb155c4 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -214,7 +214,7 @@
 
     <resultMap id="EmisWaybillResult" extends="BaseEmisWaybillResult" type="EmisWaybill">
         <!-- 获取订单最后一条扫描记录 -->
-        <association property="lastScanRecord"  column="bill_code" select="com.xdadan.erp.emis.mapper.EmisTmsScanRecordMapper.selectLastRecordByBillCode"/>
+        <association property="lastScanRecord"  column="bill_code" select="com.xdadan.erp.emis.mapper.EmisTmsScanRecordMapper.selectLastRecordBaseInfoByBillCode"/>
     </resultMap>
 
     <!--   获取运单统计条数-->