diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java index cdaac3c..b58d710 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java @@ -193,8 +193,8 @@ public class Oms2cWaybillController extends BaseController public AjaxResult listWmsWarehouse(Integer pageNum,Integer pageSize,String searchValue) { // @RequestBody WmsWarehouse wmsWarehouse, - WmsWarehouse wmsWarehouse = new WmsWarehouse(); - wmsWarehouse.setSearchValue(searchValue); +// WmsWarehouse wmsWarehouse = new WmsWarehouse(); +// wmsWarehouse.setSearchValue(searchValue); if(pageNum==null){ pageNum=1; } @@ -202,7 +202,7 @@ public class Oms2cWaybillController extends BaseController if(pageSize==null){ pageNum=10; } - return iRpcWmsWarehouseSvc.listWmsWarehouse(wmsWarehouse,pageNum,pageSize); + return iRpcWmsWarehouseSvc.listWmsWarehouse(searchValue,pageNum,pageSize); } diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWmsWarehouseSvc.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWmsWarehouseSvc.java index 02f61be..567fba3 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWmsWarehouseSvc.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWmsWarehouseSvc.java @@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestParam; public interface IRpcWmsWarehouseSvc { @GetMapping("/apiweb/wmsWarehouse/listWmsWarehouse") - public AjaxResult listWmsWarehouse(@RequestBody WmsWarehouse wmsWarehouse,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize")Integer pageSize); + public AjaxResult listWmsWarehouse(@RequestParam("searchValue")String searchValue, + @RequestParam("pageNum") Integer pageNum, + @RequestParam("pageSize")Integer pageSize); } \ No newline at end of file