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-14 14:39:07 +08:00
parent 967a215b25
commit 7b1a9ec3b9
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,7 +141,7 @@
<select id="queryScanStatRecordList" parameterType="EmisTmsScanRecord" 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, update_by, update_time, remark, update_site, create_site,max(create_time) as create_time
from emis_tms_scan_record
from emis_tms_scan_record a
where del_flag='0'
<if test="scanSiteCode != null and scanSiteCode != ''"> and scan_site_code=#{scanSiteCode}</if>
@ -169,6 +169,9 @@
)
</if>
and exists (select 1 from emis_waybill ewb where ewb.bl_sign != '1' and ewb.bill_code=a.bill_code)
group by bill_code

12
emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml
View File

@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectEmisWaybillTransferVo">
select id, bill_code, transfer_bill_code, transfer_date, transfer_express, link_man, link_phone, transfer_fee, transfer_weight, transfer_volume, transfer_resean, transfer_city, data_from, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill_transfer
select id, bill_code, transfer_bill_code, transfer_date, transfer_express, link_man, link_phone, transfer_fee, transfer_weight, transfer_volume, transfer_resean, transfer_city, data_from, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill_transfer a
</sql>
<select id="selectEmisWaybillTransferList" parameterType="EmisWaybillTransfer" resultMap="EmisWaybillTransferResult">
@ -80,6 +80,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
)
</if>
<if test="params.blSign != null and params.blSign == '1'">
and exists (select 1 from emis_waybill ewb where ewb.bl_sign = '1' and ewb.bill_code=a.bill_code)
</if>
<if test="params.blSign != null and params.blSign == '0'">
and exists (select 1 from emis_waybill ewb where ewb.bl_sign != '1' and ewb.bill_code=a.bill_code)
</if>
</where>
order by create_time desc
</select>