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-21 22:59:47 +08:00
parent b71aff1dad
commit 5f7fae3d05
1 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1051,6 +1051,12 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
emisTmsScanRecord.setRecordManPhone(getCurrentUser().getPhonenumber());
emisTmsScanRecord.setRecordSiteCode(getCurrentUser().getOwnerSiteCode());
if(!emisTmsScanRecord.getBillCode().equals(emisTmsScanRecord.getMainBillCode())){
emisTmsScanRecord.setBlSubBill("1");
}else{
emisTmsScanRecord.setBlSubBill("0");
}
emisTmsScanRecord.setDataFrom(WaybillHelper.getDataFrom());
emisTmsScanRecord.setStatus("1");
emisTmsScanRecord.preInsert();
@ -1203,14 +1209,11 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
throw new EmisBizError(EmisBizErrorType.SCAN_PARAM_ERROR,"签收人必填");
}
emisTmsScanRecord.setSignMan(signMan);
emisTmsScanRecord.setDispatchOrSendManCode(dispatchOrSendManCode);
emisTmsScanRecord.setSignDate(emisTmsScanRecord.getScanDate());
emisTmsScanRecord.setPicUrl(picUrl);
// 签收站点
emisTmsScanRecord.setSignSite(getCurrentUser().getOwnerSiteName());
emisTmsScanRecord.setSignSiteCode(getCurrentUser().getOwnerSiteCode());
@ -1234,6 +1237,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
emisTmsScanPicInfoMapper.insertEmisTmsScanPicInfo(emisTmsScanPicInfo);
}
//主单签收状态更新
if("0".equals(emisTmsScanRecord.getBlSubBill()) ) {
// 更新总运单签收记录
updateSignStatus(emisTmsScanRecord.getMainBillCode(),
signMan,
@ -1244,16 +1249,13 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
dispatchOrSendManCode
);
changeWaybillCurrentSite(emisTmsScanRecord.getMainBillCode(),emisTmsScanRecord.getScanSiteCode());
if( "1".equals(emisWaybill.getBlMessage()) ) {
changeWaybillCurrentSite(emisTmsScanRecord.getMainBillCode(), emisTmsScanRecord.getScanSiteCode());
if ("1".equals(emisWaybill.getBlMessage())) {
//发送寄件短信
String content="尊敬的客户：您寄往${Nationalcity}的快递${name}已被签收，感谢您使用探路速运。";
String nationalcity=emisWaybill.getReceiveCountryName()+""+emisWaybill.getReceiveProvinceName();
content = content.replace("${Nationalcity}",nationalcity);
content = content.replace("${name}",emisTmsScanRecord.getMainBillCode());
String content = "尊敬的客户：您寄往${Nationalcity}的快递${name}已被签收，感谢您使用探路速运。";
String nationalcity = emisWaybill.getReceiveCountryName() + "" + emisWaybill.getReceiveProvinceName();
content = content.replace("${Nationalcity}", nationalcity);
content = content.replace("${name}", emisTmsScanRecord.getMainBillCode());
EmisSmsSendRecord emisSmsSendRecord = new EmisSmsSendRecord();
emisSmsSendRecord.setBillCode(emisTmsScanRecord.getMainBillCode());
@ -1269,6 +1271,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
insertBizSmsMessage(emisSmsSendRecord);
}
}
}
// 留仓