diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 83978519d..c0cec8094 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -69,6 +69,14 @@
 	</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
+        where a.bill_code = #{billCode}
+        order by create_time desc limit 1
+    </select>
+
+
     <select id="selectEmisTmsScanRecordList" parameterType="EmisTmsScanRecord" resultMap="EmisTmsScanRecordResult">
         <include refid="selectEmisTmsScanRecordVo"/>
         <where>
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 45ef3dd6d..4e23402bf 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -200,9 +200,69 @@
         <association property="registerSiteName"    column="register_site_code" select="selectSiteNameByCode"/>
         <association property="registerManName"    column="register_man_code" select="selectEmpNameByCode"/>
 
+        <association property="lastScanRecord"    column="bill_code" select="selectLastRecordByBillCode"/>
 
     </resultMap>
 
+
+    <resultMap type="EmisTmsScanRecord" id="EmisTmsScanRecordResult">
+        <result property="id"    column="id"    />
+        <result property="billCode"    column="bill_code"    />
+        <result property="orderSn"    column="order_sn"    />
+        <result property="scanType"    column="scan_type"    />
+        <result property="preOrNextStation"    column="pre_or_next_station"    />
+        <result property="preOrNextStationCode"    column="pre_or_next_station_code"    />
+        <result property="preOrNextStationPhone"    column="pre_or_next_station_phone"    />
+        <result property="preOrNextManCode"    column="pre_or_next_man_code"    />
+        <result property="preOrNextManPhone"    column="pre_or_next_man_phone"    />
+        <result property="scanDate"    column="scan_date"    />
+        <result property="scanManCode"    column="scan_man_code"    />
+        <result property="scanManPhone"    column="scan_man_phone"    />
+        <result property="scanMan"    column="scan_man"    />
+        <result property="preOrNextMan"    column="pre_or_next_man"    />
+        <result property="scanSite"    column="scan_site"    />
+        <result property="scanSiteCode"    column="scan_site_code"    />
+        <result property="scanSitePhone"    column="scan_site_phone"    />
+        <result property="scanWeight"    column="scan_weight"    />
+        <result property="weight"    column="weight"    />
+        <result property="destSiteCode"    column="dest_site_code"    />
+        <result property="destCode"    column="dest_code"    />
+        <result property="dispatchOrSendMan"    column="dispatch_or_send_man"    />
+        <result property="dispatchOrSendManCode"    column="dispatch_or_send_man_code"    />
+        <result property="dispatchOrSendManPhone"    column="dispatch_or_send_man_phone"    />
+        <result property="signDate"    column="sign_date"    />
+        <result property="signMan"    column="sign_man"    />
+        <result property="signSite"    column="sign_site"    />
+        <result property="signSiteCode"    column="sign_site_code"    />
+        <result property="recordMan"    column="record_man"    />
+        <result property="recordManCode"    column="record_man_code"    />
+        <result property="recordManPhone"    column="record_man_phone"    />
+        <result property="recordSiteCode"    column="record_site_code"    />
+        <result property="carNo"    column="car_no"    />
+        <result property="bagNo"    column="bag_no"    />
+        <result property="truckMan"    column="truck_man"    />
+        <result property="truckCode"    column="truck_code"    />
+        <result property="dataFrom"    column="data_from"    />
+        <result property="picUrl"    column="pic_url"    />
+        <result property="status"    column="status"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="updateSite"    column="update_site"    />
+        <result property="createSite"    column="create_site"    />
+    </resultMap>
+
+    <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
+    </select>
+
+
     <select id="selectDestNameByCode" parameterType="String" resultType="string">
         select a.dest_name from emis_destination a where a.dest_code = #{code} and a.del_flag='0' limit 1
     </select>