From 972c7b38f55513dd180f2ceb8fb4277ca4623d16 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 29 Sep 2024 18:36:01 +0800
Subject: [PATCH] md

---
 .../main/java/com/xdadan/erp/emis/service/EmisBaseService.java  | 2 +-
 .../erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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 77a299306..9782b8264 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
@@ -842,7 +842,7 @@ public class EmisBaseService {
          try {
              EmisTmsTransferTrace emisTmsTransferTrace = getEmisTmsTransferTraceByBillCode(billCode);
              if(emisTmsTransferTrace!=null){
-                 if("17track".equals(emisTmsTransferTrace)) {
+                 if("17track".equals(emisTmsTransferTrace.getChId())) {
                      return Q17trackHelper.cvtTraceToScanRecord(billCode, emisTmsTransferTrace.getTraceInfo());
                  }else {
                      return Kd100Helper.cvtTraceToScanRecord(billCode, emisTmsTransferTrace.getTraceInfo());
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 df295a183..bc5c1180d 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
@@ -2437,6 +2437,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
 
         //  转件记录
         List<EmisTmsScanRecord> transferList=cvtTransferTraceToScanRecord(billCode);
+
         if(!CollectionUtil.isEmpty(transferList)){
             listTraces.addAll(transferList);