From 4e02d246a2f8472945beeca9d6ce09c2df92b0f9 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Mon, 19 Jan 2026 11:45:27 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=E8=BD=A8=E8=BF=B9=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=89=94=E9=99=A4=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BB=B6=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emis/service/impl/EmisWaybillServiceImpl.java | 1 + .../src/main/resources/mapper/EmisWaybillMapper.xml | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) 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 eea54419c..8fbd58351 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 @@ -6188,6 +6188,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb * 跟踪预警：查找长时间未更新扫描记录的运单并发送预警通知 */ @Override + @Async public void autoTraceWarning() { try { // 2026-01-01 00:00:00 之后的运单 diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 7769a2b2d..8f4dab8cd 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -361,15 +361,12 @@ a3.phone as customer_phone, a3.nick_name as customer_nick_name, a3.avatar as customer_avatar, --- COALESCE(wss.sales_support, a4.sales_support) as sales_support, wss.id as waybill_other_id, wss.waybill_id as waybill_other_waybill_id, wss.bill_code as waybill_other_bill_code, COALESCE(wss.sales_support, mu2.sales_support, a4.sales_support) as waybill_other_sales_support, COALESCE(wss.money_user_id, a3.money_user_id) as waybill_other_money_user_id, COALESCE(mu.company, mu2.company) as waybill_other_money_company, --- COALESCE(mu2.payee, a.payee) as waybill_other_payee, --- COALESCE(mu2.salesmen, a.salesmen) as waybill_other_salesmen, p.emp_name as dispatch_man_name,q.site_name as print_site_name, r.emp_name as print_man_name, @@ -478,15 +475,12 @@ a3.avatar as customer_avatar, COALESCE(a.payee, mu2.payee) as payee, COALESCE(a.salesmen, mu2.salesmen) as salesmen, --- COALESCE(wss.sales_support,mu2.sales_support, a4.sales_support) as sales_support , wss.id as waybill_other_id, wss.waybill_id as waybill_other_waybill_id, wss.bill_code as waybill_other_bill_code, COALESCE(wss.sales_support, mu2.sales_support, a4.sales_support) as waybill_other_sales_support, COALESCE(wss.money_user_id, a3.money_user_id) as waybill_other_money_user_id, COALESCE(mu.company, mu2.company) as waybill_other_money_company, --- COALESCE(mu2.payee, a.payee) as waybill_other_payee, --- COALESCE(mu2.salesmen, a.salesmen) as waybill_other_salesmen, a3.sales_executive , a3.customer_type as customer_type, a3.main_user_id , @@ -656,6 +650,13 @@ ) and DATEDIFF(curdate(), date(sr.scan_date)) =]]> 3 ) + + and NOT EXISTS ( + SELECT 1 FROM emis_waybill_problem_info ewpi + WHERE ewpi.bill_code = a.bill_code + AND ewpi.del_flag = '0' + AND ewpi.problem_type IN (151, 170, 173) + ) limit #{offset}, #{pageSize}