diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java
index 5ed1a840f..a306612b0 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java
@@ -1,5 +1,6 @@
 package com.mhd.wms.interfaces.facadeApi.materialInventory;
 
+import com.mhd.common.core.utils.StringUtils;
 import com.mhd.common.core.web.controller.BaseController;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.core.web.page.TableDataInfo;
@@ -38,8 +39,14 @@ public class MaterialInventoryApi extends BaseController {
      */
     @ApiOperation("查询物料库存列表")
     @GetMapping("/list")
-    public TableDataInfo list(MaterialInventoryDTO materialInventoryDTO)
+    public TableDataInfo list(MaterialInventoryDTO materialInventoryDTO,
+                              @RequestParam(value = "customerName", required = false) String customerName)
     {
+        // 出库分配前端传的是客户名称 customerName，这里转成货主筛选条件（模糊匹配货主编码 / 名称）
+        if (StringUtils.isNotBlank(customerName) && StringUtils.isBlank(materialInventoryDTO.getShipperInfo())) {
+            materialInventoryDTO.setShipperInfo(customerName);
+        }
+
         //转换实体
         MaterialInventoryDO materialInventoryDO = materialInventoryAssembler.toDO(materialInventoryDTO);
         startPage();