diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java index ac5354fb6..64feca668 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java @@ -42,10 +42,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.nio.charset.Charset; -import java.util.Base64; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; /** * EMIS 公共 Controller @@ -57,6 +54,8 @@ import java.util.Map; @RequestMapping("/emis/common") public class EmisCommonController extends EmisBaseController { + @Autowired + private IEmisTmsScanRecordService emisTmsScanRecordService; @Autowired private IEmisElectronicSitePagService emisElectronicSitePagService; @@ -357,4 +356,31 @@ public class EmisCommonController extends EmisBaseController } } + /** + * 对外物流轨迹信息 + * @param trackingNo + * @return + */ + @RequestMapping("/queryTraceInfo") + public AjaxResult queryTraceInfo(String appId,String mainNo,String lang,String sign) + { + if(StringUtils.isAnyEmpty(mainNo,appId,sign)){ + return AjaxResult.error("appId,sign,mainNo required!"); + } + + if(!"xdadan20240614".equals(appId)){ + return AjaxResult.error("appId error!"); + } + + + List rstList = new ArrayList(); + Map rstMap = new HashMap<>(); + rstMap.put("billCode",mainNo); + List stepList=emisTmsScanRecordService.queryWaybillTraceInfo(mainNo,lang); + rstMap.put("steps",stepList); + rstList.add(rstMap); + + return AjaxResult.success("成功",rstList); + } + }