aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-09-24 15:07:23 +08:00
parent b411a2d3ad
commit 75088bc6d8
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
View File

@ -19,8 +19,10 @@ import com.xdadan.erp.common.core.redis.RedissonService;
import com.xdadan.erp.common.enums.BusinessType; import com.xdadan.erp.common.enums.BusinessType;
import com.xdadan.erp.common.utils.DateUtils; import com.xdadan.erp.common.utils.DateUtils;
import com.xdadan.erp.common.utils.SecurityUtils; 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.EmisPrintTpl;
import com.xdadan.erp.emis.domain.EmisSite; 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.exception.EmisBizError;
import com.xdadan.erp.emis.domain.vo.AddressParseResult; import com.xdadan.erp.emis.domain.vo.AddressParseResult;
import com.xdadan.erp.emis.service.*; import com.xdadan.erp.emis.service.*;
@ -497,8 +499,36 @@ public class EmisCommonController extends EmisBaseController
} }
List<Map> rstList = new ArrayList(); List<Map> rstList = new ArrayList();
Map<String,Object> rstMap = new HashMap<>(); Map<String,Object> 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); rstMap.put("billCode",mainNo);
List<Map> stepList=emisTmsScanRecordService.queryWaybillTraceInfo(mainNo,lang); List<Map> stepList=emisTmsScanRecordService.queryWaybillTraceInfo(mainNo,lang);
rstMap.put("steps",stepList); rstMap.put("steps",stepList);