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 842941bd3..cdcb8c239 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 @@ -171,7 +171,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("transferDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,emisWaybillTransfer.getTransferDate())); scanDateItem.put("transferResean", emisWaybillTransfer.getTransferResean()); scanDateItem.put("transferFee", emisWaybillTransfer.getTransferFee()); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java index e3cdd2d85..64a3385e0 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java @@ -191,7 +191,7 @@ public class Kd100Helper { // String str=queryTraceByMainNoAndCom("T7080300002588","探路速运"); // String str=queryTraceByMainNoAndCom("SF080300002588","shunfeng","1234"); -// String str=pollTraceByMainNoAndCom("SF080300002588","shunfeng","1234"); + String str=pollTraceByMainNoAndCom("SF080300002588","shunfeng","1234"); // String str=queryTraceByMainNoAndCom("T7080398716","",""); // System.out.println(str); // List list=cvtTraceToScanRecord("12321",str);