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 4696eaf35..f7760218a 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
@@ -305,7 +305,7 @@ public class EmisTmsScanRecordController extends EmisBaseController
     public TableDataInfo getTraceListByBillCode(EmisTmsScanRecord emisTmsScanRecord)
     {
         startPage();
-        List<EmisTmsScanRecord> list = emisTmsScanRecordService.getTraceListByBillCode(emisTmsScanRecord.getBillCode());
+        List<EmisTmsScanRecord> list = emisTmsScanRecordService.getTraceListByBillCode(emisTmsScanRecord.getBillCode(),true);
         return getDataTable(list);
     }
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java
index f6f5a2748..ed500f70c 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java
@@ -87,7 +87,7 @@ public interface IEmisTmsScanRecordService
     * @param billCode
     * @return
     */
-    public List<EmisTmsScanRecord> getTraceListByBillCode(String billCode);
+    public List<EmisTmsScanRecord> getTraceListByBillCode(String billCode,Boolean isAsc);
 
    /**
     *  获取跟踪信息
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 a3856edaa..df99596c1 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
@@ -2402,12 +2402,37 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
      * @return
      */
     @Override
-    public List<EmisTmsScanRecord> getTraceListByBillCode(String billCode) {
+    public List<EmisTmsScanRecord> getTraceListByBillCode(String billCode,Boolean isAsc) {
 
         List<EmisTmsScanRecord> listTraces = emisTmsScanRecordMapper.selectTraceListByBillCode(billCode);
         List<EmisTmsScanRecord> transferList=cvtTransferTraceToScanRecord(billCode);
         if(!CollectionUtil.isEmpty(transferList)){
             listTraces.addAll(transferList);
+
+            //按时间从最最近排序
+            Collections.sort(listTraces, new Comparator<EmisTmsScanRecord>(){
+                @Override
+                public int compare(EmisTmsScanRecord a, EmisTmsScanRecord b) {
+                    if(isAsc) {
+                        if (a.getScanDate().after(b.getScanDate())) {
+                            return -1;
+                        } else if (a.getScanDate().before(b.getScanDate())) {
+                            return 1;
+                        } else {
+                            return 0;
+                        }
+                    }else{
+                        if (a.getScanDate().after(b.getScanDate())) {
+                            return 1;
+                        } else if (a.getScanDate().before(b.getScanDate())) {
+                            return -1;
+                        } else {
+                            return 0;
+                        }
+                    }
+                }
+            });
+
         }
         log.error("====getTraceListByBillCode===>",JSON.toJSONString(listTraces));
         return listTraces;
@@ -2418,7 +2443,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
     public List<Map> queryWaybillTraceInfo(String billCode,String lang) {
 
         List<Map> stepList  = new ArrayList<>();
-        List<EmisTmsScanRecord> listTraceList= getTraceListByBillCode(billCode);
+        List<EmisTmsScanRecord> listTraceList= getTraceListByBillCode(billCode,true);
         for(EmisTmsScanRecord scanRecord:listTraceList){
 
             String content=cvtScanRecordToTraceStr(scanRecord,false);