md

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<Map> rstList = new ArrayList();
         Map<String,Object> rstMap = new HashMap<>();
         String sendCountry="";
         String receiveCountry="";
 
         try {
+            // 虚拟单,面单删除 不能查询路由
+
+
             EmisWaybill emisWaybill = emisWaybillService.selectEmisWaybillByBillCode(mainNo);
             if (emisWaybill != null) {
                 String sendCountryCode = emisWaybill.getSendCountry();

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