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 246239cb1..074818ac9 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 @@ -533,9 +533,21 @@ public class EmisBaseService { } // 转件扫描 else if(ScanType.TRANSFER.opCode.equals(scanType)){ + + String transferCompanyName=""; + String transferBillCode=""; EmisTmsTransferTrace emisTmsTransferTrace=getEmisTmsTransferTraceByBillCode(scanRecord.getBillCode()); - String transferCompanyName=DictUtils.getDictLabel("emis_express_code",emisTmsTransferTrace.getTransferExpress()); - content="转三方快递 ["+transferCompanyName+":"+emisTmsTransferTrace.getTransferBillCode()+"]"; + if(emisTmsTransferTrace!=null) { + if(!StringUtils.isEmpty(emisTmsTransferTrace.getTransferExpress())) { + transferCompanyName = DictUtils.getDictLabel("emis_express_code", emisTmsTransferTrace.getTransferExpress()); + } +// content = "转三方快递 [" + transferCompanyName + ":" + emisTmsTransferTrace.getTransferBillCode() + "]"; + } + + if(!StringUtils.isEmpty(emisTmsTransferTrace.getTransferBillCode())){ + transferBillCode=emisTmsTransferTrace.getTransferBillCode(); + } + content = "转三方快递 [" + transferCompanyName + ":" + transferBillCode + "]"; } // 三方扫描记录 @@ -588,7 +600,6 @@ public class EmisBaseService { // 清关扫描 else if(ScanType.CLEARANCE.opCode.equals(scanType)){ content="清关扫描 快件已清关,下站发往【"+preOrNextStationStr+"】"; - if(isInner){ content=scanRecord.getScanSite()+","+scanRecord.getScanMan()+",清关扫描,"+scanDateStr+","+content; }