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-13 22:06:37 +08:00
parent 4a37684bd3
commit 69608ab05e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -271,7 +271,7 @@ public class EmisBaseService {
else if(ScanType.HOLD.opCode.equals(scanType)){ else if(ScanType.HOLD.opCode.equals(scanType)){
content="留仓 快件在【"+scanRecord.getScanSite()+"】已留仓,原因:"+scanRecord.getRemark(); content="留仓 快件在【"+scanRecord.getScanSite()+"】已留仓,原因:"+scanRecord.getRemark();
} }
// 转单扫描 // 转件扫描
else if(ScanType.TRANSFER.opCode.equals(scanType)){ else if(ScanType.TRANSFER.opCode.equals(scanType)){
EmisTmsTransferTrace emisTmsTransferTrace=getEmisTmsTransferTraceByBillCode(scanRecord.getBillCode()); EmisTmsTransferTrace emisTmsTransferTrace=getEmisTmsTransferTraceByBillCode(scanRecord.getBillCode());
String transferCompanyName=DictUtils.getDictLabel("emis_express_code",emisTmsTransferTrace.getTransferExpress()); String transferCompanyName=DictUtils.getDictLabel("emis_express_code",emisTmsTransferTrace.getTransferExpress());

5
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
View File

@ -512,13 +512,16 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// "scanDate": "2024-05-02 12:03:05", // "scanDate": "2024-05-02 12:03:05",
// "scanWeight": "0.0" // "scanWeight": "0.0"
String transferCode = (String)scanDataItem.get("transferCode"); String transferCode = (String)scanDataItem.get("transferCode");
String transferBillcode = (String)scanDataItem.get("transferBillcode"); String transferBillcode = (String)scanDataItem.get("transferBillcode");
String destCity = (String)scanDataItem.get("destCity"); String destCity = (String)scanDataItem.get("destCity");
emisTmsScanRecord.setPreOrNextStation(destCity); emisTmsScanRecord.setPreOrNextStation(destCity);
emisTmsScanRecord.setRemark(transferCode+":"+transferBillcode +" "+destCity); // 获取快递公司
String transferCompanyName=DictUtils.getDictLabel("emis_express_code",transferCode);
emisTmsScanRecord.setRemark("["+transferCompanyName+" "+transferBillcode +"] 发往["+destCity+"]");
// 更新waybill做转单 // 更新waybill做转单
wayBillTransfer(emisTmsScanRecord.getBillCode(),transferCode,transferBillcode,destCity); wayBillTransfer(emisTmsScanRecord.getBillCode(),transferCode,transferBillcode,destCity);