diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWarehouseInController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWarehouseInController.java index b29b31e..fa3ba5d 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWarehouseInController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWarehouseInController.java @@ -72,7 +72,7 @@ public class Oms2cWarehouseInController extends BaseController emisWarehouseIn.setParams(new HashMap<>()); } - return iRpcWarehouseInSvc.listSimple(emisWarehouseIn,pageNum,pageSize); + return iRpcWarehouseInSvc.listSimple(emisWarehouseIn.getParams(),emisWarehouseIn.getSearchValue(),pageNum,pageSize); } /** diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWarehouseInSvc.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWarehouseInSvc.java index a303cfd..9b4c306 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWarehouseInSvc.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWarehouseInSvc.java @@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; +import java.util.Map; + /** * 仓库对货接口 */ @@ -25,7 +27,8 @@ public interface IRpcWarehouseInSvc { @GetMapping("/apiweb/emisWarehouseIn/listSimple") - public AjaxResult listSimple(@SpringQueryMap EmisWarehouseIn emisWarehouseIn, + public AjaxResult listSimple(@RequestParam("params") Map params, + @RequestParam("searchValue") String searchValue, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize);