diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java index 28ff98ff1..54eefc7b7 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java @@ -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> 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); } /** diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 31f59aa52..2b239b2ea 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -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); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java index 261365d21..4fc49a5eb 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java @@ -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)){