diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillCargoController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillCargoController.java
index 53ca44365..43ca84b6e 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillCargoController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillCargoController.java
@@ -13,6 +13,9 @@ package com.xdadan.erp.web.emis;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.xdadan.erp.emis.utils.WaybillHelper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,7 +32,6 @@ import com.xdadan.erp.common.core.controller.BaseController;
 import com.xdadan.erp.common.core.domain.AjaxResult;
 import com.xdadan.erp.common.core.page.TableDataInfo;
 import com.xdadan.erp.common.enums.BusinessType;
-import com.xdadan.erp.common.utils.StringUtils;
 import com.xdadan.erp.common.utils.poi.ExcelUtil;
 
 import com.xdadan.erp.emis.domain.EmisWaybillCargo;
@@ -56,6 +58,10 @@ public class EmisWaybillCargoController extends EmisBaseController
     public TableDataInfo list(EmisWaybillCargo emisWaybillCargo)
     {
         startPage();
+        if(!StringUtils.isEmpty(emisWaybillCargo.getBillCode())) {
+            emisWaybillCargo.setBillCode(WaybillHelper.formatQueryValue(emisWaybillCargo.getBillCode()));
+        }
+
         List<EmisWaybillCargo> list = emisWaybillCargoService.selectEmisWaybillCargoList(emisWaybillCargo);
         return getDataTable(list);
     }