From d0a64c9549aa80a98ba0175f4c48931c84ad7491 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 27 Oct 2025 10:30:49 +0800
Subject: [PATCH 1/3] =?UTF-8?q?demand:=20=20=20=20TMS=E7=B3=BB=E7=BB=9F=20?=
=?UTF-8?q?-=20=E8=BF=90=E5=8D=95=E7=AE=A1=E7=90=86=20-=E5=AF=84=E4=BB=B6?=
=?UTF-8?q?=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=96=B0=E3=80=81=E5=AF=84?=
=?UTF-8?q?=E4=BB=B6=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=E3=80=81=E6=B4=BE?=
=?UTF-8?q?=E4=BB=B6=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=E3=80=81=E4=B8=AD?=
=?UTF-8?q?=E5=BF=83=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2-=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=20=E5=A2=9E=E5=8A=A0=20=E2=80=98?=
=?UTF-8?q?=E5=A7=8B=E5=8F=91=E7=BD=91=E7=82=B9=E2=80=99=20committer:=20he?=
=?UTF-8?q?yu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/mapper/EmisWaybillMapper.xml | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 75e49225d..310adcd05 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -592,6 +592,9 @@
and a.send_site_code=#{sendSiteCode}
+
+ and a.start_site_code=#{startSiteCode}
+
and (a.bl_virtual is null or a.bl_virtual != '1')
and a.bill_code like concat('%', #{billCode}, '%')
@@ -807,6 +810,10 @@
and a.send_site_code=#{sendSiteCode}
+
+ and a.start_site_code=#{startSiteCode}
+
+
and a.bl_sign=#{blSign}
@@ -1334,7 +1341,10 @@
and payment_remark like concat('%', #{paymentRemark}, '%')
and order_remark like concat('%', #{orderRemark}, '%')
- and (FIND_IN_SET(`send_site_code`,#{sendSiteCode}) or FIND_IN_SET(`start_site_code`,#{sendSiteCode}))
+ and FIND_IN_SET(`send_site_code`,#{sendSiteCode})
+
+
+ and a.start_site_code=#{startSiteCode}
and a.remark like concat('%', #{remark}, '%')
@@ -1737,6 +1747,8 @@
and FIND_IN_SET(`send_site_code`,#{sendSiteCode})
+ and FIND_IN_SET(`start_site_code`,#{startSiteCode})
+
and a.remark like concat('%', #{remark}, '%')
and a.create_by= #{createBy}
and a.update_by=#{updateBy}
@@ -1952,6 +1964,7 @@
a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
and a.send_site_code= #{sendSiteCode}
+ and a.start_site_code= #{startSiteCode}
and a.send_center_code= #{sendCenterCode}
and a.dispatch_underling_site_code= #{dispatchUnderlingSiteCode}
@@ -2005,6 +2018,7 @@
a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
and a.send_site_code= #{sendSiteCode}
+ and a.start_site_code= #{startSiteCode}
and a.send_center_code= #{sendCenterCode}
and a.dispatch_underling_site_code= #{dispatchUnderlingSiteCode}
@@ -2208,6 +2222,8 @@
and FIND_IN_SET(a.`send_site_code`,#{sendSiteCode})
+ and FIND_IN_SET(a.`start_site_code`,#{startSiteCode})
+
and a.remark like concat('%', #{remark}, '%')
and a.create_by= #{createBy}
and a.update_by=#{updateBy}
@@ -2520,6 +2536,7 @@
and a.dispatch_underling_site_code=#{dispatchUnderlingSiteCode}
and a.send_site_code= #{sendSiteCode}
+ and a.start_site_code= #{startSiteCode}
and a.cust_no=#{custNo}
and a.trans_line_type=#{transLineType}
From 8ae74d2e5d8a0da49b00a727010734838f014f0c Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 27 Oct 2025 11:38:32 +0800
Subject: [PATCH 2/3] =?UTF-8?q?demand:=20=20=20=20TMS=E7=B3=BB=E7=BB=9F=20?=
=?UTF-8?q?-=20=E8=BF=90=E5=8D=95=E7=AE=A1=E7=90=86=20-=E5=AF=84=E4=BB=B6?=
=?UTF-8?q?=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=96=B0=E3=80=81=E5=AF=84?=
=?UTF-8?q?=E4=BB=B6=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=E3=80=81=E5=AF=84?=
=?UTF-8?q?=E4=BB=B6=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=96=B0=E3=80=81?=
=?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2-?=
=?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=8F=96=E4=BB=B6=E5=91=98=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E6=97=B6=E4=B8=8D=E5=8C=BA=E5=88=86=E7=BD=91=E7=82=B9=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E5=8F=96=E4=BB=B6=E5=91=98=E5=85=B3=E8=81=94=E7=9A=84?=
=?UTF-8?q?=E5=85=A8=E9=83=A8=E6=95=B0=E6=8D=AE=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 310adcd05..251948983 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1308,7 +1308,8 @@
and register_site_code=#{registerSiteCode}
and register_date = #{registerDate}
and register_man_code= #{registerManCode}
- and take_piece_employee_code=#{takePieceEmployeeCode}
+ and exists (select 1 from sys_user su1, sys_user su2 where su1.emp_code = #{takePieceEmployeeCode} and su2.emp_code = a.take_piece_employee_code and su1.emp_name = su2.emp_name and su1.del_flag='0' and su2.del_flag='0')
+
and send_date = #{sendDate}
and dispatch_man_code=#{dispatchManCode}
From 0f50014ed13109b8330429815cfd4e4d17fe4c4e Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 27 Oct 2025 11:51:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?demand:=20=20=20=20TMS=E7=B3=BB=E7=BB=9F=20?=
=?UTF-8?q?-=20=E8=BF=90=E5=8D=95=E7=AE=A1=E7=90=86=20-=E5=AF=84=E4=BB=B6?=
=?UTF-8?q?=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=96=B0=E3=80=81=E5=AF=84?=
=?UTF-8?q?=E4=BB=B6=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=E3=80=81=E5=AF=84?=
=?UTF-8?q?=E4=BB=B6=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=96=B0=E3=80=81?=
=?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2-?=
=?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=8F=96=E4=BB=B6=E5=91=98=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E6=97=B6=E4=B8=8D=E5=8C=BA=E5=88=86=E7=BD=91=E7=82=B9=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E5=8F=96=E4=BB=B6=E5=91=98=E5=85=B3=E8=81=94=E7=9A=84?=
=?UTF-8?q?=E5=85=A8=E9=83=A8=E6=95=B0=E6=8D=AE=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 251948983..6115b8efc 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -2188,7 +2188,8 @@
and register_site_code=#{registerSiteCode}
and register_date = #{registerDate}
and register_man_code= #{registerManCode}
- and take_piece_employee_code=#{takePieceEmployeeCode}
+ and exists (select 1 from sys_user su1, sys_user su2 where su1.emp_code = #{takePieceEmployeeCode} and su2.emp_code = a.take_piece_employee_code and su1.emp_name = su2.emp_name and su1.del_flag='0' and su2.del_flag='0')
+
and send_date = #{sendDate}
and dispatch_man_code=#{dispatchManCode}