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 e567f985a..2d42c5b52 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 @@ -271,7 +271,7 @@ public class EmisBaseService { else if(ScanType.HOLD.opCode.equals(scanType)){ content="留仓 快件在【"+scanRecord.getScanSite()+"】已留仓,原因:"+scanRecord.getRemark(); } - // 转单扫描 + // 转件扫描 else if(ScanType.TRANSFER.opCode.equals(scanType)){ EmisTmsTransferTrace emisTmsTransferTrace=getEmisTmsTransferTraceByBillCode(scanRecord.getBillCode()); String transferCompanyName=DictUtils.getDictLabel("emis_express_code",emisTmsTransferTrace.getTransferExpress()); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java index 4c6230cae..c2732ac0d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java @@ -512,13 +512,16 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // "scanDate": "2024-05-02 12:03:05", // "scanWeight": "0.0" + String transferCode = (String)scanDataItem.get("transferCode"); String transferBillcode = (String)scanDataItem.get("transferBillcode"); String destCity = (String)scanDataItem.get("destCity"); emisTmsScanRecord.setPreOrNextStation(destCity); - emisTmsScanRecord.setRemark(transferCode+":"+transferBillcode +" "+destCity); + // 获取快递公司 + String transferCompanyName=DictUtils.getDictLabel("emis_express_code",transferCode); + emisTmsScanRecord.setRemark("["+transferCompanyName+" "+transferBillcode +"] 发往["+destCity+"]"); // 更新waybill做转单 wayBillTransfer(emisTmsScanRecord.getBillCode(),transferCode,transferBillcode,destCity);