From 4b00481c3d362c66fb22cfe9d6467cd211202588 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 13 Sep 2024 23:45:50 +0800
Subject: [PATCH] md

---
 .../erp/oms/web/Oms2cCommonController.java    | 38 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java
index e37e9a9..77e8cab 100644
--- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java
+++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java
@@ -90,7 +90,43 @@ public class Oms2cCommonController extends BaseController
     @RequestMapping(value = "/queryTraceInfo")
     AjaxResult queryTraceInfo(String mailno,String tail4){
 
-        return TraceUtils.queryTraceInfo(mailno,tail4);
+        AjaxResult rst=TraceUtils.queryTraceInfo(mailno,tail4);
+
+        JSONObject extBillInfo = new JSONObject();
+        extBillInfo.put("sendSiteName","");
+        extBillInfo.put("destinationName","");
+        extBillInfo.put("estimateDate","");
+        extBillInfo.put("productTypeName","");
+
+        try {
+            AjaxResult ar = this.iRpcWaybillSvc.getWaybillDetailByOms(mailno, "");
+            String code = ar.get("code").toString();
+            if ("200".equals(code)) {
+
+                if (ar.containsKey("data")) {
+                    String dataStr = JSONObject.toJSONString(ar.get("data"));
+                    JSONObject jobjData = JSONObject.parseObject(dataStr);
+
+                    String sendSiteName =  jobjData.getString("sendSiteName");
+                    String destinationName =  jobjData.getString("destinationName");
+                    String estimateDateStr =  jobjData.getString("estimateDate");
+                    Date estimateDate = DateUtils.parseDate(estimateDateStr);
+                    String productTypeName =  jobjData.getString("productTypeName");
+
+                    extBillInfo.put("sendSiteName",sendSiteName);
+                    extBillInfo.put("destinationName",destinationName);
+                    extBillInfo.put("estimateDate",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,estimateDate));
+                    extBillInfo.put("productTypeName",productTypeName);
+                }
+
+            }
+        }catch (Exception ex){
+
+        }
+
+
+        rst.put("extBillInfo",extBillInfo);
+        return rst;
     }
 
     @RequestMapping(value = "/getSignedPic")