From e181c2fafd2da294364cd75c089aecfeff49f3c0 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 13 Jun 2024 20:56:36 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/emis/service/EmisBaseService.java | 8 +++-----
 .../emis/service/impl/EmisTmsScanRecordServiceImpl.java   | 5 ++++-
 2 files changed, 7 insertions(+), 6 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 47b21465f..2f78dc193 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
@@ -392,17 +392,15 @@ public class EmisBaseService {
      public  List<EmisTmsScanRecord> cvtTransferTraceToScanRecord(String billCode) {
          List<EmisTmsScanRecord> recordList= null;
          try {
+             log.error("====>三方记录查询11111");
              EmisTmsTransferTrace emisTmsTransferTrace = getEmisTmsTransferTraceByBillCode(billCode);
              if(emisTmsTransferTrace!=null){
-                 if(!StringUtils.isEmpty(emisTmsTransferTrace.getTraceInfo())){
-                     recordList = Kd100Helper.cvtTraceToScanRecord(billCode,emisTmsTransferTrace.getTraceInfo());
-                 }
+                 return Kd100Helper.cvtTraceToScanRecord(billCode,emisTmsTransferTrace.getTraceInfo());
              }
          } catch (Exception e) {
              e.printStackTrace();
          }
-
-         return recordList;
+         return null;
      }
 
      public void doTransferTraceUpdate() {
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 9f9e83681..4c6230cae 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
@@ -14,6 +14,7 @@ import java.math.BigDecimal;
 import java.util.*;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSON;
 import com.xdadan.erp.common.core.domain.entity.SysUser;
 import com.xdadan.erp.common.utils.DateUtils;
 import com.xdadan.erp.common.utils.DictUtils;
@@ -30,6 +31,7 @@ import com.xdadan.erp.emis.mapper.EmisTmsScanPicInfoMapper;
 import com.xdadan.erp.emis.mapper.EmisTmsTransferTraceMapper;
 import com.xdadan.erp.emis.service.EmisBaseService;
 import com.xdadan.erp.emis.utils.Kd100Helper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,6 +45,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @author linfso
  * @date 2024-03-01 08:54:59
  */
+ @Slf4j
 @Service
 public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEmisTmsScanRecordService
 {
@@ -722,7 +725,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
         if(!CollectionUtil.isEmpty(transferList)){
             listTraces.addAll(transferList);
         }
-
+        log.error("====getTraceListByBillCode===>",JSON.toJSONString(listTraces));
         return listTraces;
     }