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-06-19 18:38:16 +08:00
parent 52ebd882bf
commit 41c6aeb812
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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