From 2b34b6f75333252ebec0789a6580037a83d10fd3 Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 2 Sep 2024 11:42:07 +0800 Subject: [PATCH] md --- .../erp/oms/web/Oms2cCommonController.java | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) 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 5f41a7e..288abe9 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 @@ -11,6 +11,9 @@ package com.xdadan.erp.oms.web; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.google.gson.JsonObject; import com.xdadan.erp.oms.common.core.controller.BaseController; import com.xdadan.erp.oms.common.core.domain.AjaxResult; import com.xdadan.erp.oms.common.core.redis.RedissonService; @@ -20,6 +23,7 @@ import com.xdadan.erp.oms.domain.vo.AddressParseResult; import com.xdadan.erp.oms.service.*; import com.xdadan.erp.oms.service.svc.IApiwebSvc; import com.xdadan.erp.oms.service.svc.IRpcCommonSvc; +import com.xdadan.erp.oms.service.svc.IRpcWaybillSvc; import com.xdadan.erp.oms.utils.TraceUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -44,6 +48,9 @@ public class Oms2cCommonController extends BaseController @Autowired private IRpcCommonSvc iRpcCommonSvc; + @Autowired + private IRpcWaybillSvc iRpcWaybillSvc; + /** * 获取电子面单单号 @@ -68,8 +75,33 @@ public class Oms2cCommonController extends BaseController @RequestMapping(value = "/queryTraceInfo") AjaxResult queryTraceInfo(String mailno,String tail4){ + return TraceUtils.queryTraceInfo(mailno,tail4); } + @RequestMapping(value = "/getSignedPic") + AjaxResult getSignedPic(String billCode,String tail4){ + String picUrl = ""; + try { + AjaxResult ar = this.iRpcWaybillSvc.getWaybillDetailByOms(billCode, ""); + String code = ar.get("code").toString(); + String msg = ar.get("msg").toString(); + if (!"200".equals(code)) { + return AjaxResult.error(msg); + } + + if (ar.containsKey("data")) { + String data = ar.get("data").toString(); + JSONObject jobjData = JSONObject.parseObject(data); + picUrl = jobjData.getString("billPicDispatchRmk"); + } + + return AjaxResult.success("成功", picUrl); + }catch (Exception ex){ + ex.printStackTrace(); + return AjaxResult.success("成功", picUrl); + } + + } }