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

demand: tms-运单管理-运单录入/运单批量录入-生成运单时设置数据来源为tms tms-对接外部系统下单接口-生成订单时设置数据来源为api tms-运单管理-寄件运单查询/寄件运单查询新-查询支持根据数据来源查询，查询返回数据区分数据来源

Browse Source
This commit is contained in:
aike 2026-02-28 09:38:30 +08:00
parent d5a5db16d3
commit 40091a7391
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -3288,6 +3288,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 当寄件国家为0095或0855时，去除billCode和billCodeSub中的第一个T // 当寄件国家为0095或0855时，去除billCode和billCodeSub中的第一个T
// modifyBillCode(emisWaybillSave); // modifyBillCode(emisWaybillSave);
// 设置数据来源
emisWaybillSave.setDataFrom("tms");
// 校验运单号格式 // 校验运单号格式
validateBillCodeFormat(emisWaybillSave.getBillCode()); validateBillCodeFormat(emisWaybillSave.getBillCode());
@ -5503,6 +5506,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
} }
} }
// 设置数据来源
emisWaybillSave.setDataFrom("api");
// 设定为客户下单,下单时间为当前时间 // 设定为客户下单,下单时间为当前时间
this.resetOmsWaybillData(emisWaybillSave); this.resetOmsWaybillData(emisWaybillSave);

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

@ -343,7 +343,9 @@
a.dispatch_underling_site_code, a.destination_center_code, a.market_man_code, a.payee, a.salesmen, a.operate_employee_code, a.dispatch_underling_site_code, a.destination_center_code, a.market_man_code, a.payee, a.salesmen, a.operate_employee_code,
a.bl_is_question, a.problem_type, a.problem_cause, a.problem_delay_days, a.bl_message, a.bl_accept_message, a.bl_gen_subbill, a.bl_is_question, a.problem_type, a.problem_cause, a.problem_delay_days, a.bl_message, a.bl_accept_message, a.bl_gen_subbill,
a.bl_sign, a.sign_man, a.sign_man_code, a.sign_site_code, a.sign_date, a.bill_pic_send_rmk, a.bill_pic_dispatch_rmk, a.timezone_offset, a.bl_sign, a.sign_man, a.sign_man_code, a.sign_site_code, a.sign_date, a.bill_pic_send_rmk, a.bill_pic_dispatch_rmk, a.timezone_offset,
a.payment_status, a.payment_date, a.payment_remark, a.order_remark, a.data_from, a.bl_special_goods,a.ext_info, a.payment_status, a.payment_date, a.payment_remark, a.order_remark,
(case when a.data_from is null or a.data_from = '' then 'tms' else a.data_from end) as data_from,
a.bl_special_goods,a.ext_info,
a.remark, a.del_flag, a.create_by, a.remark, a.del_flag, a.create_by,
a.create_time, a.update_by, a.update_time, a.create_site, a.update_site, a.create_time, a.update_by, a.update_time, a.create_site, a.update_site,
a.cod_fee_desc, a.lading_bill_code, a.company_code, a.departure_port, a.destination_port, a.box_quantity, a.cod_fee_desc, a.lading_bill_code, a.company_code, a.departure_port, a.destination_port, a.box_quantity,
@ -1558,6 +1560,17 @@
a.del_flag='0' and a.order_status !='0' and a.order_status!='2' a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
<if test="id != null "> and a.id = #{id}</if> <if test="id != null "> and a.id = #{id}</if>
<if test="dataFrom != null and dataFrom != ''">
<choose>
<when test="dataFrom == 'tms'">
and (a.data_from is null or a.data_from = '' or a.data_from = 'tms')
</when>
<otherwise>
and a.data_from = #{dataFrom}
</otherwise>
</choose>
</if>
<if test="orderSn != null and orderSn != ''"> and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) </if> <if test="orderSn != null and orderSn != ''"> and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) </if>
<if test="billCode != null and billCode != '' and ( params.billCodeSortList == null or (params.billCodeSortList != null and params.billCodeSortList.size() == 1 ) )"> <if test="billCode != null and billCode != '' and ( params.billCodeSortList == null or (params.billCodeSortList != null and params.billCodeSortList.size() == 1 ) )">