diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java
index f2baea1b..79b5a56d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java
@@ -508,6 +508,14 @@ public class ErpMaterialController extends BaseController
         }
         return success(erpMaterialService.searchMaterialsByPrefix(prefix));
     }
+    @RequestMapping("/getMaterialAllList")
+    @ResponseBody
+    public AjaxResult getMaterialSelectList(@RequestParam(value = "q",defaultValue = "") String prefix){
+        if (prefix == null || prefix.isEmpty()){
+            return success(erpMaterialService.selectCateErpMaterialList());
+        }
+        return success(erpMaterialService.searchAllMaterialsByPrefix(prefix));
+    }
 
     @GetMapping ("/getEngineerList")
     @ResponseBody
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java
index dfc05755..f0242eda 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java
@@ -65,6 +65,8 @@ public interface IErpMaterialService
      */
     public List<ErpMaterialVo> searchMaterialsByPrefix(String prefix);
 
+    List<ErpMaterialVo> searchAllMaterialsByPrefix(String prefix);
+
     /**
      * 新增物料信息
      * 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java
index 948bc63e..2447ef56 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java
@@ -27,16 +27,12 @@ import com.ruoyi.purchase.domain.PurchaseOrder;
 import com.ruoyi.purchase.domain.PurchaseOrderChild;
 import com.ruoyi.purchase.mapper.PurchaseOrderChildMapper;
 import com.ruoyi.purchase.mapper.PurchaseOrderMapper;
-import com.ruoyi.purchase.mapper.PurchasePlanChildMapper;
 import com.ruoyi.sales.mapper.SalesEstimateDetailMapper;
 import com.ruoyi.system.domain.*;
-import com.ruoyi.system.domain.Vo.ExportCustomerQuoteChildVo;
 import com.ruoyi.system.mapper.*;
 import com.ruoyi.system.service.*;
 import com.ruoyi.warehouse.domain.WarehouseInventoryInquiry;
 import com.ruoyi.warehouse.mapper.WarehouseInventoryInquiryMapper;
-import com.ruoyi.warehouse.mapper.WarehouseStorageOrderDetailMapper;
-import com.ruoyi.warehouse.mapper.WarehouseStorageOrderMapper;
 import lombok.SneakyThrows;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.impl.persistence.entity.TaskEntityImpl;
@@ -48,7 +44,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -292,6 +287,16 @@ public class ErpMaterialServiceImpl implements IErpMaterialService
         return collect;
     };
 
+    /**
+     * 根据料号前缀查询匹配物料
+     *
+     * @return 物料信息集合
+     */
+    @Override
+    public List<ErpMaterialVo> searchAllMaterialsByPrefix(String prefix){
+        List<ErpMaterialVo> erpMaterialVos = erpMaterialMapper.searchMaterialsByPrefix(prefix);
+        return erpMaterialVos;
+    };
 
     /**
      * 新增物料信息