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 b8d0ab500..548752a33 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 @@ -126,6 +126,7 @@ public class EmisWaybillTransferController extends EmisBaseController "billCode": "T001,T002,T002", "transferCode": "转单同行快递代码", "transferBillcode": "转单同行单号", + "transferDate": "转单日期", "destCity": "目的城市", "scanDate": "2024-05-02 12:03:05", "transferResean": "", @@ -146,7 +147,8 @@ 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,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("transferFee", emisWaybillTransfer.getTransferFee()); scanDateItem.put("linkMan", emisWaybillTransfer.getLinkMan()); 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 fe172acdf..f4d3de015 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 @@ -944,6 +944,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm String transferCode =MapUtils.getString(scanDataItem,"transferCode",null) ; + String transferDateStr =MapUtils.getString(scanDataItem,"transferDate",null) ; String transferBillcode = MapUtils.getString(scanDataItem,"transferBillcode",null) ; String destCity =MapUtils.getString(scanDataItem,"destCity",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 transferFee =MapUtils.getFloat(scanDataItem,"transferFee",null) ; - if(StringUtils.isAnyEmpty(transferCode,transferBillcode,destCity)) { - throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"转件公司,转单号,目标城市必填"); + if(StringUtils.isAnyEmpty(transferCode,transferBillcode,destCity,transferDateStr)) { + 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); // 获取快递公司 @@ -969,7 +978,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // 插入转件记录表 EmisWaybillTransfer emisWaybillTransfer = new EmisWaybillTransfer(); emisWaybillTransfer.setBillCode(emisTmsScanRecord.getMainBillCode()); - emisWaybillTransfer.setTransferDate(emisTmsScanRecord.getScanDate()); + emisWaybillTransfer.setTransferDate(transferDate); emisWaybillTransfer.setTransferExpress(transferCode); emisWaybillTransfer.setTransferBillCode(transferBillcode);