diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysBillMaterialServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysBillMaterialServiceImpl.java
index ee16c60..2dd2f56 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysBillMaterialServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysBillMaterialServiceImpl.java
@@ -415,7 +415,7 @@ public class YysBillMaterialServiceImpl extends ServiceImpl<YysBillMaterialMappe
     @Override
     public List<YysSubsetMaterialEntity> queryByPieceId(YysBillMaterialPagination yysBillMaterialPagination) {
         LambdaQueryWrapper<YysSubsetMaterialEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(YysSubsetMaterialEntity::getPieceId, yysBillMaterialPagination.getPieceId());
+        wrapper.eq(YysSubsetMaterialEntity::getSubsetId, yysBillMaterialPagination.getPieceId());
         wrapper.isNull(YysSubsetMaterialEntity::getDeleteMark);
         Page<YysSubsetMaterialEntity> page = new Page<>(yysBillMaterialPagination.getCurrentPage(), yysBillMaterialPagination.getPageSize());
         IPage<YysSubsetMaterialEntity> userIPage = yysSubsetMaterialService.page(page, wrapper);
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialClassServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialClassServiceImpl.java
index 682e0c7..5112dc1 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialClassServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialClassServiceImpl.java
@@ -180,7 +180,7 @@ public class YysMaterialClassServiceImpl extends ServiceImpl<YysMaterialClassMap
                 String value = yysMaterialClassPagination.getParentClassification() instanceof List ?
                         JsonUtil.getObjectToString(yysMaterialClassPagination.getParentClassification()) :
                         String.valueOf(yysMaterialClassPagination.getParentClassification());
-                yysMaterialClassQueryWrapper.lambda().like(YysMaterialClassEntity::getParentClassification, value);
+                yysMaterialClassQueryWrapper.lambda().like(YysMaterialClassEntity::getParentClassname, value);
 
             }
 
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysSupplierClassServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysSupplierClassServiceImpl.java
index 4e8c9aa..e8d1b33 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysSupplierClassServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysSupplierClassServiceImpl.java
@@ -178,7 +178,7 @@ public class YysSupplierClassServiceImpl extends ServiceImpl<YysSupplierClassMap
                 String value = yysSupplierClassPagination.getParentClassification() instanceof List ?
                         JsonUtil.getObjectToString(yysSupplierClassPagination.getParentClassification()) :
                         String.valueOf(yysSupplierClassPagination.getParentClassification());
-                yysSupplierClassQueryWrapper.lambda().like(YysSupplierClassEntity::getParentClassification, value);
+                yysSupplierClassQueryWrapper.lambda().like(YysSupplierClassEntity::getParentClassname, value);
 
             }
 
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysInventoryQueryController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysInventoryQueryController.java
index d91ceea..85f047b 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysInventoryQueryController.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysInventoryQueryController.java
@@ -13,9 +13,11 @@ import jnpf.entity.*;
 import jnpf.util.*;
 import jnpf.model.yysinventoryquery.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.*;
 
@@ -56,6 +58,9 @@ public class YysInventoryQueryController {
     @Autowired
     private YysInventoryQueryService yysInventoryQueryService;
 
+    @Resource
+    private YysMaterialClassService yysMaterialClassService;
+
 
     /**
      * 列表
@@ -68,9 +73,14 @@ public class YysInventoryQueryController {
     public ActionResult list(@RequestBody YysInventoryQueryPagination yysInventoryQueryPagination) throws IOException {
         List<YysInventoryQueryEntity> list = yysInventoryQueryService.getList(yysInventoryQueryPagination);
         List<Map<String, Object>> realList = new ArrayList<>();
+        List<YysMaterialClassEntity> list1 = yysMaterialClassService.list();
+        Map<String, String> collect = list1.stream().collect(Collectors.toMap(YysMaterialClassEntity::getClassId, YysMaterialClassEntity::getClassName));
         for (YysInventoryQueryEntity entity : list) {
             Map<String, Object> yysInventoryQueryMap = JsonUtil.entityToMap(entity);
             yysInventoryQueryMap.put("id", yysInventoryQueryMap.get("id"));
+            if (MapUtils.isNotEmpty(collect) && collect.containsKey(entity.getMaterialClassification())) {
+                yysInventoryQueryMap.put("materialClassification", collect.get(entity.getMaterialClassification()));
+            }
             //副表数据
             //子表数据
             realList.add(yysInventoryQueryMap);
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/index.vue
index 08fc918..36d0921 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/index.vue
@@ -15,7 +15,8 @@
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="单据状态">
-                            <el-input v-model="query.documentStatus" placeholder="请输入" clearable> </el-input>
+                            <JnpfSelect v-model="query.documentStatus" placeholder="请输入" clearable
+                            :options="documentStatusOptions" :props="documentStatusProps"> </JnpfSelect>
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialclass/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialclass/index.vue
index 95f095e..0410a61 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialclass/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialclass/index.vue
@@ -15,7 +15,9 @@
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="启用状态">
-                            <el-input v-model="query.enableStatus" placeholder="请输入" clearable> </el-input>
+                            <JnpfSelect v-model="query.enableStatus" placeholder="请选择启用状态" clearable
+                                :options="enableStatusOptions" :props="enableStatusProps">
+                            </JnpfSelect>
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialinformation/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialinformation/index.vue
index aa10be5..5480125 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialinformation/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialinformation/index.vue
@@ -20,10 +20,12 @@
                     </el-col>
                     <template v-if="showAll">
                         <el-col :span="6">
-                            <el-form-item label="启用状态">
-                                <el-input v-model="query.enableStatus" placeholder="请输入" clearable> </el-input>
-                            </el-form-item>
-                        </el-col>
+                        <el-form-item label="启用状态">
+                            <JnpfSelect v-model="query.enableStatus" placeholder="请选择启用状态" clearable
+                                :options="enableStatusOptions" :props="enableStatusProps">
+                            </JnpfSelect>
+                        </el-form-item>
+                    </el-col>
                     </template>
                     <el-col :span="6">
                         <el-form-item>
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierclass/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierclass/index.vue
index b50bacb..c615dea 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierclass/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierclass/index.vue
@@ -15,7 +15,9 @@
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="启用状态">
-                            <el-input v-model="query.enableStatus" placeholder="请输入" clearable> </el-input>
+                            <JnpfSelect v-model="query.enableStatus" placeholder="请选择启用状态" clearable
+                                :options="enableStatusOptions" :props="enableStatusProps">
+                            </JnpfSelect>
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierinformation/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierinformation/index.vue
index b316c59..69891d1 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierinformation/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierinformation/index.vue
@@ -15,7 +15,9 @@
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="启用状态">
-                            <el-input v-model="query.enableStatus" placeholder="请输入" clearable> </el-input>
+                            <JnpfSelect v-model="query.enableStatus" placeholder="请选择启用状态" clearable
+                                :options="enableStatusOptions" :props="enableStatusProps">
+                            </JnpfSelect>
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysunitinformation/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysunitinformation/index.vue
index 37255b7..e608bc1 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysunitinformation/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysunitinformation/index.vue
@@ -10,7 +10,9 @@
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="启用状态">
-                            <el-input v-model="query.enableStatus" placeholder="请输入" clearable> </el-input>
+                            <JnpfSelect v-model="query.enableStatus" placeholder="请选择启用状态" clearable
+                                :options="enableStatusOptions" :props="enableStatusProps">
+                            </JnpfSelect>
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">