From 3873ec9f147ee3666a01d3fd4962e8330d30aabb Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 13 Jun 2024 20:06:54 +0800 Subject: [PATCH] md --- .../com/xdadan/erp/emis/service/EmisBaseService.java | 2 +- .../java/com/xdadan/erp/emis/utils/Kd100Helper.java | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) 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 ef06a3b80..94a9a931f 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 @@ -411,7 +411,7 @@ public class EmisBaseService { JSONObject stepItem = (JSONObject)obj; EmisTmsScanRecord recordItem = new EmisTmsScanRecord(); recordItem.setBillCode(billCode); - recordItem.setScanDate(stepItem.getDate("time")); + recordItem.setScanDate(DateUtils.parseDate(stepItem.getString("time"))); recordItem.setRemark(stepItem.getString("context")); recordItem.setScanType("81"); recordList.add(recordItem); 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 31b40c8f4..0e19d68c5 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 @@ -4,6 +4,7 @@ package com.xdadan.erp.emis.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.xdadan.erp.common.utils.DateUtils; import com.xdadan.erp.emis.domain.EmisTmsScanRecord; import com.xdadan.erp.emis.domain.EmisTmsTransferTrace; import com.xdadan.erp.emis.domain.EmisWaybill; @@ -80,7 +81,7 @@ public class Kd100Helper { JSONArray steps=jsonObject.getJSONArray("data"); if(steps!=null && steps.size()>0){ JSONObject lastObj = steps.getJSONObject(0); - emisTmsTransferTrace.setLastTraceDate(new Date(lastObj.getString("time"))); + emisTmsTransferTrace.setLastTraceDate(DateUtils.parseDate(lastObj.getString("time"))); emisTmsTransferTrace.setRemark(lastObj.getString("context")); } @@ -112,8 +113,11 @@ public class Kd100Helper { public static void main(String[] args) { String rst= null; try { - rst = queryTraceByMainNoAndCom("SF1532297522428","shunfeng"); - System.out.println(rst); + EmisTmsTransferTrace emisTmsTransferTrace = new EmisTmsTransferTrace(); + emisTmsTransferTrace.setTransferBillCode("SF1532297522428"); + emisTmsTransferTrace.setTransferExpress("shunfeng"); + emisTmsTransferTrace = queryTmsTransferTraceByKd100(emisTmsTransferTrace); + System.out.println(JSON.toJSONString(emisTmsTransferTrace)); } catch (Exception e) { e.printStackTrace(); }