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 138fb95ec..cf8760faf 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 @@ -19,8 +19,10 @@ import com.xdadan.erp.common.core.redis.RedissonService; import com.xdadan.erp.common.enums.BusinessType; import com.xdadan.erp.common.utils.DateUtils; import com.xdadan.erp.common.utils.SecurityUtils; +import com.xdadan.erp.emis.domain.EmisCountry; import com.xdadan.erp.emis.domain.EmisPrintTpl; import com.xdadan.erp.emis.domain.EmisSite; +import com.xdadan.erp.emis.domain.EmisWaybill; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.vo.AddressParseResult; import com.xdadan.erp.emis.service.*; @@ -497,8 +499,36 @@ public class EmisCommonController extends EmisBaseController } + + List rstList = new ArrayList(); Map rstMap = new HashMap<>(); + String sendCountry=""; + String receiveCountry=""; + + try { + EmisWaybill emisWaybill = emisWaybillService.selectEmisWaybillByBillCode(mainNo); + if (emisWaybill != null) { + String sendCountryCode = emisWaybill.getSendCountry(); + String receiveCountryCode = emisWaybill.getReceiveCountry(); + + // 发件 + EmisCountry emisSendCountry = emisBaseService.getCountryByCode(sendCountryCode); + if(emisSendCountry!=null) { + sendCountry =emisSendCountry.getTwoCode(); + } + + // 收件 + EmisCountry emisReceiveCountry = emisBaseService.getCountryByCode(receiveCountryCode); + if(emisReceiveCountry!=null) { + receiveCountry =emisReceiveCountry.getTwoCode(); + } + } + }catch (Exception ex){ + } + rstMap.put("sendCountry",sendCountry); + rstMap.put("receiveCountry",receiveCountry); + rstMap.put("billCode",mainNo); List stepList=emisTmsScanRecordService.queryWaybillTraceInfo(mainNo,lang); rstMap.put("steps",stepList);