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

69
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.setRecordManPhone(getCurrentUser().getPhonenumber());
emisTmsScanRecord.setRecordSiteCode(getCurrentUser().getOwnerSiteCode()); emisTmsScanRecord.setRecordSiteCode(getCurrentUser().getOwnerSiteCode());
if(!emisTmsScanRecord.getBillCode().equals(emisTmsScanRecord.getMainBillCode())){
emisTmsScanRecord.setBlSubBill("1");
}else{
emisTmsScanRecord.setBlSubBill("0");
}
emisTmsScanRecord.setDataFrom(WaybillHelper.getDataFrom()); emisTmsScanRecord.setDataFrom(WaybillHelper.getDataFrom());
emisTmsScanRecord.setStatus("1"); emisTmsScanRecord.setStatus("1");
emisTmsScanRecord.preInsert(); emisTmsScanRecord.preInsert();
@ -1203,14 +1209,11 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
throw new EmisBizError(EmisBizErrorType.SCAN_PARAM_ERROR,"签收人必填"); throw new EmisBizError(EmisBizErrorType.SCAN_PARAM_ERROR,"签收人必填");
} }
emisTmsScanRecord.setSignMan(signMan); emisTmsScanRecord.setSignMan(signMan);
emisTmsScanRecord.setDispatchOrSendManCode(dispatchOrSendManCode); emisTmsScanRecord.setDispatchOrSendManCode(dispatchOrSendManCode);
emisTmsScanRecord.setSignDate(emisTmsScanRecord.getScanDate()); emisTmsScanRecord.setSignDate(emisTmsScanRecord.getScanDate());
emisTmsScanRecord.setPicUrl(picUrl); emisTmsScanRecord.setPicUrl(picUrl);
// 签收站点 // 签收站点
emisTmsScanRecord.setSignSite(getCurrentUser().getOwnerSiteName()); emisTmsScanRecord.setSignSite(getCurrentUser().getOwnerSiteName());
emisTmsScanRecord.setSignSiteCode(getCurrentUser().getOwnerSiteCode()); emisTmsScanRecord.setSignSiteCode(getCurrentUser().getOwnerSiteCode());
@ -1234,40 +1237,40 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
emisTmsScanPicInfoMapper.insertEmisTmsScanPicInfo(emisTmsScanPicInfo); emisTmsScanPicInfoMapper.insertEmisTmsScanPicInfo(emisTmsScanPicInfo);
} }
// 更新总运单签收记录 //主单签收状态更新
updateSignStatus(emisTmsScanRecord.getMainBillCode(), if("0".equals(emisTmsScanRecord.getBlSubBill()) ) {
signMan, // 更新总运单签收记录
emisTmsScanRecord.getScanManCode(), updateSignStatus(emisTmsScanRecord.getMainBillCode(),
emisTmsScanRecord.getSignSiteCode(), signMan,
emisTmsScanRecord.getSignDate(), emisTmsScanRecord.getScanManCode(),
emisTmsScanRecord.getPicUrl(), emisTmsScanRecord.getSignSiteCode(),
dispatchOrSendManCode emisTmsScanRecord.getSignDate(),
); emisTmsScanRecord.getPicUrl(),
dispatchOrSendManCode
);
changeWaybillCurrentSite(emisTmsScanRecord.getMainBillCode(),emisTmsScanRecord.getScanSiteCode()); 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());
EmisSmsSendRecord emisSmsSendRecord = new EmisSmsSendRecord();
emisSmsSendRecord.setBillCode(emisTmsScanRecord.getMainBillCode());
emisSmsSendRecord.setSmsType("2"); // 签收短信
emisSmsSendRecord.setPhone(emisWaybill.getSendMobile());
emisSmsSendRecord.setContent(content);
emisSmsSendRecord.setSendSiteCode(emisTmsScanRecord.getScanSiteCode());
emisSmsSendRecord.setSendSiteName(emisTmsScanRecord.getScanSite());
emisSmsSendRecord.setSendManCode(emisTmsScanRecord.getScanManCode());
emisSmsSendRecord.setSendManName(emisTmsScanRecord.getScanMan());
if( "1".equals(emisWaybill.getBlMessage()) ) { // 插入短信记录表
insertBizSmsMessage(emisSmsSendRecord);
//发送寄件短信
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());
emisSmsSendRecord.setSmsType("2"); // 签收短信
emisSmsSendRecord.setPhone(emisWaybill.getSendMobile());
emisSmsSendRecord.setContent(content);
emisSmsSendRecord.setSendSiteCode(emisTmsScanRecord.getScanSiteCode());
emisSmsSendRecord.setSendSiteName(emisTmsScanRecord.getScanSite());
emisSmsSendRecord.setSendManCode(emisTmsScanRecord.getScanManCode());
emisSmsSendRecord.setSendManName(emisTmsScanRecord.getScanMan());
// 插入短信记录表
insertBizSmsMessage(emisSmsSendRecord);
}
} }
} }