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 b10d665ee..73fc7bd33 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
@@ -280,6 +280,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
         // 如果没有单号就生成单号，如果有单号需要判断是否重复
         if( !StringUtils.isEmpty(emisWaybillSave.getBillCode()) ) {
+
+            String billCode=WaybillHelper.formatQueryValue(emisWaybillSave.getBillCode());
+            emisWaybillSave.setBillCode(billCode);
+
             boolean isExists = this.checkWaybillIsExists(emisWaybillSave.getBillCode());
             if (isExists) {
                 throw new EmisBizError(EmisBizErrorType.EXISTS, "运单号重复");
@@ -330,6 +334,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
         // 如果没有单号就生成单号，如果有单号需要判断是否重复
         if( !StringUtils.isEmpty(emisWaybillSave.getBillCode()) ) {
+            String billCode=WaybillHelper.formatQueryValue(emisWaybillSave.getBillCode());
+            emisWaybillSave.setBillCode(billCode);
+
             boolean isExists = this.checkWaybillIsExists(emisWaybillSave.getBillCode());
             if (isExists) {
                 throw new EmisBizError(EmisBizErrorType.EXISTS, "运单号重复");
@@ -938,6 +945,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         EmisWaybill emisWaybillOld = null;
 
         if( !StringUtils.isEmpty(emisWaybillSave.getBillCode()) ){
+
+            String billCode=WaybillHelper.formatQueryValue(emisWaybillSave.getBillCode());
+            emisWaybillSave.setBillCode(billCode);
+
             emisWaybillOld = this.selectEmisWaybillByBillCode(emisWaybillSave.getBillCode());
             if(emisWaybillOld!=null){
                 isNew=false;