From 31f270d61a8fce789b0f14306bf091a8675ae59b Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 13 Jun 2024 20:53:23 +0800
Subject: [PATCH] md

---
 .../erp/emis/mapper/EmisTmsTransferTraceMapper.java    |  7 +++++++
 .../com/xdadan/erp/emis/service/EmisBaseService.java   | 10 +---------
 .../resources/mapper/EmisTmsTransferTraceMapper.xml    |  7 +++++++
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsTransferTraceMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsTransferTraceMapper.java
index 0b2da505f..120ee8e2f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsTransferTraceMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsTransferTraceMapper.java
@@ -28,6 +28,13 @@ public interface EmisTmsTransferTraceMapper extends BaseMapper<EmisTmsTransferTr
      */
     public EmisTmsTransferTrace selectEmisTmsTransferTraceById(Long id);
 
+    /**
+     * BillCode查询
+     * @param  billCode
+     * @return
+     */
+    public EmisTmsTransferTrace selectEmisTmsTransferTraceByBillCode(String billCode);
+
     /**
      * 查询列表
      * 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 8700fb555..47b21465f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -382,15 +382,7 @@ public class EmisBaseService {
       * @return
       */
      public EmisTmsTransferTrace getEmisTmsTransferTraceByBillCode(String billCode){
-
-         EmisTmsTransferTrace  emisTmsTransferTrace = new EmisTmsTransferTrace();
-         emisTmsTransferTrace.setBillCode(billCode);
-         List<EmisTmsTransferTrace> listTrace=emisTmsTransferTraceMapper.selectEmisTmsTransferTraceList(emisTmsTransferTrace);
-         if(!CollectionUtil.isEmpty(listTrace)){
-             return listTrace.get(0);
-         }else{
-             return null;
-         }
+        return emisTmsTransferTraceMapper.selectEmisTmsTransferTraceByBillCode(billCode);
      }
      /**
       * 获取第三方转件记录
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml
index 455ee1667..9e28fa6a9 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml
@@ -78,6 +78,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from emis_tms_transfer_trace a
         where a.id = #{id}
     </select>
+
+    <select id="selectEmisTmsTransferTraceByBillCode" parameterType="String" 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
+        from emis_tms_transfer_trace a
+        where a.bill_code = #{billCode}
+    </select>
+
         
     <insert id="insertEmisTmsTransferTrace" parameterType="EmisTmsTransferTrace" useGeneratedKeys="true" keyProperty="id">
         insert into emis_tms_transfer_trace