From d6902a1e784e63073ee8c095aacd0b408e5b8c62 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 29 Jul 2025 14:53:09 +0800
Subject: [PATCH 1/3] =?UTF-8?q?demand:=20=20=20=20=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E5=8D=95=E5=8F=B7=E3=80=81=E4=B8=BB=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=E8=87=AA=E5=8A=A8=E5=AE=8C=E6=88=90=E8=99=9A=E6=8B=9F?=
 =?UTF-8?q?=E5=8D=95=E3=80=81=E4=B8=BB=E5=8D=95=E7=9A=84=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=20=20=E6=96=B0=E5=A2=9E=E5=91=98=E5=B7=A5=E6=8F=90=E6=88=90?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=E6=97=B6=E9=80=89=E6=8B=A9=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E4=BA=A7=E5=93=81bug=E4=BF=AE=E5=A4=8D=20=20=20TMS?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=20-=20=E6=8F=90=E6=88=90=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20-=20=E9=94=80=E5=94=AE=E8=AE=A1=E6=8F=90=E6=AF=94=E4=BE=8B?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=20-=20=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=81=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E2=80=9D=E3=80=81=E5=A2=9E=E5=8A=A0=E2=80=9C=E5=90=AF=E7=94=A8?=
 =?UTF-8?q?=E5=B7=B2=E8=BF=87=E6=9C=9F=E3=80=81=E5=90=AF=E7=94=A8=E6=9C=AA?=
 =?UTF-8?q?=E8=BF=87=E6=9C=9F=E2=80=9D=E7=8A=B6=E6=80=81=20committer:=20he?=
 =?UTF-8?q?yu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 57c1ddf09..f2e7b5aef 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -3858,8 +3858,11 @@
     <select id="selectHistoryVirtualWaybill" resultMap="EmisWaybillResult">
         select a.id, a.bill_code,a.master_bill_code,a.problem_type, a.remark,a.fee_remark
         from emis_waybill a
-        where  a.del_flag = '0' and
-        a.problem_type in (173,170)
+        where a.del_flag = '0'
+          and exists (
+        select 1 from emis_waybill_problem_info c where a.bill_code = c.bill_code and c.problem_type in (173,170)
+        and c.del_flag = '0'
+        )
           and (master_bill_code is null or master_bill_code='' or master_bill_code=' ')
         order by a.create_time desc
         limit #{offset}, #{pageSize}

From 040a5022f1ee5af78538bee576a50565faa6e6f1 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 29 Jul 2025 15:17:17 +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=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=20-=20=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=20-=20=E6=96=B0=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E2=80=9C=E9=A2=84=E8=AE=A1?=
 =?UTF-8?q?=E5=85=A5=E4=BB=93=E6=97=B6=E9=97=B4=E2=80=9D=20committer:=20he?=
 =?UTF-8?q?yu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index f2e7b5aef..9f3bf713f 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1075,6 +1075,13 @@
                 and a.order_date <![CDATA[ <= ]]>  #{params.endOrderDate}
             </if>
 
+            <if test="params.beginPickStartDate != null and params.beginPickStartDate != ''">
+                and a.pick_start_date <![CDATA[ >= ]]>  #{params.beginPickStartDate}
+            </if>
+            <if test="params.endPickStartDate != null and params.endPickStartDate != ''">
+                and a.pick_start_date <![CDATA[ <= ]]>  #{params.endPickStartDate}
+            </if>
+
             <if test="payee != null  and payee != ''">
                 and a.payee=#{payee}
              </if>

From 79227c241d2b4baed211e6e1cf02d9635791282a Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 29 Jul 2025 16:39:19 +0800
Subject: [PATCH 3/3] =?UTF-8?q?demand:=20=20=20=20=20TMS=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=20-=20=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=20-=20=E8=BF=9B?=
 =?UTF-8?q?=E4=BB=93=E5=AF=B9=E8=B4=A7=20-=20=E6=96=B0=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=20=E6=9F=A5=E8=AF=A2=E2=80=9C=E5=AF=84=E4=BB=B6=E5=9B=BD?=
 =?UTF-8?q?=E5=AE=B6=E3=80=81=E6=94=B6=E8=B4=A7=E5=9B=BD=E5=AE=B6=E3=80=81?=
 =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E3=80=81=E4=BA=A7=E5=93=81=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E2=80=9D=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/EmisWarehouseInMapper.xml   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
index df56454c0..80f710b37 100644
--- a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
@@ -265,6 +265,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="params.sendSiteCode != null and params.sendSiteCode != ''">
                     and ewb.send_site_code=#{params.sendSiteCode}
                 </if>
+
+                <if test="params.sendCountry != null and params.sendCountry != ''">
+                    and ewb.send_country=#{params.sendCountry}
+                </if>
+
+                <if test="params.receiveCountry != null and params.receiveCountry != ''">
+                    and ewb.receive_country=#{params.receiveCountry}
+                </if>
+
+                <if test="params.transLineType != null and params.transLineType != ''">
+                    and ewb.trans_line_type=#{params.transLineType}
+                </if>
+
+                <if test="params.productType != null and params.productType != ''">
+                    and ewb.product_type=#{params.productType}
+                </if>
             )