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 a35da3787..ad691911f 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 @@ -284,16 +284,27 @@ public class EmisBaseService { } // 留仓 else if(ScanType.HOLD.opCode.equals(scanType)){ - content=" 已留仓,网点:"+scanRecord.getScanSite() ; + content="留仓 快件在【"+scanRecord.getScanSite()+"】已留仓"; } // 转单扫描 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)){ - 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)){ @@ -311,11 +322,19 @@ public class EmisBaseService { } // 报关扫描 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)){ - 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;