From 8b58b9cbf17df053d733fccb29bf0eb9ca39dc30 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 13 Jun 2024 19:53:57 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/EmisBaseService.java     | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

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 b3e78ff49..ef06a3b80 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
@@ -400,23 +400,21 @@ public class EmisBaseService {
      public  List<EmisTmsScanRecord> cvtTransferTraceToScanRecord(String billCode) {
          List<EmisTmsScanRecord> recordList= null;
          try {
-             EmisWaybill  waybill=getWaybillByBillCode(billCode);
-             if("1".equals(waybill.getBlDispFd())){
-                 EmisTmsTransferTrace emisTmsTransferTrace = getEmisTmsTransferTraceByBillCode(billCode);
-                 if(emisTmsTransferTrace!=null){
-                     if(!StringUtils.isEmpty(emisTmsTransferTrace.getTraceInfo())){
-                         JSONObject jsonObject = JSONObject.parseObject(emisTmsTransferTrace.getTraceInfo());
-                         JSONArray steps=jsonObject.getJSONArray("data");
-                         if(steps!=null && steps.size()>0){
-                             recordList = new ArrayList<>();
-                             for (Object obj:steps) {
-                                 JSONObject stepItem = (JSONObject)obj;
-                                 EmisTmsScanRecord recordItem = new EmisTmsScanRecord();
-                                 recordItem.setBillCode(billCode);
-                                 recordItem.setScanDate(stepItem.getDate("time"));
-                                 recordItem.setRemark(stepItem.getString("context"));
-                                 recordItem.setScanType("81");
-                             }
+             EmisTmsTransferTrace emisTmsTransferTrace = getEmisTmsTransferTraceByBillCode(billCode);
+             if(emisTmsTransferTrace!=null){
+                 if(!StringUtils.isEmpty(emisTmsTransferTrace.getTraceInfo())){
+                     JSONObject jsonObject = JSONObject.parseObject(emisTmsTransferTrace.getTraceInfo());
+                     JSONArray steps=jsonObject.getJSONArray("data");
+                     if(steps!=null && steps.size()>0){
+                         recordList = new ArrayList<>();
+                         for (Object obj:steps) {
+                             JSONObject stepItem = (JSONObject)obj;
+                             EmisTmsScanRecord recordItem = new EmisTmsScanRecord();
+                             recordItem.setBillCode(billCode);
+                             recordItem.setScanDate(stepItem.getDate("time"));
+                             recordItem.setRemark(stepItem.getString("context"));
+                             recordItem.setScanType("81");
+                             recordList.add(recordItem);
                          }
                      }
                  }