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-19 20:27:34 +08:00
parent 97581aa132
commit e004261ce2
3 changed files with 59 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -432,7 +432,7 @@ public class EmisBaseService {
* 发送短息
* @param emisSmsSendRecord
*/
public void sendBizSmsMessage(EmisSmsSendRecord emisSmsSendRecord ){
public void insertBizSmsMessage(EmisSmsSendRecord emisSmsSendRecord ){
// 检查是否唯一
int rst=emisSmsSendRecordMapper.checkUnique(emisSmsSendRecord);
if(rst==0) {
@ -882,14 +882,10 @@ public class EmisBaseService {
* 更新签收状态
* @param billCode
*/
public void updateSignStatus(String billCode,String signMan,String signManCode,
public void updateSignStatus(String mainBillCode,String signMan,String signManCode,
String signSiteCode,Date signDate,
String billPicDispatchRmk,
String dispatchOrSendManCode) {
String mainBillCode = billCode;
if(billCode.startsWith("T7080") && billCode.length()>14 ){
mainBillCode=billCode.substring(0,14);
}
EmisWaybill waybill = new EmisWaybill();
waybill.setBillCode(mainBillCode);
@ -909,33 +905,23 @@ public class EmisBaseService {
/**
* 更新派件状态
* @param billCode
* @param mainBillCode
*/
public void updateDispatchStatus(String billCode,String dispatchSiteCode,String dispatchManCode,Date dispatchDate) {
String mainBillCode = billCode;
if(billCode.startsWith("T7080") && billCode.length()>14 ){
mainBillCode=billCode.substring(0,14);
}
public void updateDispatchStatus(String mainBillCode,String dispatchSiteCode,String dispatchManCode,Date dispatchDate) {
EmisWaybill waybill = new EmisWaybill();
waybill.setBillCode(mainBillCode);
waybill.setDispatchManCode(dispatchManCode);
waybill.setDispatchSiteCode(dispatchSiteCode);
waybill.setDispatchDate(dispatchDate);
waybill.setWaybillStatus(WaybillStatus.SENT.statusCode);
emisWaybillMapper.updateSignStatus(waybill);
emisWaybillMapper.updateDispatchStatus(waybill);
}
/**
* 更新为未签收状态
* @param billCode
*/
public void updateUnSignStatus(String billCode) {
String mainBillCode = billCode;
if(billCode.startsWith("T7080") && billCode.length()>14 ) {
mainBillCode = billCode.substring(0, 14);
}
public void updateUnSignStatus(String mainBillCode) {
EmisWaybill waybill = new EmisWaybill();
waybill.setBillCode(mainBillCode);
@ -1017,7 +1003,7 @@ public class EmisBaseService {
emisSmsSendRecord.setSendManCode(waybillProblemInfo.getRegisterManCode());
emisSmsSendRecord.setSendManName(waybillProblemInfo.getRegisterManName());
sendBizSmsMessage(emisSmsSendRecord);
insertBizSmsMessage(emisSmsSendRecord);
}

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

@ -703,7 +703,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// emisTmsScanRecord.setScanWeight(BigDecimal.valueOf(scanWeight));
// }
String dispatchOrSendManCode = (String)scanDataItem.get("dispatchOrSendManCode");
String dispatchOrSendManCode = MapUtils.getString(scanDataItem,"dispatchOrSendManCode",null);
if(!StringUtils.isEmpty(dispatchOrSendManCode)) {
emisTmsScanRecord.setDispatchOrSendManCode(dispatchOrSendManCode);
}else{
@ -721,14 +722,14 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
}
// 当前站点
changeWaybillCurrentSite(emisTmsScanRecord.getBillCode(),emisTmsScanRecord.getScanSiteCode());
changeWaybillCurrentSite(emisTmsScanRecord.getMainBillCode(),emisTmsScanRecord.getScanSiteCode());
}
// 发件扫描
else if(ScanType.DEPARTURE.opCode.equals(scanType)){
// 下一站
// String scanWeightStr = (String)scanDataItem.get("scanWeight");
String preOrNextStationCode = (String)scanDataItem.get("preOrNextStationCode");
String preOrNextStationCode = MapUtils.getString(scanDataItem,"preOrNextStationCode",null);
if(StringUtils.isEmpty(preOrNextStationCode)) {
throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"下一站必填");
@ -741,9 +742,9 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
emisTmsScanRecord.setPreOrNextStationPhone(site.getPhone());
// 当前站点
changeWaybillCurrentSite(emisTmsScanRecord.getBillCode(),emisTmsScanRecord.getScanSiteCode());
changeWaybillCurrentSite(emisTmsScanRecord.getMainBillCode(),emisTmsScanRecord.getScanSiteCode());
// 下一站点
changeWaybillNextSite(emisTmsScanRecord.getBillCode(),preOrNextStationCode);
changeWaybillNextSite(emisTmsScanRecord.getMainBillCode(),preOrNextStationCode);
// 判断是否需要发寄件短信
if( "1".equals(emisWaybill.getBlMessage()) ) {
@ -755,7 +756,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
content = content.replace("${name}",emisWaybill.getBillCode());
EmisSmsSendRecord emisSmsSendRecord = new EmisSmsSendRecord();
emisSmsSendRecord.setBillCode(emisTmsScanRecord.getBillCode());
emisSmsSendRecord.setBillCode(emisTmsScanRecord.getMainBillCode());
emisSmsSendRecord.setSmsType("1"); // 发件短信
emisSmsSendRecord.setPhone(emisWaybill.getSendMobile());
emisSmsSendRecord.setContent(content);
@ -764,7 +765,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
emisSmsSendRecord.setSendManCode(emisTmsScanRecord.getScanManCode());
emisSmsSendRecord.setSendManName(emisTmsScanRecord.getScanMan());
sendBizSmsMessage(emisSmsSendRecord);
insertBizSmsMessage(emisSmsSendRecord);
}
@ -788,15 +789,13 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// 派送扫描
else if(ScanType.SENT.opCode.equals(scanType)){
// 派送员
// "dispatchOrSendManCode": "25001108",
String dispatchOrSendManCode = (String)scanDataItem.get("dispatchOrSendManCode");
String dispatchOrSendManCode = MapUtils.getString(scanDataItem,"dispatchOrSendManCode",null);
if(StringUtils.isEmpty(dispatchOrSendManCode)) {
throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"派送员必填");
}
emisTmsScanRecord.setDispatchOrSendManCode(dispatchOrSendManCode);
SysUser emUser=getEmisStaffByCode(emisTmsScanRecord.getDispatchOrSendManCode());
if(emUser!=null){
emisTmsScanRecord.setDispatchOrSendMan(emUser.getEmpName());
@ -808,14 +807,14 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
}
// 更新总运单派件员
updateDispatchStatus(emisTmsScanRecord.getBillCode(),
updateDispatchStatus(emisTmsScanRecord.getMainBillCode(),
emisTmsScanRecord.getScanSiteCode(),
emisTmsScanRecord.getDispatchOrSendManCode(),
emisTmsScanRecord.getScanDate()
);
// 改变当前站点
changeWaybillCurrentSite(emisTmsScanRecord.getBillCode(),emisTmsScanRecord.getScanSiteCode());
changeWaybillCurrentSite(emisTmsScanRecord.getMainBillCode(),emisTmsScanRecord.getScanSiteCode());
}
// 签收扫描
@ -843,28 +842,28 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// 签收站点
emisTmsScanRecord.setSignSite(getCurrentUser().getOwnerSiteName());
emisTmsScanRecord.setSignSiteCode(getCurrentUser().getOwnerSiteCode());
emisTmsScanRecord.setRemark(remark);
// 运单附件签收图片信息
EmisWaybillAttachment emisWaybillAttachment = new EmisWaybillAttachment();
emisWaybillAttachment.setBillCode(emisTmsScanRecord.getBillCode());
emisWaybillAttachment.setAttachType(WaybillAttachType.SIGNED_PIC.typeCode); // 签收图片
emisWaybillAttachment.setFileSiez(0);
emisWaybillAttachment.setFileDesc("签收图片");
emisWaybillAttachment.setFileUrl(picUrl);
emisWaybillAttachment.setDataFrom(emisTmsScanRecord.getDataFrom());
emisWaybillAttachmentMapper.insertEmisWaybillAttachment(emisWaybillAttachment);
if(!StringUtils.isEmpty(picUrl)) {
EmisWaybillAttachment emisWaybillAttachment = new EmisWaybillAttachment();
emisWaybillAttachment.setBillCode(emisTmsScanRecord.getMainBillCode());
emisWaybillAttachment.setAttachType(WaybillAttachType.SIGNED_PIC.typeCode); // 签收图片
emisWaybillAttachment.setFileSiez(0);
emisWaybillAttachment.setFileDesc("签收图片");
emisWaybillAttachment.setFileUrl(picUrl);
emisWaybillAttachment.setDataFrom(emisTmsScanRecord.getDataFrom());
emisWaybillAttachmentMapper.insertEmisWaybillAttachment(emisWaybillAttachment);
EmisTmsScanPicInfo emisTmsScanPicInfo = new EmisTmsScanPicInfo();
emisTmsScanPicInfo.setBillCode(emisTmsScanRecord.getBillCode());
emisTmsScanPicInfo.setPicType(scanType);
emisTmsScanPicInfo.setPicUrl(picUrl);
EmisTmsScanPicInfo emisTmsScanPicInfo = new EmisTmsScanPicInfo();
emisTmsScanPicInfo.setBillCode(emisTmsScanRecord.getMainBillCode());
emisTmsScanPicInfo.setPicType(scanType);
emisTmsScanPicInfo.setPicUrl(picUrl);
emisTmsScanPicInfoMapper.insertEmisTmsScanPicInfo(emisTmsScanPicInfo);
emisTmsScanPicInfoMapper.insertEmisTmsScanPicInfo(emisTmsScanPicInfo);
}
// 更新总运单签收记录
updateSignStatus(emisTmsScanRecord.getBillCode(),
updateSignStatus(emisTmsScanRecord.getMainBillCode(),
signMan,
emisTmsScanRecord.getScanManCode(),
emisTmsScanRecord.getSignSiteCode(),
@ -873,7 +872,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
dispatchOrSendManCode
);
changeWaybillCurrentSite(emisTmsScanRecord.getBillCode(),emisTmsScanRecord.getScanSiteCode());
changeWaybillCurrentSite(emisTmsScanRecord.getMainBillCode(),emisTmsScanRecord.getScanSiteCode());
if( "1".equals(emisWaybill.getBlMessage()) ) {
@ -882,10 +881,10 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
String content="尊敬的客户：您寄往${Nationalcity}的快递${name}已被签收，感谢您使用探路速运。";
String nationalcity=emisWaybill.getReceiveCountryName()+""+emisWaybill.getReceiveProvinceName();
content = content.replace("${Nationalcity}",nationalcity);
content = content.replace("${name}",emisWaybill.getBillCode());
content = content.replace("${name}",emisTmsScanRecord.getMainBillCode());
EmisSmsSendRecord emisSmsSendRecord = new EmisSmsSendRecord();
emisSmsSendRecord.setBillCode(emisTmsScanRecord.getBillCode());
emisSmsSendRecord.setBillCode(emisTmsScanRecord.getMainBillCode());
emisSmsSendRecord.setSmsType("2"); // 签收短信
emisSmsSendRecord.setPhone(emisWaybill.getSendMobile());
emisSmsSendRecord.setContent(content);
@ -894,7 +893,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
emisSmsSendRecord.setSendManCode(emisTmsScanRecord.getScanManCode());
emisSmsSendRecord.setSendManName(emisTmsScanRecord.getScanMan());
sendBizSmsMessage(emisSmsSendRecord);
// 插入短信记录表
insertBizSmsMessage(emisSmsSendRecord);
}
@ -913,7 +913,6 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
String remark = (String)scanDataItem.get("remark");
if(!StringUtils.isEmpty(keepType)){
String keepTypeDesc = DictUtils.getDictLabel("emis_keep_warehouse",keepType);
remark = keepTypeDesc + " " + remark;
@ -921,15 +920,17 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
emisTmsScanRecord.setRemark(remark);
EmisTmsScanPicInfo emisTmsScanPicInfo = new EmisTmsScanPicInfo();
emisTmsScanPicInfo.setBillCode(emisTmsScanRecord.getBillCode());
emisTmsScanPicInfo.setPicType(scanType);
emisTmsScanPicInfo.setPicUrl(picUrl);
emisTmsScanPicInfo.setRemark(remark);
emisTmsScanPicInfo.preInsert();
emisTmsScanPicInfoMapper.insertEmisTmsScanPicInfo(emisTmsScanPicInfo);
if(!StringUtils.isEmpty(picUrl)) {
EmisTmsScanPicInfo emisTmsScanPicInfo = new EmisTmsScanPicInfo();
emisTmsScanPicInfo.setBillCode(emisTmsScanRecord.getMainBillCode());
emisTmsScanPicInfo.setPicType(scanType);
emisTmsScanPicInfo.setPicUrl(picUrl);
emisTmsScanPicInfo.setRemark(remark);
emisTmsScanPicInfo.preInsert();
emisTmsScanPicInfoMapper.insertEmisTmsScanPicInfo(emisTmsScanPicInfo);
}
changeWaybillCurrentSite(emisTmsScanRecord.getBillCode(),emisTmsScanRecord.getScanSiteCode());
changeWaybillCurrentSite(emisTmsScanRecord.getMainBillCode(),emisTmsScanRecord.getScanSiteCode());
}
// 转件扫描
@ -960,15 +961,15 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// 获取快递公司
String transferCompanyName=DictUtils.getDictLabel("emis_express_code",transferCode);
emisTmsScanRecord.setRemark("["+transferCompanyName+" "+transferBillcode +"] 发往["+destCity+"]");
emisTmsScanRecord.setRemark("["+transferCompanyName+" "+transferBillcode +"] 发往 ["+destCity+"]");
// emisTmsScanRecord.setScanSite(transferCompanyName);
// emisTmsScanRecord.setScanMan(transferCompanyName);
// 插入转件记录表
EmisWaybillTransfer emisWaybillTransfer = new EmisWaybillTransfer();
emisWaybillTransfer.setBillCode(emisTmsScanRecord.getBillCode());
emisWaybillTransfer.setTransferDate(emisTmsScanRecord.getScanDate());
emisWaybillTransfer.setBillCode(emisTmsScanRecord.getMainBillCode());
emisWaybillTransfer.setTransferDate(emisTmsScanRecord.getScanDate());
emisWaybillTransfer.setTransferExpress(transferCode);
emisWaybillTransfer.setTransferBillCode(transferBillcode);
@ -993,7 +994,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// 更新waybill做转单
wayBillTransfer(emisWaybillTransfer);
changeWaybillCurrentSite(emisTmsScanRecord.getBillCode(),emisTmsScanRecord.getScanSiteCode());
changeWaybillCurrentSite(emisTmsScanRecord.getMainBillCode(),emisTmsScanRecord.getScanSiteCode());
}
// 问题件
@ -1020,7 +1021,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// 登记问题件
EmisWaybillProblemInfo waybillProblemInfo = new EmisWaybillProblemInfo();
waybillProblemInfo.setBillCode(emisTmsScanRecord.getBillCode());
waybillProblemInfo.setBillCode(emisTmsScanRecord.getMainBillCode());
waybillProblemInfo.setProblemType(Integer.valueOf(problemType));
waybillProblemInfo.setProblemCause(remark);
@ -1106,9 +1107,9 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
emisTmsScanRecord.setPreOrNextStationPhone(site.getPhone());
// 当前站点
changeWaybillCurrentSite(emisTmsScanRecord.getBillCode(),emisTmsScanRecord.getScanSiteCode());
changeWaybillCurrentSite(emisTmsScanRecord.getMainBillCode(),emisTmsScanRecord.getScanSiteCode());
// 下一站点
changeWaybillNextSite(emisTmsScanRecord.getBillCode(),preOrNextStationCode);
changeWaybillNextSite(emisTmsScanRecord.getMainBillCode(),preOrNextStationCode);
}
// 清关扫描
@ -1127,9 +1128,9 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
emisTmsScanRecord.setPreOrNextStationPhone(site.getPhone());
// 当前站点
changeWaybillCurrentSite(emisTmsScanRecord.getBillCode(),emisTmsScanRecord.getScanSiteCode());
changeWaybillCurrentSite(emisTmsScanRecord.getMainBillCode(),emisTmsScanRecord.getScanSiteCode());
// 下一站点
changeWaybillNextSite(emisTmsScanRecord.getBillCode(),preOrNextStationCode);
changeWaybillNextSite(emisTmsScanRecord.getMainBillCode(),preOrNextStationCode);
}

1
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -1230,6 +1230,7 @@
update emis_waybill
set sign_man=#{signMan},
bl_sign = '1',
dispatch_man_code = #{dispatchManCode},
sign_man_code=#{signManCode},
sign_site_code = #{signSiteCode},
sign_date = #{signDate},