diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
index ad996d832..6bf07107d 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
@@ -97,7 +97,7 @@ public interface WmsServiceFeign {
     public void omsInOrderAddDetail(@RequestBody List<InMaterialDetail> inMaterialDetails);
 
     @ApiOperation("oms查询物料列表")
-    @GetMapping("/materialBaseInfoApi/list")
+    @GetMapping("/materialBaseInfoApi/queryList")
     public AjaxResult getMaterialBaseInfoList(MaterialInfoDTO materialInfoDTO);
 
     @ApiOperation("oms物料列表推送-更新推送信息")
diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java
index bf31b9e85..6eb33d6a4 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java
@@ -51,6 +51,7 @@ public class MaterialInfoApplicationService {
             TableDataInfo tableDataInfo = new TableDataInfo();
             tableDataInfo.setData(data);
             tableDataInfo.setCode(200);
+            tableDataInfo.setTotal(data.size());
             return tableDataInfo;
         }
         TableDataInfo tableDataInfo = new TableDataInfo();
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/materialInfo/MaterialInfoApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/materialInfo/MaterialInfoApi.java
index 0787c3da0..6e56bae38 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/materialInfo/MaterialInfoApi.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/materialInfo/MaterialInfoApi.java
@@ -27,7 +27,8 @@ public class MaterialInfoApi extends BaseController {
     @GetMapping("/queryList")
     public TableDataInfo queryList(MaterialInfoDTO materialInfoDTO){
         startPage();
-        return materialInfoApplicationService.queryList(materialInfoDTO);
+        TableDataInfo tableDataInfo = materialInfoApplicationService.queryList(materialInfoDTO);
+        return tableDataInfo;
     }
 
     @ApiOperation("批量推送物料")
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialBaseInfo/MaterialBaseInfoApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialBaseInfo/MaterialBaseInfoApi.java
index 779f6d345..475f01b9d 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialBaseInfo/MaterialBaseInfoApi.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialBaseInfo/MaterialBaseInfoApi.java
@@ -125,7 +125,20 @@ public class MaterialBaseInfoApi extends BaseController {
         return toAjax(materialBaseInfoApplicationService.updatePushStatus(materialBaseInfoId, pushStatus, pushTimeDate, pushBy));
     }
 
-
+    @ApiOperation("查询物料基础信息列表")
+    @GetMapping("/queryList")
+    public TableDataInfo queryList(MaterialBaseInfoDTO materialBaseInfoDTO)
+    {
+        //转换实体
+        MaterialBaseInfoDO materialBaseInfoDO = materialBaseInfoAssembler.toDO(materialBaseInfoDTO);
+        startPage();
+        List<MaterialBaseInfoPO> list = materialBaseInfoApplicationService.queryList(materialBaseInfoDO);
+        TableDataInfo tableDataInfo = new TableDataInfo();
+        tableDataInfo.setTotal(list.size());
+        tableDataInfo.setCode(200);
+        tableDataInfo.setData(list);
+        return tableDataInfo;
+    }