diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java index 4d3e60b47..b609f4730 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java @@ -1,10 +1,10 @@ -/** +/** * @Project: emis * @Title: EmisWaybillTransfer.java * @author linfso * @date 2024-05-22 01:07:48 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

运单转件表 实体类

*/ @@ -66,5 +66,7 @@ public class EmisWaybillTransfer extends BaseEntity // 扩展参数 private EmisWaybill waybillDetail; + /* 转件平台 1:17TRACK,2:快递100 */ + private String transferPlatform; } diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml index bb58ea2bc..78b4db1a1 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml @@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -31,7 +32,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 + 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, + (select su.emp_name from sys_user su where su.user_id = a.create_by limit 1) as create_by_name, + (select es.site_name from emis_site es where es.site_code = a.create_site limit 1) as create_site_name, + case + when json_unquote( + json_extract( + (select sc.config_value from sys_config sc where sc.config_key = 'sys.express.query.channel' limit 1), + concat('$."', lower(a.transfer_express), '".chId') + ) + ) = '17track' then '1' + else '2' + end as transfer_platform + from emis_waybill_transfer a