diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/MaterialCategoryController.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/MaterialCategoryController.java
index ec586fa3..e0b1a821 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/MaterialCategoryController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/MaterialCategoryController.java
@@ -48,9 +48,15 @@ public class MaterialCategoryController {
         return new ResponseEntity(HttpStatus.OK);
     }
 
-    @Log("查询物料类别")
+    @Log("分页查询物料类别")
     @GetMapping(value = "/queryMaterialCategoryPage")
     public ResponseEntity queryMaterialCategoryPage(MaterialCategoryDTO resources, Pageable pageable){
         return new ResponseEntity(materialCategoryService.queryAll(resources,pageable),HttpStatus.OK);
     }
+
+    @Log("查询物料类别")
+    @GetMapping(value = "/queryMaterialCategoryList")
+    public ResponseEntity queryMaterialCategoryList(MaterialCategoryDTO resources){
+        return new ResponseEntity(materialCategoryService.queryAll(resources),HttpStatus.OK);
+    }
 }
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/MaterialInfoController.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/MaterialInfoController.java
index 50f538aa..9af25690 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/MaterialInfoController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/MaterialInfoController.java
@@ -14,6 +14,9 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.*;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
 /**
 * @author 黄星星
 * @date 2019-07-27
@@ -25,6 +28,15 @@ public class MaterialInfoController {
 
     @Autowired
     private MaterialInfoService materialInfoService;
+    @Log("初始化物料资料编号")
+    @ApiOperation(value = "初始化物料资料编号")
+    @GetMapping(value = "/initMaterialInfoCode")
+    @PreAuthorize("hasAnyRole('ADMIN','BDSUPPLIERINFO_ALL','BDSUPPLIERINFO_SELECT')")
+    public ResponseEntity initMaterialInfoCode(){
+        DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS");//设置日期格式
+        String supplierCode = "WL"+ LocalDateTime.now().format(fmt);
+        return new ResponseEntity(supplierCode,HttpStatus.OK);
+    }
 
     @Log("分页查询物料资料")
     @ApiOperation(value = "分页查询物料资料")
@@ -58,14 +70,14 @@ public class MaterialInfoController {
     @Log("删除物料资料")
     @ApiOperation(value = "删除物料资料")
     @DeleteMapping(value = "/materialInfo/{id}")
-    public ResponseEntity delete(@PathVariable Integer id){
+    public ResponseEntity deleteMaterialInfoById(@PathVariable Integer id){
         materialInfoService.delete(id);
         return new ResponseEntity(HttpStatus.OK);
     }
 
     @Log("查看物料资料详情")
     @GetMapping(value = "/materialInfo/{id}")
-    public ResponseEntity getMaterialInfo(@PathVariable Long id){
+    public ResponseEntity getMaterialInfoById(@PathVariable Long id){
         return new ResponseEntity(materialInfoService.findById(id), HttpStatus.OK);
     }
 }
\ No newline at end of file
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/ProductInfoController.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/ProductInfoController.java
index bf55c30f..c06c1297 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/ProductInfoController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/ProductInfoController.java
@@ -53,7 +53,7 @@ public class ProductInfoController {
 
     @Log("查询产品资料列表")
     @ApiOperation(value = "查询产品资料列表")
-    @GetMapping(value = "/productInfo/all")
+    @GetMapping(value = "/queryProductInfoList")
     public ResponseEntity queryProductInfoList(ProductInfoQueryCriteria criteria){
         return new ResponseEntity(productInfoService.queryAll(criteria),HttpStatus.OK);
     }
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/MaterialCategoryService.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/MaterialCategoryService.java
index f93e846b..2545c36e 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/MaterialCategoryService.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/MaterialCategoryService.java
@@ -17,4 +17,6 @@ public interface MaterialCategoryService {
     void delete(Long id);
 
     Object queryAll(MaterialCategoryDTO materialCategory, Pageable pageable);
+
+    Object queryAll(MaterialCategoryDTO materialCategory);
 }
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/MaterialCategoryServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/MaterialCategoryServiceImpl.java
index 3df3e43c..26fd3191 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/MaterialCategoryServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/MaterialCategoryServiceImpl.java
@@ -106,4 +106,27 @@ public class MaterialCategoryServiceImpl implements MaterialCategoryService {
         return PageUtil.toPage(page.map(materialCategoryMapper::toDto));
     }
 
+    @Override
+    public Object queryAll(MaterialCategoryDTO materialCategory) {
+        Specification<MaterialCategory> specification = new Specification<MaterialCategory>() {
+            @Override
+            public Predicate toPredicate(Root<MaterialCategory> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+
+                List<Predicate> targetPredicateList = new ArrayList<>();
+
+                //状态
+                Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1);
+                targetPredicateList.add(statusPredicate);
+
+                if(CollectionUtils.isEmpty(targetPredicateList)){
+                    return null;
+                }else{
+                    return criteriaBuilder.and(targetPredicateList.toArray(new Predicate[targetPredicateList.size()]));
+                }
+            }
+        };
+        List<MaterialCategory> materialCategoryList = materialCategoryRepository.findAll(specification);
+        return materialCategoryMapper.toDto(materialCategoryList);
+    }
+
 }