diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
index 503f6f450..d6e4f94ed 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
@@ -443,7 +443,7 @@ public class EmisWaybillController extends EmisBaseController
             emisWaybillService.realSubmitOrder(emisWaybillSave);
 
             JSONObject jObjOut = new JSONObject();
-            jObjOut.put("billCode", waybillOrder.getBillCode());
+            jObjOut.put("billCode", emisWaybillSave.getBillCode());
 //            jObjOut.put("prodName", waybillOrder.getProductType());
 
             return AjaxResult.success("下单成功", jObjOut);
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index ab193978f..540c1d0d9 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -3169,6 +3169,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
      */
     private void addNewWaybill(EmisWaybill emisWaybillSave) throws EmisBizError {
 
+        // 当寄件国家为0095或0855时，去除billCode和billCodeSub中的第一个T
+        modifyBillCode(emisWaybillSave);
+
         // 获取运单号，判断是不是子单已存在
         boolean isExists = checkWaybillIsExists(emisWaybillSave.getBillCode());
         if(isExists){
@@ -3181,9 +3184,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         // 校验产品类型与线路是否匹配
         checkLineWithProd(emisWaybillSave);
 
-        // 当寄件国家为0095或0855时，去除billCode和billCodeSub中的第一个T
-        modifyBillCode(emisWaybillSave);
-
         // 子单号做扣减
         if ("1".equals(emisWaybillSave.getBlGenSubbill())) {
             Integer subBillCount = emisElectronicSitePagService.getTotalAvailablePagCount(emisWaybillSave.getSendSiteCode(), "T7080", "1002");