From c4b47c9ce9bad45ba68069118ae3c8d64501e036 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 10 Sep 2025 11:49:10 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?=
 =?UTF-8?q?=E8=BD=AC=E4=BB=B6=E7=AE=A1=E7=90=86=20-=20=E5=BF=AB=E9=80=9210?=
 =?UTF-8?q?0=E7=B3=BB=E7=BB=9F=E5=AF=B9=E6=8E=A5=20-=20=E6=8A=93=E5=8F=96?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../resources/mapper/EmisTmsTransferTraceMapper.xml  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml
index 94c56f814..d34d7e6f8 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml
@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectEmisTmsTransferTraceList" parameterType="EmisTmsTransferTrace" resultMap="EmisTmsTransferTraceResult">
         <include refid="selectEmisTmsTransferTraceVo"/>
-        <where>  
+        <where>
              del_flag='0'
             <if test="id != null "> and id = #{id}</if>
             <if test="billCode != null  and billCode != ''"> and bill_code =#{billCode}</if>
@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and last_waybill_status != '50'
                 and last_trace_date <![CDATA[ > ]]>  DATE_SUB(CURDATE(), INTERVAL 30 DAY)
                 and update_time <![CDATA[ < ]]> SUBDATE(now(),interval 2 hour)
-                or last_trace_date is null
+                or (last_trace_date is null and del_flag='0')
             </if>
 
         </where>
@@ -73,9 +73,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
 
-  
+
     <select id="selectEmisTmsTransferTraceById" parameterType="Long" resultMap="EmisTmsTransferTraceResult">
-        select id, bill_code, last_trace_date, last_waybill_status, trace_info, ch_id, transfer_bill_code, transfer_express, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site 
+        select id, bill_code, last_trace_date, last_waybill_status, trace_info, ch_id, transfer_bill_code, transfer_express, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_tms_transfer_trace a
         where a.id = #{id}
     </select>
@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          and a.bill_code = #{billCode} order by create_time desc  limit 1
     </select>
 
-        
+
     <insert id="insertEmisTmsTransferTrace" parameterType="EmisTmsTransferTrace" useGeneratedKeys="true" keyProperty="id">
         insert into emis_tms_transfer_trace
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -169,4 +169,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>