diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/ScanType.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/ScanType.java
index 81c807510..a9b7eb35a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/ScanType.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/ScanType.java
@@ -47,7 +47,8 @@ public enum ScanType {
 
     HOLD("70","留仓"),
 
-    TRANSFER("80","转单"),
+    TRANSFER("80","转件"),
+    TRANSFER_3RD("81","三方转件记录"),
 
     ISSUE("-1","问题件"),
 
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 2f78dc193..962237587 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
@@ -225,30 +225,6 @@ public class EmisBaseService {
          String scanType=scanRecord.getScanType();
 
 
-//        content = scanSite ;
-//        if(opCode.contains("收件")) {
-//            content=content+" 快件已揽收 ,业务员:"+scanMan;
-//        }
-//        else if(opCode.contains("到达") || opCode.contains("到件")) {
-//            content=content+"快件已到达"+scanSite;
-//        }
-//        else if(opCode.contains("发件")  ) {
-//            content=content+"快件已离开"+scanSite +" 发往 "+preOrNextStation;
-//        }
-//        else if(opCode.contains("派件扫描") ) {
-//            content=content+"派件扫描,派件员:"+scanMan;
-//        }
-//        else if(opCode.contains("派件") ) {
-//            content=content+"派件中,派件员:"+scanMan;
-//        }
-//        else if(opCode.contains("签收") ) {
-//            content=content+"已签收,签收人:"+scanMan;
-//        }
-//        else {
-//            content=content+""+opCode;
-//        }
-
-
          // 揽收扫描
          if(ScanType.GOT.opCode.equals(scanType)){
              content="已揽收 快件在【"+scanRecord.getScanSite()+"】已收件,取件员【"+scanRecord.getDispatchOrSendMan()+"】";
@@ -261,7 +237,7 @@ public class EmisBaseService {
          }
          // 发件扫描
          else if(ScanType.DEPARTURE.opCode.equals(scanType)){
-             content="发件 快件已离开【"+scanRecord.getScanSite() +"】 下站发往【"+scanRecord.getPreOrNextStation()+"】";
+             content="发件 快件已离开【"+scanRecord.getScanSite() +"】 下一站发往【"+scanRecord.getPreOrNextStation()+"】";
 
              if(isInner){
                  content=scanRecord.getScanSite()+","+scanRecord.getScanMan()+",发件,"+DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,scanRecord.getScanDate())+","+content;
@@ -293,17 +269,18 @@ public class EmisBaseService {
          }
          // 留仓
          else if(ScanType.HOLD.opCode.equals(scanType)){
-             content="留仓 快件在【"+scanRecord.getScanSite()+"】已留仓";
+             content="留仓 快件在【"+scanRecord.getScanSite()+"】已留仓,原因:"+scanRecord.getRemark();
          }
          // 转单扫描
          else if(ScanType.TRANSFER.opCode.equals(scanType)){
-             EmisWaybill waybill = getWaybillByBillCode(scanRecord.getBillCode());
-             String transferCompanyName=DictUtils.getDictLabel("emis_express_code",waybill.getTransferCode());
+             EmisTmsTransferTrace emisTmsTransferTrace=getEmisTmsTransferTraceByBillCode(scanRecord.getBillCode());
+             String transferCompanyName=DictUtils.getDictLabel("emis_express_code",emisTmsTransferTrace.getTransferExpress());
+             content="转三方快递 ["+transferCompanyName+":"+emisTmsTransferTrace.getTransferBillCode()+"]";
 
-             content="转三方快递 ["+transferCompanyName+":"+waybill.getTransferBillcode()+"]...";
-
-             // 查询转单轨迹
-             // 拼接三方公司物流轨迹
+         }
+         // 三方扫描记录
+         else if(ScanType.TRANSFER_3RD.opCode.equals(scanType)){
+             content=scanRecord.getRemark();
          }
          // 问题件
          else if(ScanType.ISSUE.opCode.equals(scanType)){
@@ -315,19 +292,30 @@ public class EmisBaseService {
                  content=scanRecord.getScanSite()+","+scanRecord.getScanMan()+",问题件,"+DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,scanRecord.getScanDate())+","+content;
              }
          }
+
          // 合包
          else if(ScanType.CO_PACKING.opCode.equals(scanType)){
-
+             content="合包 快件在【"+scanRecord.getScanSite()+"】合包,合包号:"+scanRecord.getBagNo();
          }
          else if(ScanType.UN_PACKING.opCode.equals(scanType)){
+             content="拆包 快件在【"+scanRecord.getScanSite()+"】已拆包";
          }
          // 装车
          else if(ScanType.LOADING.opCode.equals(scanType)){
+             content="装车 快件已装车【"+scanRecord.getScanSite() +"】 下一站发往【"+scanRecord.getPreOrNextStation()+"】车牌号:"+scanRecord.getCarNo();
+
+             if(isInner){
+                 content=scanRecord.getScanSite()+","+scanRecord.getScanMan()+",装车,"+DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,scanRecord.getScanDate())+","+content;
+             }
 
          }
          // 卸车
          else if(ScanType.UN_LOADING.opCode.equals(scanType)){
+             content="卸车 快件已【"+scanRecord.getScanSite() +"】卸车";
 
+             if(isInner){
+                 content=scanRecord.getScanSite()+","+scanRecord.getScanMan()+",卸车,"+DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,scanRecord.getScanDate())+","+content;
+             }
          }
          // 报关扫描
          else if(ScanType.DECLEARE.opCode.equals(scanType)){