From 95606fcc71f4f0943f5bb4bacd78fa2f89d3106b Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 28 Aug 2024 13:15:30 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/impl/EmisWaybillServiceImpl.java     | 8 ++++----
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml  | 2 +-
 2 files changed, 5 insertions(+), 5 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 df5f95d6a..e5792f35f 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
@@ -147,10 +147,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         List<EmisWaybill>  list=emisWaybillMapper.selectEmisWaybillList(emisWaybill);
 
         // 转换轨迹信息
-        for (EmisWaybill item:list) {
-            String traceStr=cvtScanRecordToTraceStr(item.getLastScanRecord(),true);
-            item.setLastTraceInfo(traceStr);
-        }
+//        for (EmisWaybill item:list) {
+//            String traceStr=cvtScanRecordToTraceStr(item.getLastScanRecord(),true);
+//            item.setLastTraceInfo(traceStr);
+//        }
 
         return list;
     }
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 3c25e3ba6..13d1599c7 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -216,7 +216,7 @@
 
     <resultMap id="EmisWaybillResult" extends="BaseEmisWaybillResult" type="EmisWaybill">
         <!-- 获取订单最后一条扫描记录 -->
-        <association property="lastScanRecord"  column="bill_code" select="com.xdadan.erp.emis.mapper.EmisTmsScanRecordMapper.selectLastRecordBaseInfoByBillCode"/>
+<!--        <association property="lastScanRecord"  column="bill_code" select="com.xdadan.erp.emis.mapper.EmisTmsScanRecordMapper.selectLastRecordBaseInfoByBillCode"/>-->
     </resultMap>
 
     <!--   获取运单统计条数-->