aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-21 21:30:56 +08:00
parent 68f145e28b
commit 01a21cf332
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
View File

@ -150,12 +150,11 @@
GROUP BY a.main_bill_code GROUP BY a.main_bill_code
</select> </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 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 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 order by create_time desc limit 1
</select> </select>
@ -337,7 +336,7 @@
</foreach> </foreach>
, ,
</if> </if>
create_time desc bl_sub_bill asc
</select> </select>

2
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -214,7 +214,7 @@
<resultMap id="EmisWaybillResult" extends="BaseEmisWaybillResult" type="EmisWaybill"> <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> </resultMap>
<!-- 获取运单统计条数--> <!-- 获取运单统计条数-->