aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-09-29 18:36:01 +08:00
parent 72835d1df5
commit 972c7b38f5
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -842,7 +842,7 @@ public class EmisBaseService {
try { try {
EmisTmsTransferTrace emisTmsTransferTrace = getEmisTmsTransferTraceByBillCode(billCode); EmisTmsTransferTrace emisTmsTransferTrace = getEmisTmsTransferTraceByBillCode(billCode);
if(emisTmsTransferTrace!=null){ if(emisTmsTransferTrace!=null){
if("17track".equals(emisTmsTransferTrace)) { if("17track".equals(emisTmsTransferTrace.getChId())) {
return Q17trackHelper.cvtTraceToScanRecord(billCode, emisTmsTransferTrace.getTraceInfo()); return Q17trackHelper.cvtTraceToScanRecord(billCode, emisTmsTransferTrace.getTraceInfo());
}else { }else {
return Kd100Helper.cvtTraceToScanRecord(billCode, emisTmsTransferTrace.getTraceInfo()); return Kd100Helper.cvtTraceToScanRecord(billCode, emisTmsTransferTrace.getTraceInfo());

1
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
View File

@ -2437,6 +2437,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// 转件记录 // 转件记录
List<EmisTmsScanRecord> transferList=cvtTransferTraceToScanRecord(billCode); List<EmisTmsScanRecord> transferList=cvtTransferTraceToScanRecord(billCode);
if(!CollectionUtil.isEmpty(transferList)){ if(!CollectionUtil.isEmpty(transferList)){
listTraces.addAll(transferList); listTraces.addAll(transferList);