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-08 17:25:55 +08:00
parent 03fc1c0592
commit 4c5d307a2e
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,16 +284,27 @@ public class EmisBaseService {
} }
// 留仓 // 留仓
else if(ScanType.HOLD.opCode.equals(scanType)){ else if(ScanType.HOLD.opCode.equals(scanType)){
content=" 已留仓,网点:"+scanRecord.getScanSite() ; content="留仓 快件在【"+scanRecord.getScanSite()+"】已留仓";
} }
// 转单扫描 // 转单扫描
else if(ScanType.TRANSFER.opCode.equals(scanType)){ else if(ScanType.TRANSFER.opCode.equals(scanType)){
content=" 已转单:"; EmisWaybill waybill = getWaybillByBillCode(scanRecord.getBillCode());
String transferCompanyName=DictUtils.getDictLabel("emis_express_code",waybill.getTransferCode());
content="转三方快递 ["+transferCompanyName+":"+waybill.getTransferBillcode()+"]...";
// 查询转单轨迹 // 查询转单轨迹
// 拼接三方公司物流轨迹
} }
// 问题件 // 问题件
else if(ScanType.ISSUE.opCode.equals(scanType)){ else if(ScanType.ISSUE.opCode.equals(scanType)){
content="问题件";
EmisWaybill waybill = getWaybillByBillCode(scanRecord.getBillCode());
content="问题件 "+waybill.getProblemTypeName()+"("+waybill.getProblemCause()+")";
if(isInner){
content=scanRecord.getScanSite()+","+scanRecord.getScanMan()+",问题件,"+DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,scanRecord.getScanDate())+","+content;
}
} }
// 合包 // 合包
else if(ScanType.CO_PACKING.opCode.equals(scanType)){ else if(ScanType.CO_PACKING.opCode.equals(scanType)){
@ -311,11 +322,19 @@ public class EmisBaseService {
} }
// 报关扫描 // 报关扫描
else if(ScanType.DECLEARE.opCode.equals(scanType)){ else if(ScanType.DECLEARE.opCode.equals(scanType)){
content=" 报关扫描"; content="报关扫描 快件已报关，下站发往【"+scanRecord.getPreOrNextStation()+"】";
if(isInner){
content=scanRecord.getScanSite()+","+scanRecord.getScanMan()+",报关扫描,"+DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,scanRecord.getScanDate())+","+content;
}
} }
// 清关扫描 // 清关扫描
else if(ScanType.CLEARANCE.opCode.equals(scanType)){ else if(ScanType.CLEARANCE.opCode.equals(scanType)){
content=" 清关扫描"; content="清关扫描 快件已清关，下站发往【"+scanRecord.getPreOrNextStation()+"】";
if(isInner){
content=scanRecord.getScanSite()+","+scanRecord.getScanMan()+",清关扫描,"+DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,scanRecord.getScanDate())+","+content;
}
} }
return content; return content;