From 2096f447d27c26b4cf8da054a0431935834775af Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Sat, 6 Dec 2025 16:26:27 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20=E5=AE=9E=E6=97=B6=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E6=BC=8F=E7=BB=84=E6=89=B9=E6=AC=A1=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java    | 2 +-
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java
index 5c111effe..87638efdc 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java
@@ -724,7 +724,7 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements
             List<String> failedBillCodes = new ArrayList<>();
 
             // 获取所有线路规划
-            List<EmisTransPlanRule> treeRules = this.selectEmisTransPlanRuleTree(lineCodes);
+            List<EmisTransPlanRule> treeRules = emisTransPlanRuleMapper.selectEmisTransPlanRuleByLineCodes(lineCodes);
             if (treeRules.isEmpty()) {
                 log.info("No trans plan rules found, skip auto scan v2");
                 return;
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index dbafce4cd..038b5675a 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -2584,8 +2584,8 @@
             <if test="dispatchUnderlingSiteCode != null  and dispatchUnderlingSiteCode != ''"> and dispatch_underling_site_code=#{dispatchUnderlingSiteCode}</if>
             <if test="destinationCenterCode != null  and destinationCenterCode != ''"> and destination_center_code=#{destinationCenterCode}</if>
             <if test="marketManCode != null  and marketManCode != ''"> and market_man_code = #{marketManCode}</if>
-            <if test="payee != null  and payee != ''"> and payee=#{payee}</if>
-            <if test="salesmen != null  and salesmen != ''"> and salesmen like concat('%', #{salesmen}, '%')</if>
+            <if test="payee != null  and payee != ''"> and a.payee=#{payee}</if>
+            <if test="salesmen != null  and salesmen != ''"> and a.salesmen like concat('%', #{salesmen}, '%')</if>
             <if test="operateEmployeeCode != null  and operateEmployeeCode != ''"> and operate_employee_code=#{operateEmployeeCode}</if>
             <if test="blIsQuestion != null  and blIsQuestion != ''"> and bl_is_question=#{blIsQuestion}</if>
             <if test="problemType != null  and problemType != ''"> and problem_type=#{problemType}</if>