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 22:00:48 +08:00
parent 8d87b10592
commit 15891edbcb
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,6 +126,7 @@ public class EmisWaybillTransferController extends EmisBaseController
"billCode": "T001,T002,T002", "billCode": "T001,T002,T002",
"transferCode": "转单同行快递代码", "transferCode": "转单同行快递代码",
"transferBillcode": "转单同行单号", "transferBillcode": "转单同行单号",
"transferDate": "转单日期",
"destCity": "目的城市", "destCity": "目的城市",
"scanDate": "2024-05-02 12:03:05", "scanDate": "2024-05-02 12:03:05",
"transferResean": "", "transferResean": "",
@ -146,7 +147,8 @@ public class EmisWaybillTransferController extends EmisBaseController
scanDateItem.put("transferCode",emisWaybillTransfer.getTransferExpress()); scanDateItem.put("transferCode",emisWaybillTransfer.getTransferExpress());
scanDateItem.put("transferBillcode",emisWaybillTransfer.getTransferBillCode()); scanDateItem.put("transferBillcode",emisWaybillTransfer.getTransferBillCode());
scanDateItem.put("destCity",emisWaybillTransfer.getTransferCity()); scanDateItem.put("destCity",emisWaybillTransfer.getTransferCity());
scanDateItem.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,emisWaybillTransfer.getTransferDate())); scanDateItem.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,new Date()));
scanDateItem.put("transferDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,emisWaybillTransfer.getTransferDate()));
scanDateItem.put("transferResean", emisWaybillTransfer.getTransferResean()); scanDateItem.put("transferResean", emisWaybillTransfer.getTransferResean());
scanDateItem.put("transferFee", emisWaybillTransfer.getTransferFee()); scanDateItem.put("transferFee", emisWaybillTransfer.getTransferFee());
scanDateItem.put("linkMan", emisWaybillTransfer.getLinkMan()); scanDateItem.put("linkMan", emisWaybillTransfer.getLinkMan());

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

@ -944,6 +944,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
String transferCode =MapUtils.getString(scanDataItem,"transferCode",null) ; String transferCode =MapUtils.getString(scanDataItem,"transferCode",null) ;
String transferDateStr =MapUtils.getString(scanDataItem,"transferDate",null) ;
String transferBillcode = MapUtils.getString(scanDataItem,"transferBillcode",null) ; String transferBillcode = MapUtils.getString(scanDataItem,"transferBillcode",null) ;
String destCity =MapUtils.getString(scanDataItem,"destCity",null) ; String destCity =MapUtils.getString(scanDataItem,"destCity",null) ;
String transferResean =MapUtils.getString(scanDataItem,"transferResean",null) ; String transferResean =MapUtils.getString(scanDataItem,"transferResean",null) ;
@ -953,10 +954,18 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
Float transferVolume =MapUtils.getFloat(scanDataItem,"transferVolume",null) ; Float transferVolume =MapUtils.getFloat(scanDataItem,"transferVolume",null) ;
Float transferFee =MapUtils.getFloat(scanDataItem,"transferFee",null) ; Float transferFee =MapUtils.getFloat(scanDataItem,"transferFee",null) ;
if(StringUtils.isAnyEmpty(transferCode,transferBillcode,destCity)) { if(StringUtils.isAnyEmpty(transferCode,transferBillcode,destCity,transferDateStr)) {
throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"转件公司,转单号,目标城市必填"); throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"转件公司,转件单号,转件日期,目标城市必填");
} }
Date transferDate = null;
if(transferDateStr.contains("Z")){
transferDateStr=transferDateStr.replace("T"," ");
transferDateStr=transferDateStr.substring(0,transferDateStr.lastIndexOf("."));
}
transferDate = DateUtils.parseDate(transferDateStr);
emisTmsScanRecord.setPreOrNextStation(destCity); emisTmsScanRecord.setPreOrNextStation(destCity);
// 获取快递公司 // 获取快递公司
@ -969,7 +978,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// 插入转件记录表 // 插入转件记录表
EmisWaybillTransfer emisWaybillTransfer = new EmisWaybillTransfer(); EmisWaybillTransfer emisWaybillTransfer = new EmisWaybillTransfer();
emisWaybillTransfer.setBillCode(emisTmsScanRecord.getMainBillCode()); emisWaybillTransfer.setBillCode(emisTmsScanRecord.getMainBillCode());
emisWaybillTransfer.setTransferDate(emisTmsScanRecord.getScanDate()); emisWaybillTransfer.setTransferDate(transferDate);
emisWaybillTransfer.setTransferExpress(transferCode); emisWaybillTransfer.setTransferExpress(transferCode);
emisWaybillTransfer.setTransferBillCode(transferBillcode); emisWaybillTransfer.setTransferBillCode(transferBillcode);