From 85f6f46ab0377eab03f9d6ad935d9d84298e5760 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 31 Aug 2024 15:34:59 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/oms/web/Oms2cWaybillController.java    | 11 +++++++++--
 .../erp/oms/service/svc/IRpcWmsWarehouseSvc.java      | 11 ++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

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 8bc9641..f93cf2b 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
@@ -21,6 +21,8 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
 import com.xdadan.erp.oms.common.core.domain.entity.SysOmsUser;
+import com.xdadan.erp.oms.common.core.page.PageDomain;
+import com.xdadan.erp.oms.common.core.page.TableSupport;
 import com.xdadan.erp.oms.common.utils.DateUtils;
 import com.xdadan.erp.oms.common.utils.HTTPHelperV3;
 import com.xdadan.erp.oms.common.utils.VerifyCodeUtil;
@@ -219,8 +221,13 @@ public class Oms2cWaybillController extends BaseController
     }
 
     @GetMapping("/listWmsWarehouse")
-    public AjaxResult listWmsWarehouse(Integer pageNum,Integer pageSize,String searchValue)
+    public AjaxResult listWmsWarehouse(WmsWarehouse wmsWarehouse)
     {
+
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+
 //        @RequestBody WmsWarehouse wmsWarehouse,
 //        WmsWarehouse wmsWarehouse = new WmsWarehouse();
 //        wmsWarehouse.setSearchValue(searchValue);
@@ -231,7 +238,7 @@ public class Oms2cWaybillController extends BaseController
         if(pageSize==null){
             pageNum=10;
         }
-        return iRpcWmsWarehouseSvc.listWmsWarehouse(searchValue,pageNum,pageSize);
+        return iRpcWmsWarehouseSvc.listWmsWarehouse(wmsWarehouse.getSearchValue(),wmsWarehouse.getParams(),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 567fba3..67b1062 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
@@ -11,12 +11,17 @@ 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;
+
 @FeignClient(name = "IRpcWmsWarehouseSvc",url = "${service.provider.url}",configuration = {FeignErrorDecoder.class})
 public interface IRpcWmsWarehouseSvc {
 
     @GetMapping("/apiweb/wmsWarehouse/listWmsWarehouse")
-    public AjaxResult listWmsWarehouse(@RequestParam("searchValue")String searchValue,
-                                       @RequestParam("pageNum") Integer pageNum,
-                                       @RequestParam("pageSize")Integer pageSize);
+    public AjaxResult listWmsWarehouse(
+            @RequestParam("searchValue")String searchValue,
+            @RequestParam("params") Map<String,Object> params,
+            @RequestParam("pageNum") Integer pageNum,
+            @RequestParam("pageSize")Integer pageSize
+    );
 
 }
\ No newline at end of file