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 e111c1c30..8a5a269cf 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
@@ -247,21 +247,26 @@ public class EmisTmsScanRecordController extends EmisBaseController
 //            return AjaxResult.error("运单号不能为空");
             return AjaxResult.success("查询成功","");
         }
+
+        HashMap<String, String> traceInfoMap = new HashMap<>();
         try {
             EmisTmsScanRecord lastScanRecord=emisTmsScanRecordService.selectLastRecord(billCode);
-            String traceStr = emisBaseService.cvtScanRecordToTraceStr(lastScanRecord, true);
+            if(lastScanRecord!=null) {
+                String traceStr = emisBaseService.cvtScanRecordToTraceStr(lastScanRecord, true);
+                traceInfoMap.put("lastTraceInfo", traceStr);
+                traceInfoMap.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, lastScanRecord.getScanDate()));
 
-            HashMap<String, String> traceInfoMap = new HashMap<>();
-            traceInfoMap.put("lastTraceInfo", traceStr);
-            traceInfoMap.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, lastScanRecord.getScanDate()));
+                return AjaxResult.success("查询成功", traceInfoMap);
+            }else{
+                traceInfoMap.put("lastTraceInfo", "");
+                traceInfoMap.put("scanDate",  DateUtils.getTime());
 
-            return AjaxResult.success("查询成功", traceInfoMap);
+                return AjaxResult.success("查询成功", traceInfoMap);
+            }
         }catch (Exception ex){
             ex.printStackTrace();
-            HashMap<String, String> traceInfoMap = new HashMap<>();
             traceInfoMap.put("lastTraceInfo", "");
             traceInfoMap.put("scanDate",  DateUtils.getTime());
-
             return AjaxResult.success("查询成功", traceInfoMap);
         }
     }