diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
index 47ff9c6d8..e2ffa820e 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
@@ -89,7 +89,6 @@ public class EmisTmsScanRecordController extends EmisBaseController
 
         emisTmsScanRecord.getParams().put("thisSiteCode",getLoginUser().getUser().getOwnerSiteCode());
 
-
         List<ScanStatDataInfo> list = emisTmsScanRecordService.queryScanStatList(emisTmsScanRecord);
         return getDataTable(list);
     }
@@ -261,6 +260,11 @@ public class EmisTmsScanRecordController extends EmisBaseController
 
 
         List<EmisTmsScanRecord> list = emisTmsScanRecordService.selectEmisTmsScanRecordList(emisTmsScanRecord);
+
+
+
+
+
         return getDataTable(list);
     }
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java
index b01ecd221..d49467806 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java
@@ -120,7 +120,6 @@ public class EmisTmsScanRecord extends BaseEntity
     /* 状态 1-启用 0-不启用 */
     private String status;
 
-
 //   扩展参数
     private EmisWaybill waybillDetail;
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
index 9c077c21b..82369a0df 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
@@ -71,7 +71,12 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
     @Override
     public List<EmisTmsScanRecord> selectEmisTmsScanRecordList(EmisTmsScanRecord emisTmsScanRecord)
     {
-        return emisTmsScanRecordMapper.selectEmisTmsScanRecordList(emisTmsScanRecord);
+        List<EmisTmsScanRecord> listTraceList = emisTmsScanRecordMapper.selectEmisTmsScanRecordList(emisTmsScanRecord);
+        for(EmisTmsScanRecord scanRecord:listTraceList){
+            String content=cvtScanRecordToTraceStr(scanRecord,true);
+            scanRecord.setInnerTraceInfo(content);
+        }
+        return listTraceList;
     }
 
     /**