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 bb27c759f..ffbb54377 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 @@ -518,12 +518,17 @@ public class EmisCommonController extends EmisBaseController return AjaxResult.error("appId error!"); } + + 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(); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index bdad41dbc..352dd9fff 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -157,7 +157,6 @@ public class EmisBaseService { @Autowired private EmisWaybillOperLogMapper emisWaybillOperLogMapper; - // @Autowired // private CMCCSMSService cmccSMSService; @@ -2836,7 +2835,6 @@ public class EmisBaseService { return emisWaybillMapper.getSiteSendStatInfoMap(emisWaybill); } - /** * 目的网点运单统计 * @param emisWaybill @@ -2962,6 +2960,7 @@ public class EmisBaseService { } + /** * 根据国家名称获取国家 * @param name diff --git a/emis-biz/src/main/resources/tpl/ws_air_in_tpl.docx b/emis-biz/src/main/resources/tpl/ws_air_in_tpl.docx index c68c9641a..9bfb8954e 100644 Binary files a/emis-biz/src/main/resources/tpl/ws_air_in_tpl.docx and b/emis-biz/src/main/resources/tpl/ws_air_in_tpl.docx differ diff --git a/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx b/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx index 16c7db447..6ef8408d1 100644 Binary files a/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx and b/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx differ diff --git a/emis-biz/src/main/resources/tpl/ws_ls_in_tpl.docx b/emis-biz/src/main/resources/tpl/ws_ls_in_tpl.docx index 11c552446..87ce9f194 100644 Binary files a/emis-biz/src/main/resources/tpl/ws_ls_in_tpl.docx and b/emis-biz/src/main/resources/tpl/ws_ls_in_tpl.docx differ