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-17 23:57:26 +08:00
parent a5b2fa48ef
commit 853b520dd0
3 changed files with 13 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java
View File

@ -112,7 +112,7 @@ public class EmisWaybillTransferController extends EmisBaseController
@PostMapping
public AjaxResult add(@RequestBody EmisWaybillTransfer emisWaybillTransfer)
{
int ret=emisWaybillTransferService.insertEmisWaybillTransfer(emisWaybillTransfer);
// 做转单扫描登记
/*
@ -132,6 +132,8 @@ public class EmisWaybillTransferController extends EmisBaseController
}
*/
// int ret=emisWaybillTransferService.insertEmisWaybillTransfer(emisWaybillTransfer);
ScanInfo scanInfo = new ScanInfo();
List<Map<String,Object>> scanDataList = new ArrayList<>();
scanInfo.setOpType(2);
@ -141,7 +143,7 @@ public class EmisWaybillTransferController extends EmisBaseController
scanDateItem.put("transferCode",emisWaybillTransfer.getTransferExpress());
scanDateItem.put("transferBillcode",emisWaybillTransfer.getTransferBillCode());
scanDateItem.put("destCity",emisWaybillTransfer.getTransferCity());
scanDateItem.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,new Date()));
scanDateItem.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,emisWaybillTransfer.getTransferDate()));
scanDateItem.put("scanWeight", "0.0");
scanDataList.add(scanDateItem);
scanInfo.setScanData(scanDataList);
@ -156,7 +158,7 @@ public class EmisWaybillTransferController extends EmisBaseController
return AjaxResult.error("数据异常!");
}
return AjaxResult.success("成功",ret);
return AjaxResult.success("成功",1);
}
/**

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

@ -468,6 +468,14 @@ public class EmisBaseService {
upd.setBlDispFd("1");// 转单标识
emisWaybillMapper.updateTransferInfo(upd);
// 插入转件记录表
EmisWaybillTransfer emisWaybillTransfer = new EmisWaybillTransfer();
emisWaybillTransfer.setBillCode(billCode);
emisWaybillTransfer.setTransferExpress(transferCode);
emisWaybillTransfer.setTransferBillCode(transferBillcode);
emisWaybillTransfer.setTransferCity(destCity);
emisWaybillTransferMapper.insertEmisWaybillTransfer(emisWaybillTransfer);
// 插入跟踪记录表
EmisTmsTransferTrace emisTmsTransferTrace=new EmisTmsTransferTrace();
emisTmsTransferTrace.setBillCode(billCode);

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

@ -493,38 +493,6 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// 改变当前站点
changeWaybillCurrentSite(emisTmsScanRecord.getBillCode(),emisTmsScanRecord.getScanSiteCode());
// // 判断是否需要发派件短信
// String billCode=emisTmsScanRecord.getBillCode();
// // 判断是否是子单
// String mainBillCode = "";
// if(billCode.startsWith("T7080") && billCode.length()>14 ){
// mainBillCode=billCode.substring(0,14);
// }else{
// mainBillCode=billCode;
// }
//
// EmisWaybill waybill=getWaybillByBillCode(mainBillCode);
// if( "1".equals(waybill.getBlMessage()) ) {
//
// //发送寄件短信
// String content="尊敬的客户：您寄往${Nationalcity}的快递${name}已被签收，感谢您使用探路速运。";
// String nationalcity=waybill.getReceiveCountryName()+""+waybill.getReceiveProvinceName();
// content = content.replace("${Nationalcity}",nationalcity);
// content = content.replace("${name}",mainBillCode);
//
// EmisSmsSendRecord emisSmsSendRecord = new EmisSmsSendRecord();
// emisSmsSendRecord.setBillCode(emisTmsScanRecord.getBillCode());
// emisSmsSendRecord.setSmsType("2"); // 派送短信
// emisSmsSendRecord.setPhone(waybill.getReceiveMobile());
// emisSmsSendRecord.setContent(content);
// emisSmsSendRecord.setSendSiteCode(emisTmsScanRecord.getScanSiteCode());
// emisSmsSendRecord.setSendSiteName(emisTmsScanRecord.getScanSite());
// emisSmsSendRecord.setSendManCode(emisTmsScanRecord.getScanManCode());
// emisSmsSendRecord.setSendManName(emisTmsScanRecord.getScanMan());
//
// sendBizSmsMessage(emisSmsSendRecord);
//
// }
}
// 签收扫描
else if(ScanType.SIGNED.opCode.equals(scanType)){