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 43ca84b6e..cc041b98e 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 @@ -58,9 +58,7 @@ public class EmisWaybillCargoController extends EmisBaseController public TableDataInfo list(EmisWaybillCargo emisWaybillCargo) { startPage(); - if(!StringUtils.isEmpty(emisWaybillCargo.getBillCode())) { - emisWaybillCargo.setBillCode(WaybillHelper.formatQueryValue(emisWaybillCargo.getBillCode())); - } + List list = emisWaybillCargoService.selectEmisWaybillCargoList(emisWaybillCargo); return getDataTable(list); @@ -75,6 +73,10 @@ public class EmisWaybillCargoController extends EmisBaseController public TableDataInfo listClear(EmisWaybillCargo emisWaybillCargo) { startPage(); + if(!StringUtils.isEmpty(emisWaybillCargo.getBillCode())) { + emisWaybillCargo.setBillCode(WaybillHelper.formatQueryValue(emisWaybillCargo.getBillCode())); + } + setPrivParams(emisWaybillCargo); List list = emisWaybillCargoService.selectClearWaybillCargoList(emisWaybillCargo);