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 transferList=cvtTransferTraceToScanRecord(billCode); + if(!CollectionUtil.isEmpty(transferList)){ listTraces.addAll(transferList);