From 40091a739172db001c7941984e345d97d3bc4d46 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Sat, 28 Feb 2026 09:38:30 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20tms-=E8=BF=90=E5=8D=95=E7=AE=A1?=
=?UTF-8?q?=E7=90=86-=E8=BF=90=E5=8D=95=E5=BD=95=E5=85=A5/=E8=BF=90?=
=?UTF-8?q?=E5=8D=95=E6=89=B9=E9=87=8F=E5=BD=95=E5=85=A5-=E7=94=9F?=
=?UTF-8?q?=E6=88=90=E8=BF=90=E5=8D=95=E6=97=B6=E8=AE=BE=E7=BD=AE=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E6=9D=A5=E6=BA=90=E4=B8=BAtms=20=20tms-=E5=AF=B9?=
=?UTF-8?q?=E6=8E=A5=E5=A4=96=E9=83=A8=E7=B3=BB=E7=BB=9F=E4=B8=8B=E5=8D=95?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3-=E7=94=9F=E6=88=90=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E6=97=B6=E8=AE=BE=E7=BD=AE=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90?=
=?UTF-8?q?=E4=B8=BAapi=20tms-=E8=BF=90=E5=8D=95=E7=AE=A1=E7=90=86-?=
=?UTF-8?q?=E5=AF=84=E4=BB=B6=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2/?=
=?UTF-8?q?=E5=AF=84=E4=BB=B6=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=96=B0?=
=?UTF-8?q?-=E6=9F=A5=E8=AF=A2=E6=94=AF=E6=8C=81=E6=A0=B9=E6=8D=AE?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90=E6=9F=A5=E8=AF=A2=EF=BC=8C?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E5=8C=BA?=
=?UTF-8?q?=E5=88=86=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../emis/service/impl/EmisWaybillServiceImpl.java | 6 ++++++
.../main/resources/mapper/EmisWaybillMapper.xml | 15 ++++++++++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 2b5b21687..3f81956ec 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -3288,6 +3288,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 当寄件国家为0095或0855时，去除billCode和billCodeSub中的第一个T
// modifyBillCode(emisWaybillSave);
+ // 设置数据来源
+ emisWaybillSave.setDataFrom("tms");
+
// 校验运单号格式
validateBillCodeFormat(emisWaybillSave.getBillCode());
@@ -5503,6 +5506,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
}
}
+ // 设置数据来源
+ emisWaybillSave.setDataFrom("api");
+
// 设定为客户下单,下单时间为当前时间
this.resetOmsWaybillData(emisWaybillSave);
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 29b2ba73f..b16d9b8d3 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -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.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.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.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,
@@ -1558,6 +1560,17 @@
a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
and a.id = #{id}
+
+
+
+ and (a.data_from is null or a.data_from = '' or a.data_from = 'tms')
+
+
+ and a.data_from = #{dataFrom}
+
+
+
+
and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') )