From 68734ce457ca44dea6ff5fe9dad6fc3e55163616 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 1 Jun 2024 22:34:12 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java  | 3 +++
 .../src/main/resources/mapper/EmisTmsScanRecordMapper.xml   | 6 +++++-
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml    | 3 +--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java
index 85eb660ac..f4a1bec63 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java
@@ -114,4 +114,7 @@ public class EmisTmsScanRecord extends BaseEntity
     /* 状态 1-启用 0-不启用 */
     private String status;
 
+
+    private EmisWaybill waybillDetail;
+
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index c0cec8094..a38785e03 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -52,8 +52,12 @@
         <result property="remark"    column="remark"    />
         <result property="updateSite"    column="update_site"    />
         <result property="createSite"    column="create_site"    />
+
+        <association property="waybillDetail"  column="bill_code" select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectLastRecordByBillCode"/>
+
     </resultMap>
 
+
     <sql id="selectEmisTmsScanRecordVo">
         select id, bill_code, 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, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site from emis_tms_scan_record
     </sql>
@@ -68,7 +72,7 @@
 		limit 1
 	</select>
 
-
+    <!-- 获取最后一条记录 -->
     <select id="selectLastRecordByBillCode" parameterType="string" resultMap="EmisTmsScanRecordResult">
         select id, bill_code, 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, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site
         from emis_tms_scan_record a
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 96d056b5c..f73393a58 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -260,8 +260,7 @@
     <select id="selectLastRecordByBillCode" parameterType="string" resultMap="EmisTmsScanRecordResult">
         select id, bill_code, 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, status, del_flag, create_by, create_time, update_by, update_time, remark, update_site, create_site
         from emis_tms_scan_record a
-        where a.bill_code = #{billCode}
-        order by create_time desc limit 1
+        where a.bill_code = #{billCode}  limit 1
     </select>