From e81f3f7ea9cb26a8092f3b2cbf2c180cc31c3d44 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 2 Jul 2025 11:14:22 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/emis/mapper/EmisTmsCostQuotePriceMapper.java   | 2 +-
 .../erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java      | 4 ++--
 .../src/main/resources/mapper/EmisTmsCostQuotePriceMapper.xml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostQuotePriceMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostQuotePriceMapper.java
index c6585abd2..3d512243f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostQuotePriceMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsCostQuotePriceMapper.java
@@ -38,7 +38,7 @@ public interface EmisTmsCostQuotePriceMapper extends BaseMapper<EmisTmsCostQuote
      * @param blNeedMatchSupplier T-需要匹配对应的供应商
      * @return
      */
-    public List<EmisTmsCostQuotePrice> matchBatchFixedQuotePriceByBillCode(@Param("billCode") String bilCode,@Param("feeType") String feeType,@Param("blNeedMatchSupplier") String blNeedMatchSupplier);
+    public List<EmisTmsCostQuotePrice> matchBatchFixedQuotePriceByBillCode(@Param("billCode") String bilCode,@Param("feeType") String feeType,@Param("blNeedMatchSupplier") Integer blNeedMatchSupplier);
 
     /**
      * 查询列表
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java
index 9ca42ae2a..08a2f0a2b 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java
@@ -369,7 +369,7 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
 
         // 网点机场短驳费 - 1002
         // （2）新创建表（短驳费）：机场到网点之间的距离表；记录 起始网点、下一网点、开始日期、结束日期、公里数、单价、供应商、计费类型：按公斤
-        List<EmisTmsCostQuotePrice> fixedQuotePrice1002List=emisTmsCostQuotePriceMapper.matchBatchFixedQuotePriceByBillCode(billCode,"1002","T");
+        List<EmisTmsCostQuotePrice> fixedQuotePrice1002List=emisTmsCostQuotePriceMapper.matchBatchFixedQuotePriceByBillCode(billCode,"1002",1);
         if(!CollectionUtils.isEmpty(fixedQuotePrice1002List)){
 
             // 检查重复
@@ -448,7 +448,7 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
 
 
         // 机场提货费操作费 - 1004
-        List<EmisTmsCostQuotePrice> fixedQuotePrice1004List=emisTmsCostQuotePriceMapper.matchBatchFixedQuotePriceByBillCode(billCode,"1004","F");
+        List<EmisTmsCostQuotePrice> fixedQuotePrice1004List=emisTmsCostQuotePriceMapper.matchBatchFixedQuotePriceByBillCode(billCode,"1004",-1);
         if(!CollectionUtils.isEmpty(fixedQuotePrice1004List)){
 
             // 检查重复
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostQuotePriceMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostQuotePriceMapper.xml
index 7d373c7ec..2748846c2 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCostQuotePriceMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCostQuotePriceMapper.xml
@@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND c.del_flag = '0'
             AND a.start_site_code = b.start_site_code
             AND a.next_site_code = b.next_site_code
-            <if test=" blNeedMatchSupplier != null and blNeedMatchSupplier == 'T' ">
+            <if test="blNeedMatchSupplier != null and blNeedMatchSupplier == 1 ">
                 AND a.supplier_code = b.supplier_code
             </if>
             AND b.batch_no = c.batch_no