diff --git a/nladmin-system/doc/wms.xls b/nladmin-system/doc/wms.xls
index 0b05f22..d483754 100644
Binary files a/nladmin-system/doc/wms.xls and b/nladmin-system/doc/wms.xls differ
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java
new file mode 100644
index 0000000..9b8acf9
--- /dev/null
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java
@@ -0,0 +1,93 @@
+package org.nl.wms.database.classification.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.common.base.TableDataInfo;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.common.logging.annotation.Log;
+import org.nl.wms.database.classification.service.IMdBaseClassstandardService;
+import org.nl.wms.database.classification.service.dao.MdBaseClassstandard;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author lyd
+* @date 2023-05-11
+**/
+@Slf4j
+@RestController
+@Api(tags = "基础分类管理")
+@RequestMapping("/api/Classstandard")
+public class MdBaseClassstandardController {
+
+    @Autowired
+    private IMdBaseClassstandardService mdBaseClassstandardService;
+
+    @GetMapping
+    @Log("查询基础分类")
+    @ApiOperation("查询基础分类")
+    //@SaCheckPermission("@el.check('mdBaseClassstandard:list')")
+    public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
+        return new ResponseEntity<>(TableDataInfo.build(mdBaseClassstandardService.queryAll(whereJson,page)),HttpStatus.OK);
+    }
+
+    @PostMapping
+    @Log("新增基础分类")
+    @ApiOperation("新增基础分类")
+    //@SaCheckPermission("@el.check('mdBaseClassstandard:add')")
+    public ResponseEntity<Object> create(@Validated @RequestBody MdBaseClassstandard entity){
+        mdBaseClassstandardService.create(entity);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+    @PutMapping
+    @Log("修改基础分类")
+    @ApiOperation("修改基础分类")
+    //@SaCheckPermission("@el.check('mdBaseClassstandard:edit')")
+    public ResponseEntity<Object> update(@Validated @RequestBody MdBaseClassstandard entity){
+        mdBaseClassstandardService.update(entity);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
+    @Log("删除基础分类")
+    @ApiOperation("删除基础分类")
+    //@SaCheckPermission("@el.check('mdBaseClassstandard:del')")
+    @DeleteMapping
+    public ResponseEntity<Object> delete(@RequestBody List<String> ids) {
+        mdBaseClassstandardService.deleteAll(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @GetMapping("/getClassName")
+    @Log("获取分类名称下拉框")
+    @ApiOperation("获取分类名称下拉框")
+    public ResponseEntity<Object> getClassName() {
+        return new ResponseEntity<>(mdBaseClassstandardService.getClassName(), HttpStatus.OK);
+    }
+
+    @GetMapping("/loadClass")
+    @Log("查询基础类型")
+    @ApiOperation("查询基础类型")
+    //@PreAuthorize("@el.check('materialtype:list')")
+    public ResponseEntity<Object> query(@RequestParam Map whereJson) {
+        return new ResponseEntity<>(mdBaseClassstandardService.loadClass(whereJson), HttpStatus.OK);
+    }
+
+    @ApiOperation("查询类别:根据ID获取同级与上级数据")
+    @PostMapping("/superior")
+    //@PreAuthorize("@el.check('user:list','dept:list')")
+    public ResponseEntity<Object> getSuperior(@RequestBody String id) {
+        MdBaseClassstandard classstandard = mdBaseClassstandardService.getById(id);
+        ArrayList<MdBaseClassstandard> list = mdBaseClassstandardService.getSuperior(classstandard, new ArrayList<>());
+        return new ResponseEntity<>(mdBaseClassstandardService.buildTree(list), HttpStatus.OK);
+    }
+}
+
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/IMdBaseClassstandardService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/IMdBaseClassstandardService.java
new file mode 100644
index 0000000..7081151
--- /dev/null
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/IMdBaseClassstandardService.java
@@ -0,0 +1,72 @@
+package org.nl.wms.database.classification.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.wms.database.classification.service.dao.MdBaseClassstandard;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+* @description 服务接口
+* @author lyd
+* @date 2023-05-11
+**/
+public interface IMdBaseClassstandardService extends IService<MdBaseClassstandard> {
+
+    /**
+    * 查询数据分页
+    * @param whereJson 条件
+    * @param pageable 分页参数
+    * @return IPage<MdBaseClassstandard>
+    */
+    IPage<MdBaseClassstandard> queryAll(Map whereJson, PageQuery pageable);
+
+    /**
+    * 创建
+    * @param entity /
+    */
+    void create(MdBaseClassstandard entity);
+
+    /**
+    * 编辑
+    * @param entity /
+    */
+    void update(MdBaseClassstandard entity);
+
+    /**
+    * 多选删除
+    * @param ids /
+    */
+    void deleteAll(List<String> ids);
+
+    /**
+     * 获取下拉框
+     * @return
+     */
+    List<MdBaseClassstandard> getClassName();
+
+    /**
+     * loadClass
+     * @param whereJson
+     * @return
+     */
+    List<MdBaseClassstandard> loadClass(Map whereJson);
+
+    /**
+     *
+     * @param classstandard
+     * @param objects
+     * @return
+     */
+    ArrayList<MdBaseClassstandard> getSuperior(MdBaseClassstandard classstandard, ArrayList<MdBaseClassstandard> objects);
+
+    /**
+     * 构建树形
+     * @param list
+     * @return
+     */
+    List<MdBaseClassstandard> buildTree(ArrayList<MdBaseClassstandard> list);
+}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/MdBaseClassstandard.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/MdBaseClassstandard.java
new file mode 100644
index 0000000..e244b8f
--- /dev/null
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/MdBaseClassstandard.java
@@ -0,0 +1,98 @@
+package org.nl.wms.database.classification.service.dao;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+* @description /
+* @author lyd
+* @date 2023-05-11
+**/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("md_base_classstandard")
+public class MdBaseClassstandard implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "class_id", type = IdType.NONE)
+    @ApiModelProperty(value = "分类标识")
+    private String class_id;
+
+    @ApiModelProperty(value = "分类编码")
+    private String class_code;
+
+    @ApiModelProperty(value = "分类名称")
+    private String class_name;
+
+    @ApiModelProperty(value = "分类简要描述")
+    private String class_desc;
+
+    @ApiModelProperty(value = "上级分类标识")
+    private String parent_class_id;
+
+    @ApiModelProperty(value = "子级数目")
+    private Integer sub_count;
+
+    @ApiModelProperty(value = "是否叶子")
+    private Boolean is_leaf;
+
+    @ApiModelProperty(value = "是否可修改")
+    private Boolean is_modify;
+
+    @ApiModelProperty(value = "是否删除")
+    private Boolean is_delete;
+
+    @ApiModelProperty(value = "级别")
+    private String class_level;
+
+    @ApiModelProperty(value = "外部标识")
+    private String ext_id;
+
+    @ApiModelProperty(value = "外部上级标识")
+    private String ext_parent_id;
+
+    @ApiModelProperty(value = "车间编码")
+    private String workshop_code;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "创建人")
+    private String create_id;
+
+    @ApiModelProperty(value = "创建人")
+    private String create_name;
+
+    @ApiModelProperty(value = "创建时间")
+    private String create_time;
+
+    @ApiModelProperty(value = "修改人")
+    private String update_id;
+
+    @ApiModelProperty(value = "修改人")
+    private String update_name;
+
+    @ApiModelProperty(value = "修改时间")
+    private String update_time;
+
+    @TableField(exist = false)
+    private Boolean hasChildren;
+
+    @TableField(exist = false)
+    private String id;
+
+    @TableField(exist = false)
+    private String label;
+    @TableField(exist = false)
+    private Boolean leaf;
+
+}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/mapper/MdBaseClassstandardMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/mapper/MdBaseClassstandardMapper.java
new file mode 100644
index 0000000..656069b
--- /dev/null
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/mapper/MdBaseClassstandardMapper.java
@@ -0,0 +1,12 @@
+package org.nl.wms.database.classification.service.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.wms.database.classification.service.dao.MdBaseClassstandard;
+
+/**
+* @author lyd
+* @date 2023-05-11
+**/
+public interface MdBaseClassstandardMapper extends BaseMapper<MdBaseClassstandard> {
+
+}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/mapper/MdBaseClassstandardMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/mapper/MdBaseClassstandardMapper.xml
new file mode 100644
index 0000000..fc841cc
--- /dev/null
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/mapper/MdBaseClassstandardMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.database.classification.service.dao.mapper.MdBaseClassstandardMapper">
+
+</mapper>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardDto.java
new file mode 100644
index 0000000..09830e6
--- /dev/null
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardDto.java
@@ -0,0 +1,73 @@
+package org.nl.wms.database.classification.service.dto;
+
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+* @description /
+* @author lyd
+* @date 2023-05-11
+**/
+@Data
+public class MdBaseClassstandardDto implements Serializable {
+
+    /** 分类标识 */
+    private String class_id;
+
+    /** 分类编码 */
+    private String class_code;
+
+    /** 分类名称 */
+    private String class_name;
+
+    /** 分类简要描述 */
+    private String class_desc;
+
+    /** 上级分类标识 */
+    private String parent_class_id;
+
+    /** 子级数目 */
+    private String sub_count;
+
+    /** 是否叶子 */
+    private Boolean is_leaf;
+
+    /** 是否可修改 */
+    private Boolean is_modify;
+
+    /** 是否删除 */
+    private Boolean is_delete;
+
+    /** 级别 */
+    private String class_level;
+
+    /** 外部标识 */
+    private String ext_id;
+
+    /** 外部上级标识 */
+    private String ext_parent_id;
+
+    /** 车间编码 */
+    private String workshop_code;
+
+    /** 备注 */
+    private String remark;
+
+    /** 创建人 */
+    private String create_id;
+
+    /** 创建人 */
+    private String create_name;
+
+    /** 创建时间 */
+    private String create_time;
+
+    /** 修改人 */
+    private String update_id;
+
+    /** 修改人 */
+    private String update_name;
+
+    /** 修改时间 */
+    private String update_time;
+}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardQuery.java
new file mode 100644
index 0000000..bbf449a
--- /dev/null
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardQuery.java
@@ -0,0 +1,12 @@
+package org.nl.wms.database.classification.service.dto;
+
+import org.nl.common.domain.query.BaseQuery;
+import org.nl.wms.database.classification.service.dao.MdBaseClassstandard;
+
+/**
+* @author lyd
+* @date 2023-05-11
+**/
+public class MdBaseClassstandardQuery extends BaseQuery<MdBaseClassstandard> {
+
+}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardTrees.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardTrees.java
new file mode 100644
index 0000000..c5f76cc
--- /dev/null
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardTrees.java
@@ -0,0 +1,26 @@
+package org.nl.wms.database.classification.service.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.nl.wms.database.classification.service.dao.MdBaseClassstandard;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author: lyd
+ * @Description:
+ * @Date: 2023/5/12
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class MdBaseClassstandardTrees extends MdBaseClassstandard implements Serializable {
+
+    @TableField(exist = false)
+    private List<MdBaseClassstandard> children;
+}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/impl/MdBaseClassstandardServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/impl/MdBaseClassstandardServiceImpl.java
new file mode 100644
index 0000000..d3c5b65
--- /dev/null
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/impl/MdBaseClassstandardServiceImpl.java
@@ -0,0 +1,246 @@
+package org.nl.wms.database.classification.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.common.exception.BadRequestException;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.wms.database.classification.service.IMdBaseClassstandardService;
+import org.nl.wms.database.classification.service.dao.MdBaseClassstandard;
+import org.nl.wms.database.classification.service.dao.mapper.MdBaseClassstandardMapper;
+import org.nl.wms.database.classification.service.dto.MdBaseClassstandardTrees;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+/**
+ * @author lyd
+ * @description 服务实现
+ * @date 2023-05-11
+ **/
+@Slf4j
+@Service
+public class MdBaseClassstandardServiceImpl extends ServiceImpl<MdBaseClassstandardMapper, MdBaseClassstandard> implements IMdBaseClassstandardService {
+
+    @Autowired
+    private MdBaseClassstandardMapper mdBaseClassstandardMapper;
+
+    @Override
+    public IPage<MdBaseClassstandard> queryAll(Map whereJson, PageQuery page) {
+        String class_code = ObjectUtil.isNotEmpty(whereJson.get("class_code")) ? whereJson.get("class_code").toString() : null;
+        LambdaQueryWrapper<MdBaseClassstandard> lam = new LambdaQueryWrapper<>();
+        lam.eq(ObjectUtil.isNotEmpty(class_code), MdBaseClassstandard::getClass_code, class_code)
+                .eq(MdBaseClassstandard::getIs_delete, false)
+                .eq(MdBaseClassstandard::getParent_class_id, "0")
+                .or(la -> la.isNull(MdBaseClassstandard::getParent_class_id));
+        IPage<MdBaseClassstandard> pages = new Page<>(page.getPage() + 1, page.getSize());
+        mdBaseClassstandardMapper.selectPage(pages, lam);
+        pages.getRecords().forEach(classstandard -> {
+            classstandard.setIs_leaf(!(classstandard.getSub_count() > 0));
+            classstandard.setHasChildren(classstandard.getSub_count() > 0);
+        });
+        return pages;
+    }
+
+    @Override
+    @Transactional
+    public void create(MdBaseClassstandard entity) {
+        // 判断是否存在
+        MdBaseClassstandard mdBaseClassstandard = mdBaseClassstandardMapper
+                .selectOne(new LambdaQueryWrapper<MdBaseClassstandard>()
+                        .eq(MdBaseClassstandard::getClass_code, entity.getClass_code())
+                        .eq(MdBaseClassstandard::getIs_delete, false));
+        if (ObjectUtil.isNotEmpty(mdBaseClassstandard) && !mdBaseClassstandard.getClass_id().equals(entity.getClass_id())) {
+            throw new BadRequestException("存在相同的基础类别编号");
+        }
+
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+
+        entity.setClass_id(IdUtil.getSnowflake(1, 1).nextIdStr());
+        entity.setCreate_id(currentUserId);
+        entity.setCreate_name(nickName);
+        entity.setCreate_time(now);
+        entity.setUpdate_id(currentUserId);
+        entity.setUpdate_name(nickName);
+        entity.setUpdate_time(now);
+        entity.setIs_leaf(true);
+        entity.setClass_level(Math.ceil(entity.getClass_code().length() / 2.0) + "");
+        entity.setSub_count(0);
+        mdBaseClassstandardMapper.insert(entity);
+        // 更新节点
+        if (ObjectUtil.isNotEmpty(entity.getParent_class_id()) && !entity.getParent_class_id().equals("0")) {
+            updateSubCnt(entity.getParent_class_id());
+        }
+    }
+
+    private void updateSubCnt(String parentClassId) {
+        MdBaseClassstandard classObject = mdBaseClassstandardMapper.selectById(parentClassId);
+        if (ObjectUtil.isEmpty(classObject)) return;
+        List<MdBaseClassstandard> classList = mdBaseClassstandardMapper
+                .selectList(new LambdaQueryWrapper<MdBaseClassstandard>().eq(MdBaseClassstandard::getParent_class_id, parentClassId));
+        int size = classList.size();
+        classObject.setSub_count(size);
+        classObject.setIs_leaf(size > 0);
+        mdBaseClassstandardMapper.updateById(classObject);
+    }
+
+    @Override
+    public void update(MdBaseClassstandard entity) {
+        MdBaseClassstandard dto = mdBaseClassstandardMapper.selectById(entity.getClass_id());
+        if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
+        // 判断是否存在
+        MdBaseClassstandard mdBaseClassstandard = mdBaseClassstandardMapper
+                .selectOne(new LambdaQueryWrapper<MdBaseClassstandard>()
+                        .eq(MdBaseClassstandard::getClass_code, entity.getClass_code())
+                        .eq(MdBaseClassstandard::getIs_delete, false));
+        if (ObjectUtil.isNotEmpty(mdBaseClassstandard) && !mdBaseClassstandard.getClass_id().equals(entity.getClass_id())) {
+            throw new BadRequestException("存在相同的基础类别编号");
+        }
+        // 查询原来的父id
+        String oldPid = dto.getParent_class_id();
+        String newPid = entity.getParent_class_id();
+        if (entity.getParent_class_id() != null && entity.getClass_id().equals(entity.getParent_class_id())) {
+            throw new BadRequestException("上级不能为自己");
+        }
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+        entity.setUpdate_id(currentUserId);
+        entity.setUpdate_name(nickName);
+        entity.setUpdate_time(now);
+        // 更新
+        mdBaseClassstandardMapper.updateById(entity);
+        //更新父节点中子节点数目
+        updateSubCnt(oldPid);
+        updateSubCnt(newPid);
+    }
+
+    @Override
+    public void deleteAll(List<String> ids) {
+        // 递归删除子类
+        for (String id : ids) {
+            // 获取元素体
+            MdBaseClassstandard classstandard = mdBaseClassstandardMapper.selectById(id);
+            mdBaseClassstandardMapper.deleteById(classstandard.getClass_id());
+            // 找出所有当前节点的子节点
+            List<MdBaseClassstandard> baseClassstandardList = mdBaseClassstandardMapper.selectList(
+                    new LambdaQueryWrapper<MdBaseClassstandard>()
+                            .eq(MdBaseClassstandard::getParent_class_id, classstandard.getClass_id()));
+            if (baseClassstandardList.size() > 0) {
+                List<String> collect = baseClassstandardList.stream()
+                        .map(md -> md.getClass_id())
+                        .collect(Collectors.toList());
+                deleteAll(collect);
+            }
+            updateSubCnt(classstandard.getParent_class_id());
+        }
+    }
+
+    @Override
+    public List<MdBaseClassstandard> getClassName() {
+        return mdBaseClassstandardMapper.selectList(new LambdaQueryWrapper<MdBaseClassstandard>()
+                .isNull(MdBaseClassstandard::getParent_class_id)
+                .or()
+                .eq(MdBaseClassstandard::getParent_class_id, "0")
+                .eq(MdBaseClassstandard::getIs_delete, false));
+    }
+
+    @Override
+    public List<MdBaseClassstandard> loadClass(Map whereJson) {
+        String pid = ObjectUtil.isNotEmpty(whereJson.get("pid")) ? whereJson.get("pid").toString() : null;
+        LambdaQueryWrapper<MdBaseClassstandard> lam = new LambdaQueryWrapper<>();
+        lam.eq(ObjectUtil.isNotEmpty(pid), MdBaseClassstandard::getParent_class_id, pid)
+                .or(ObjectUtil.isEmpty(pid), la -> la.isNull(MdBaseClassstandard::getParent_class_id)
+                        .or()
+                        .eq(MdBaseClassstandard::getParent_class_id, "0"))
+                .eq(MdBaseClassstandard::getIs_delete, false);
+        List<MdBaseClassstandard> classstandardList = mdBaseClassstandardMapper.selectList(lam);
+        classstandardList.forEach(classstandard -> {
+            classstandard.setHasChildren(classstandard.getSub_count() > 0);
+            classstandard.setLeaf(!(classstandard.getSub_count() > 0));
+            classstandard.setId(classstandard.getClass_id());
+            classstandard.setLabel(classstandard.getClass_name());
+        });
+        return classstandardList;
+    }
+
+    /**
+     * 递归获取树形数据，从子级到父级以及最高级
+     *
+     * @param classstandard
+     * @param res
+     * @return
+     */
+    @Override
+    public ArrayList<MdBaseClassstandard> getSuperior(MdBaseClassstandard classstandard, ArrayList<MdBaseClassstandard> res) {
+        if (ObjectUtil.isEmpty(classstandard.getParent_class_id()) || classstandard.getParent_class_id().equals("0")) {
+            // 父类id为空或者是0就是顶级类别
+            List<MdBaseClassstandard> classstandardList = mdBaseClassstandardMapper.selectList(new LambdaQueryWrapper<MdBaseClassstandard>()
+                    .eq(MdBaseClassstandard::getIs_delete, false)
+                    .eq(MdBaseClassstandard::getParent_class_id, "0")
+                    .or(la -> la.isNull(MdBaseClassstandard::getParent_class_id)));
+            res.addAll(classstandardList);
+            return res;
+        }
+        // 递归寻找同级
+        List<MdBaseClassstandard> mdBaseClassstandards = mdBaseClassstandardMapper.selectList(
+                new LambdaQueryWrapper<MdBaseClassstandard>()
+                        .eq(MdBaseClassstandard::getIs_delete, false)
+                        .eq(MdBaseClassstandard::getParent_class_id, classstandard.getParent_class_id()));
+        res.addAll(mdBaseClassstandards);
+        return getSuperior(mdBaseClassstandardMapper.selectById(classstandard.getParent_class_id()), res);
+    }
+
+    @Override
+    public List<MdBaseClassstandard> buildTree(ArrayList<MdBaseClassstandard> list) {
+        // 将获取的数据初始化状态
+        list.forEach(classstandard -> {
+            classstandard.setId(classstandard.getClass_id());
+            classstandard.setLabel(classstandard.getClass_name());
+            classstandard.setLeaf(!(classstandard.getSub_count() > 0));
+            classstandard.setHasChildren(classstandard.getSub_count() > 0);
+        });
+        List<MdBaseClassstandard> trees = new ArrayList<>(); // 待返回数据
+        for (MdBaseClassstandard mdBaseClassstandard : list) {
+            // 筛选父类的值
+            if (ObjectUtil.isEmpty(mdBaseClassstandard.getParent_class_id())
+                    || mdBaseClassstandard.getParent_class_id().equals("0")) {
+                // collect：获取当前对象的所有子级
+                List<MdBaseClassstandard> collect = list.stream().filter(t -> t.getParent_class_id()
+                        .equals(mdBaseClassstandard.getClass_id())).collect(Collectors.toList());
+                if (ObjectUtil.isNotEmpty(collect)) {
+                    // 设置参数
+                    collect.forEach(classstandard -> {
+                        classstandard.setId(classstandard.getClass_id());
+                        classstandard.setLabel(classstandard.getClass_name());
+                        classstandard.setHasChildren(classstandard.getSub_count() > 0);
+                    });
+                    MdBaseClassstandardTrees tObj = new MdBaseClassstandardTrees();
+                    // 赋值一份实体，可以避免vue-tree拿到children属性显示展开图标
+                    BeanUtils.copyProperties(mdBaseClassstandard, tObj);
+                    tObj.setChildren(collect);
+                    trees.add(tObj);
+                } else {
+                    trees.add(mdBaseClassstandard);
+                }
+            }
+        }
+        return trees;
+    }
+
+}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java
index d73b8f4..995086e 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java
@@ -2,6 +2,7 @@ package org.nl.wms.database.material.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -18,6 +19,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Consumer;
 
 
 /**
@@ -34,7 +36,12 @@ public class MdBaseMaterialServiceImpl extends ServiceImpl<MdBaseMaterialMapper,
 
     @Override
     public IPage<MdBaseMaterial> queryAll(Map whereJson, PageQuery page){
+        String blurry = ObjectUtil.isNotEmpty(whereJson.get("blurry")) ? whereJson.get("blurry").toString() : null;
+        String workshop_code = ObjectUtil.isNotEmpty(whereJson.get("workshop_code")) ? whereJson.get("workshop_code").toString() : null;
         LambdaQueryWrapper<MdBaseMaterial> lam = new LambdaQueryWrapper<>();
+        lam.like(ObjectUtil.isNotEmpty(blurry), MdBaseMaterial::getMaterial_code, blurry)
+                .or(ObjectUtil.isNotEmpty(blurry), l -> l.like(ObjectUtil.isNotEmpty(blurry), MdBaseMaterial::getMaterial_name, blurry))
+                .eq(ObjectUtil.isNotEmpty(workshop_code), MdBaseMaterial::getWorkshop_code, workshop_code);
         IPage<MdBaseMaterial> pages = new Page<>(page.getPage() + 1, page.getSize());
         mdBaseMaterialMapper.selectPage(pages, lam);
         return pages;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/controller/MdBaseVehicleController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/controller/MdBaseVehicleController.java
new file mode 100644
index 0000000..64271da
--- /dev/null
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/controller/MdBaseVehicleController.java
@@ -0,0 +1,66 @@
+package org.nl.wms.database.vehicle.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.common.base.TableDataInfo;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.common.logging.annotation.Log;
+import org.nl.wms.database.vehicle.service.IMdBaseVehicleService;
+import org.nl.wms.database.vehicle.service.dao.MdBaseVehicle;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+import java.util.Set;
+/**
+* @author lyd
+* @date 2023-05-11
+**/
+@Slf4j
+@RestController
+@Api(tags = "载具维护管理")
+@RequestMapping("/api/mdBaseVehicle")
+public class MdBaseVehicleController {
+
+    @Autowired
+    private IMdBaseVehicleService mdBaseVehicleService;
+
+    @GetMapping
+    @Log("查询载具维护")
+    @ApiOperation("查询载具维护")
+    //@SaCheckPermission("@el.check('mdBaseVehicle:list')")
+    public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
+        return new ResponseEntity<>(TableDataInfo.build(mdBaseVehicleService.queryAll(whereJson,page)),HttpStatus.OK);
+    }
+
+    @PostMapping
+    @Log("新增载具维护")
+    @ApiOperation("新增载具维护")
+    //@SaCheckPermission("@el.check('mdBaseVehicle:add')")
+    public ResponseEntity<Object> create(@Validated @RequestBody MdBaseVehicle entity){
+        mdBaseVehicleService.create(entity);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+    @PutMapping
+    @Log("修改载具维护")
+    @ApiOperation("修改载具维护")
+    //@SaCheckPermission("@el.check('mdBaseVehicle:edit')")
+    public ResponseEntity<Object> update(@Validated @RequestBody MdBaseVehicle entity){
+        mdBaseVehicleService.update(entity);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
+    @Log("删除载具维护")
+    @ApiOperation("删除载具维护")
+    //@SaCheckPermission("@el.check('mdBaseVehicle:del')")
+    @DeleteMapping
+    public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
+        mdBaseVehicleService.deleteAll(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/IMdBaseVehicleService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/IMdBaseVehicleService.java
new file mode 100644
index 0000000..1444e28
--- /dev/null
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/IMdBaseVehicleService.java
@@ -0,0 +1,43 @@
+package org.nl.wms.database.vehicle.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.nl.common.domain.query.PageQuery;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.database.vehicle.service.dao.MdBaseVehicle;
+
+import java.util.Map;
+import java.util.Set;
+
+/**
+* @description 服务接口
+* @author lyd
+* @date 2023-05-11
+**/
+public interface IMdBaseVehicleService extends IService<MdBaseVehicle> {
+
+    /**
+    * 查询数据分页
+    * @param whereJson 条件
+    * @param pageable 分页参数
+    * @return IPage<MdBaseVehicle>
+    */
+    IPage<MdBaseVehicle> queryAll(Map whereJson, PageQuery pageable);
+
+    /**
+    * 创建
+    * @param entity /
+    */
+    void create(MdBaseVehicle entity);
+
+    /**
+    * 编辑
+    * @param entity /
+    */
+    void update(MdBaseVehicle entity);
+
+    /**
+    * 多选删除
+    * @param ids /
+    */
+    void deleteAll(Set<String> ids);
+}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/MdBaseVehicle.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/MdBaseVehicle.java
new file mode 100644
index 0000000..65ef1b8
--- /dev/null
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/MdBaseVehicle.java
@@ -0,0 +1,80 @@
+package org.nl.wms.database.vehicle.service.dao;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.io.Serializable;
+
+/**
+* @description /
+* @author lyd
+* @date 2023-05-11
+**/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("md_base_vehicle")
+public class MdBaseVehicle implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "vehicle_code", type = IdType.NONE)
+    @ApiModelProperty(value = "载具编码")
+    private String vehicle_code;
+
+    @ApiModelProperty(value = "载具名称")
+    private String vehicle_name;
+
+    @ApiModelProperty(value = "载具类型")
+    private String vehicle_type;
+
+    @ApiModelProperty(value = "一维码")
+    private String one_code;
+
+    @ApiModelProperty(value = "二维码")
+    private String two_code;
+
+    @ApiModelProperty(value = "RFID编码")
+    private String rfid_code;
+
+    @ApiModelProperty(value = "载具宽度")
+    private BigDecimal vehicle_width;
+
+    @ApiModelProperty(value = "载具长度")
+    private BigDecimal vehicle_long;
+
+    @ApiModelProperty(value = "载具高度")
+    private BigDecimal vehicle_height;
+
+    @ApiModelProperty(value = "载具超仓位类型")
+    private String overstruct_type;
+
+    @ApiModelProperty(value = "占仓位数")
+    private BigDecimal occupystruct_qty;
+
+    @ApiModelProperty(value = "外部标识")
+    private String ext_id;
+
+    @ApiModelProperty(value = "创建人")
+    private String create_id;
+
+    @ApiModelProperty(value = "创建人")
+    private String create_name;
+
+    @ApiModelProperty(value = "创建时间")
+    private String create_time;
+
+    @ApiModelProperty(value = "修改人")
+    private String update_id;
+
+    @ApiModelProperty(value = "修改人")
+    private String update_name;
+
+    @ApiModelProperty(value = "修改时间")
+    private String update_time;
+
+}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/mapper/MdBaseVehicleMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/mapper/MdBaseVehicleMapper.java
new file mode 100644
index 0000000..9dc21e3
--- /dev/null
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/mapper/MdBaseVehicleMapper.java
@@ -0,0 +1,12 @@
+package org.nl.wms.database.vehicle.service.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.wms.database.vehicle.service.dao.MdBaseVehicle;
+
+/**
+* @author lyd
+* @date 2023-05-11
+**/
+public interface MdBaseVehicleMapper extends BaseMapper<MdBaseVehicle> {
+
+}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/mapper/MdBaseVehicleMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/mapper/MdBaseVehicleMapper.xml
new file mode 100644
index 0000000..e51e86f
--- /dev/null
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/mapper/MdBaseVehicleMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.database.vehicle.service.dao.mapper.MdBaseVehicleMapper">
+
+</mapper>
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleDto.java
new file mode 100644
index 0000000..737739f
--- /dev/null
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleDto.java
@@ -0,0 +1,68 @@
+package org.nl.wms.database.vehicle.service.dto;
+
+import java.math.BigDecimal;
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+* @description /
+* @author lyd
+* @date 2023-05-11
+**/
+@Data
+public class MdBaseVehicleDto implements Serializable {
+
+    /** 载具编码 */
+    private String vehicle_code;
+
+    /** 载具名称 */
+    private String vehicle_name;
+
+    /** 载具类型 */
+    private String vehicle_type;
+
+    /** 一维码 */
+    private String one_code;
+
+    /** 二维码 */
+    private String two_code;
+
+    /** RFID编码 */
+    private String rfid_code;
+
+    /** 载具宽度 */
+    private BigDecimal vehicle_width;
+
+    /** 载具长度 */
+    private BigDecimal vehicle_long;
+
+    /** 载具高度 */
+    private BigDecimal vehicle_height;
+
+    /** 载具超仓位类型 */
+    private String overstruct_type;
+
+    /** 占仓位数 */
+    private BigDecimal occupystruct_qty;
+
+    /** 外部标识 */
+    private String ext_id;
+
+    /** 创建人 */
+    private String create_id;
+
+    /** 创建人 */
+    private String create_name;
+
+    /** 创建时间 */
+    private String create_time;
+
+    /** 修改人 */
+    private String update_id;
+
+    /** 修改人 */
+    private String update_name;
+
+    /** 修改时间 */
+    private String update_time;
+}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleQuery.java
new file mode 100644
index 0000000..7048638
--- /dev/null
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleQuery.java
@@ -0,0 +1,12 @@
+package org.nl.wms.database.vehicle.service.dto;
+
+import org.nl.common.domain.query.BaseQuery;
+import org.nl.wms.database.vehicle.service.dao.MdBaseVehicle;
+
+/**
+* @author lyd
+* @date 2023-05-11
+**/
+public class MdBaseVehicleQuery extends BaseQuery<MdBaseVehicle> {
+
+}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/impl/MdBaseVehicleServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/impl/MdBaseVehicleServiceImpl.java
new file mode 100644
index 0000000..faea58f
--- /dev/null
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/impl/MdBaseVehicleServiceImpl.java
@@ -0,0 +1,85 @@
+package org.nl.wms.database.vehicle.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.common.exception.BadRequestException;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.wms.database.vehicle.service.IMdBaseVehicleService;
+import org.nl.wms.database.vehicle.service.dao.mapper.MdBaseVehicleMapper;
+import org.nl.wms.database.vehicle.service.dao.MdBaseVehicle;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+import java.util.Set;
+
+/**
+* @description 服务实现
+* @author lyd
+* @date 2023-05-11
+**/
+@Slf4j
+@Service
+public class MdBaseVehicleServiceImpl extends ServiceImpl<MdBaseVehicleMapper, MdBaseVehicle> implements IMdBaseVehicleService {
+
+    @Autowired
+    private MdBaseVehicleMapper mdBaseVehicleMapper;
+
+    @Override
+    public IPage<MdBaseVehicle> queryAll(Map whereJson, PageQuery page){
+        String vehicle_type = ObjectUtil.isNotEmpty(whereJson.get("vehicle_type")) ? whereJson.get("vehicle_type").toString() : null;
+        String vehicle_code = ObjectUtil.isNotEmpty(whereJson.get("vehicle_code")) ? whereJson.get("vehicle_code").toString() : null;
+        LambdaQueryWrapper<MdBaseVehicle> lam = new LambdaQueryWrapper<>();
+        lam.eq(ObjectUtil.isNotEmpty(vehicle_type), MdBaseVehicle::getVehicle_type, vehicle_type)
+                .like(ObjectUtil.isNotEmpty(vehicle_code), MdBaseVehicle::getVehicle_code, vehicle_code);
+        IPage<MdBaseVehicle> pages = new Page<>(page.getPage() + 1, page.getSize());
+        mdBaseVehicleMapper.selectPage(pages, lam);
+        return pages;
+    }
+
+    @Override
+    public void create(MdBaseVehicle entity) {
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+
+        entity.setVehicle_code(IdUtil.getSnowflake(1, 1).nextIdStr());
+        entity.setCreate_id(currentUserId);
+        entity.setCreate_name(nickName);
+        entity.setCreate_time(now);
+        entity.setUpdate_id(currentUserId);
+        entity.setUpdate_name(nickName);
+        entity.setUpdate_time(now);
+        mdBaseVehicleMapper.insert(entity);
+    }
+
+    @Override
+    public void update(MdBaseVehicle entity) {
+        MdBaseVehicle dto = mdBaseVehicleMapper.selectById(entity.getVehicle_code());
+        if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
+
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getCurrentNickName();
+        String now = DateUtil.now();
+        entity.setUpdate_id(currentUserId);
+        entity.setUpdate_name(nickName);
+        entity.setUpdate_time(now);
+
+        mdBaseVehicleMapper.updateById(entity);
+    }
+
+    @Override
+    public void deleteAll(Set<String> ids) {
+        // 真删除
+        mdBaseVehicleMapper.deleteBatchIds(ids);
+    }
+
+}
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java
index 30ce61c..1c63c37 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java
@@ -63,4 +63,12 @@ public class MdBaseWorkshopController {
         mdBaseWorkshopService.deleteAll(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    @GetMapping("/getWorkShopList")
+    @Log("获取车间下拉框")
+    @ApiOperation("获取车间下拉框")
+    //@SaCheckPermission("@el.check('mdBaseWorkshop:list')")
+    public ResponseEntity<Object> getWorkShopList(){
+        return new ResponseEntity<>(mdBaseWorkshopService.getWorkShopList(),HttpStatus.OK);
+    }
 }
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/IMdBaseWorkshopService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/IMdBaseWorkshopService.java
index 8753459..be158c6 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/IMdBaseWorkshopService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/IMdBaseWorkshopService.java
@@ -5,6 +5,7 @@ import org.nl.common.domain.query.PageQuery;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.wms.database.workshop.service.dao.MdBaseWorkshop;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -40,4 +41,10 @@ public interface IMdBaseWorkshopService extends IService<MdBaseWorkshop> {
     * @param ids /
     */
     void deleteAll(Set<String> ids);
+
+    /**
+     * 获取车间下拉框
+     * @return
+     */
+    List<MdBaseWorkshop> getWorkShopList();
 }
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/MdBaseWorkshopServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/MdBaseWorkshopServiceImpl.java
index 4b3f758..aae4573 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/MdBaseWorkshopServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/MdBaseWorkshopServiceImpl.java
@@ -14,6 +14,7 @@ import org.nl.wms.database.workshop.service.dao.MdBaseWorkshop;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -71,4 +72,11 @@ public class MdBaseWorkshopServiceImpl extends ServiceImpl<MdBaseWorkshopMapper,
         mdBaseWorkshopMapper.deleteBatchIds(ids);
     }
 
+    @Override
+    public List<MdBaseWorkshop> getWorkShopList() {
+        return mdBaseWorkshopMapper.selectList(new LambdaQueryWrapper<MdBaseWorkshop>()
+                .eq(MdBaseWorkshop::getIs_used, true)
+                .eq(MdBaseWorkshop::getIs_delete, false));
+    }
+
 }
diff --git a/nladmin-ui/src/views/wms/basedata/classification/index.vue b/nladmin-ui/src/views/wms/basedata/classification/index.vue
new file mode 100644
index 0000000..6c7014f
--- /dev/null
+++ b/nladmin-ui/src/views/wms/basedata/classification/index.vue
@@ -0,0 +1,390 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="90px"
+          label-suffix=":"
+        >
+          <el-form-item label="分类名称">
+            <el-select
+              v-model="query.class_code"
+              placeholder="请选择分类名称"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              style="width: 185px;"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in classNames"
+                :key="item.class_code"
+                :label="item.class_name"
+                :value="item.class_code"
+              />
+            </el-select>
+          </el-form-item>
+          <rrOperation :crud="crud" />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          size="mini"
+          type="success"
+          icon="el-icon-s-operation"
+          @click="ToExpandall"
+        >
+          全部展开
+        </el-button>
+      </crudOperation>
+      <!--表单组件-->
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="500px"
+      >
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
+          <el-form-item label="分类编码" prop="class_code">
+            <el-input v-model="form.class_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="分类名称" prop="class_name">
+            <el-input v-model="form.class_name" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="简要描述" prop="class_desc">
+            <el-input v-model="form.class_desc" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="顶级类目">
+            <el-radio-group v-model="form.isTop" style="width: 140px">
+              <el-radio label="1">是</el-radio>
+              <el-radio label="0">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-if="form.isTop === '0'" style="margin-bottom: 0;" label="上级类目" prop="pid">
+            <treeselect
+              v-model="form.parent_class_id"
+              :load-options="loadClass"
+              :options="classes"
+              style="width: 370px;"
+              placeholder="选择上级类目"
+            />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        lazy
+        :load="getClassDatas"
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+        :data="crud.data"
+        row-key="class_id"
+        @select="crud.selectChange"
+        @select-all="crud.selectAllChange"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column prop="class_code" label="分类编码" />
+        <el-table-column prop="class_name" label="分类名称" />
+        <el-table-column prop="class_desc" label="分类简要描述" />
+        <el-table-column prop="update_name" label="修改人" />
+        <el-table-column prop="update_time" label="修改时间" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="is_modify" label="是否可修改">
+          <template slot-scope="scope">
+            {{scope.row.is_modify?'是':'否'}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-permission="['admin','Classstandard:edit','Classstandard:del']"
+          label="操作"
+          width="250px"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <udOperation
+              style="display: inline"
+              :data="scope.row"
+              :permission="permission"
+              :disabled-edit="scope.row.is_modify === '0'"
+              :disabled-dle="scope.row.is_modify === '0'"
+              msg="确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！"
+            />
+            <el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus-outline" @click="crud.toAddAndData(addSibling(scope.row))">新增同级</el-button>
+            <el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus" @click="crud.toAddAndData(addChildren(scope.row))">新增子级</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudClassstandard from './mdBaseClassstandard'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+
+let defaultForm = {
+  id: null,
+  class_id: null,
+  base_data_type: null,
+  path_code: null,
+  class_code: null,
+  class_name: null,
+  class_desc: null,
+  parent_class_id: null,
+  is_leaf: true,
+  sub_count: null,
+  is_modify: true,
+  is_delete: false,
+  class_level: null,
+  ext_id: null,
+  ext_parent_id: null,
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  update_id: null,
+  update_name: null,
+  update_time: null,
+  isTop: '1'
+}
+export default {
+  name: 'Classstandard',
+  dicts: ['base_data'],
+  components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '基础类别',
+      url: 'api/Classstandard',
+      idField: 'class_id',
+      sort: 'class_id,desc',
+      crudMethod: { ...crudClassstandard },
+      optShow: {
+        add: true,
+        reset: true
+      }
+    })
+  },
+  data() {
+    return {
+      classes: [],
+      classNames: [],
+      permission: {},
+      rules: {
+        class_id: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        path_code: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        class_code: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        class_name: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        is_leaf: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        is_modify: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        is_delete: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        create_id: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        create_name: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ],
+        create_time: [
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created() {
+    this.getClassNames() // 获取分类
+  },
+  methods: {
+    getClassNames() {
+      crudClassstandard.getClassName().then((res) => { // 获取分类名称，查询根据分类编码查找对应分支树
+        this.classNames = res
+      })
+    },
+    getClassDatas(tree, treeNode, resolve) {
+      const params = { pid: tree.class_id }
+      setTimeout(() => {
+        crudClassstandard.getClass(params).then(res => {
+          resolve(res)
+        })
+      }, 100)
+    },
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    // 新增与编辑前做的操作
+    [CRUD.HOOK.afterToCU](crud, form) {
+      if (form.parent_class_id !== '0' && form.parent_class_id !== null) {
+        form.isTop = '0'
+      } else if (form.id !== '0' && form.id !== null) {
+        form.isTop = '1'
+      }
+      // form.enabled = `${form.enabled}`
+      // 为了初始化数据 -> 树的数据
+      if (form.id != null || form.id !== '0') {
+        this.getSubTypes(form.id)
+      } else {
+        this.getClass()
+      }
+    },
+    // 提交前的验证
+    [CRUD.HOOK.afterValidateCU]() {
+      if (this.form.parent_class_id !== null && this.form.parent_class_id === this.form.class_id) {
+        this.$message({
+          message: '顶级类目不能为空',
+          type: 'warning'
+        })
+        return false
+      }
+      if (this.form.isTop === '1') {
+        this.form.parent_class_id = 0
+      }
+      return true
+    },
+    getSubTypes(id) { // 获取当前对象与所有父类数据
+      crudClassstandard.getClassSuperior(id).then(res => {
+        const date = res
+        this.buildClass(date)
+        this.classes = date
+      })
+    },
+    getClass() { // 点击新增的时候触发
+      crudClassstandard.getClass({ enabled: true }).then(res => {
+        this.classes = res.map(function(obj) { // 为了设置子级属性,才会显示展开图标
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
+    },
+    buildClass(classes) {
+      classes.forEach(data => {
+        if (data.children) {
+          this.buildClass(data.children)
+        }
+        if (data.hasChildren && !data.children) {
+          data.children = null
+        }
+      })
+    },
+    // 获取弹窗内数据
+    loadClass({ action, parentNode, callback }) { // 展开显示子级数据，只需要吧父类底下的子级返回去
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
+          parentNode.children = res.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 100)
+        })
+      }
+    },
+    clearFrom() {
+      defaultForm = {
+        id: null,
+        class_id: null,
+        base_data_type: null,
+        path_code: null,
+        class_code: null,
+        class_name: null,
+        class_desc: null,
+        parent_class_id: null,
+        is_leaf: true,
+        sub_count: null,
+        is_modify: true,
+        is_delete: false,
+        class_level: null,
+        ext_id: null,
+        ext_parent_id: null,
+        create_id: null,
+        create_name: null,
+        create_time: null,
+        update_id: null,
+        update_name: null,
+        update_time: null,
+        isTop: null
+      }
+    },
+    addSibling(row) {
+      this.clearFrom() // 将默认的表单数据清除
+      defaultForm.id = row.id // 获取分类树的id - 懒加载依赖此id，不可为空
+      defaultForm.class_id = row.class_id // 获取分类树的id
+      defaultForm.parent_class_id = row.parent_class_id ? row.parent_class_id : null // 同级为父类class_id
+      defaultForm.isTop = row.isTop
+      return defaultForm
+    },
+    addChildren(row) {
+      this.clearFrom()
+      defaultForm.id = row.class_id // 获取分类树的id
+      defaultForm.parent_class_id = row.class_id // 子级为本身的class_id
+      defaultForm.isTop = row.isTop
+      return defaultForm
+    },
+    // 全部展开 参考：https://www.cnblogs.com/toughy/p/12667805.html
+    ToExpandall() {
+      const els = document.getElementsByClassName('el-table__expand-icon')
+      if (this.crud.data.length !== 0 && els.length !== 0) {
+        for (let j1 = 0; j1 < els.length; j1++) {
+          els[j1].classList.add('dafult')
+        }
+        if (this.$el.getElementsByClassName('el-table__expand-icon--expanded')) {
+          const open = this.$el.getElementsByClassName('el-table__expand-icon--expanded')
+          for (let j = 0; j < open.length; j++) {
+            open[j].classList.remove('dafult')
+          }
+          const dafult = this.$el.getElementsByClassName('dafult')
+          for (let a = 0; a < dafult.length; a++) {
+            dafult[a].click()
+          }
+        }
+      }
+    },
+    hand(value) {
+      this.crud.toQuery()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/nladmin-ui/src/views/wms/basedata/classification/mdBaseClassstandard.js b/nladmin-ui/src/views/wms/basedata/classification/mdBaseClassstandard.js
new file mode 100644
index 0000000..0c216de
--- /dev/null
+++ b/nladmin-ui/src/views/wms/basedata/classification/mdBaseClassstandard.js
@@ -0,0 +1,82 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/Classstandard',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/Classstandard/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/Classstandard',
+    method: 'put',
+    data
+  })
+}
+
+export function getClass(params) {
+  return request({
+    url: 'api/Classstandard/loadClass',
+    method: 'get',
+    params
+  })
+}
+
+export function getClassSuperior(ids) {
+  const data = ids.length || ids.length === 0 ? ids : Array.of(ids)
+  return request({
+    url: 'api/Classstandard/superior',
+    method: 'post',
+    data
+  })
+}
+
+export function getClassType(params) {
+  return request({
+    url: 'api/Classstandard/getClass',
+    method: 'get',
+    params
+  })
+}
+export function queryClassById(params) {
+  return request({
+    url: 'api/Classstandard/queryClassById',
+    method: 'get',
+    params
+  })
+}
+// 传入分类标识和级别
+export function getType(params) {
+  return request({
+    url: 'api/Classstandard/getType',
+    method: 'get',
+    params
+  })
+}
+
+export function getClassTable(params) {
+  return request({
+    url: 'api/Classstandard/getClassTable',
+    method: 'get',
+    params
+  })
+}
+
+export function getClassName() {
+  return request({
+    url: 'api/Classstandard/getClassName',
+    method: 'get'
+  })
+}
+
+export default { add, edit, del, getClass, getClassSuperior, getClassType, getClassTable, getType, queryClassById, getClassName }
diff --git a/nladmin-ui/src/views/wms/basedata/material/index.vue b/nladmin-ui/src/views/wms/basedata/material/index.vue
index c726090..0f93777 100644
--- a/nladmin-ui/src/views/wms/basedata/material/index.vue
+++ b/nladmin-ui/src/views/wms/basedata/material/index.vue
@@ -2,6 +2,41 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="90px"
+          label-suffix=":"
+        >
+          <el-form-item label="所属车间">
+            <el-select
+              v-model="query.workshop_code"
+              clearable
+              size="mini"
+              placeholder="所属车间"
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in workShopList"
+                :label="item.workshop_name"
+                :value="item.workshop_code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="模糊搜索">
+            <el-input
+              v-model="query.blurry"
+              clearable
+              size="mini"
+              placeholder="编码名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
       <!--表单组件-->
@@ -37,27 +72,27 @@
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')"/>
-        <el-table-column prop="material_name" label="物料名称 " :min-width="flexWidth('material_name',crud.data,'物料名称 ')"/>
-        <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')"/>
-        <el-table-column prop="class_id" label="物料分类标识" :min-width="flexWidth('class_id',crud.data,'物料分类标识')"/>
-        <el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')"/>
-        <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')"/>
-        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')"/>
+        <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
+        <el-table-column prop="material_name" label="物料名称 " :min-width="flexWidth('material_name',crud.data,'物料名称 ')" />
+        <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
+        <el-table-column prop="class_id" label="物料分类标识" :min-width="flexWidth('class_id',crud.data,'物料分类标识')" />
+        <el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
+        <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
+        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
         <el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')">
           <template slot-scope="scope">
-            {{scope.row.is_used?'是':'否'}}
+            {{ scope.row.is_used?'是':'否' }}
           </template>
         </el-table-column>
         <el-table-column prop="is_delete" label="是否删除" :min-width="flexWidth('is_delete',crud.data,'是否删除')">
           <template slot-scope="scope">
-            {{scope.row.is_delete?'是':'否'}}
+            {{ scope.row.is_delete?'是':'否' }}
           </template>
         </el-table-column>
-        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')"/>
-        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')"/>
-        <el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')"/>
-        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')"/>
+        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
+        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
+        <el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
+        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
@@ -75,7 +110,9 @@
 
 <script>
 import crudMdBaseMaterial from './mdBaseMaterial'
-import CRUD, {crud, form, header, presenter} from '@crud/crud'
+import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
@@ -90,19 +127,12 @@ const defaultForm = {
   standing_time: null,
   workshop_code: null,
   remark: null,
-  is_used: null,
-  is_delete: null,
-  create_id: null,
-  create_name: null,
-  create_time: null,
-  update_id: null,
-  update_name: null,
-  update_time: null,
-  ext_id: null
+  is_used: true,
+  is_delete: false
 }
 export default {
   name: 'MdBaseMaterial',
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -115,15 +145,42 @@ export default {
   },
   data() {
     return {
+      classes1: [],
       permission: {
       },
       rules: {
-      }    }
+      },
+      workShopList: []
+    }
+  },
+  created() {
+    this.getWorkShopList()
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
+    },
+    getWorkShopList() { // 获取车间列表
+      crudMdBaseWorkShop.getWorkShopList().then(res => {
+        this.workShopList = res
+      })
+    },
+    // 获取子节点数据
+    loadChildNodes({ action, parentNode, callback }) {
+      // if (action === LOAD_CHILDREN_OPTIONS) {
+      //   crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
+      //     parentNode.children = res.content.map(function(obj) {
+      //       if (obj.hasChildren) {
+      //         obj.children = null
+      //       }
+      //       return obj
+      //     })
+      //     setTimeout(() => {
+      //       callback()
+      //     }, 100)
+      //   })
+      // }
     }
   }
 }
diff --git a/nladmin-ui/src/views/wms/basedata/vehicle/index.vue b/nladmin-ui/src/views/wms/basedata/vehicle/index.vue
new file mode 100644
index 0000000..3ca4369
--- /dev/null
+++ b/nladmin-ui/src/views/wms/basedata/vehicle/index.vue
@@ -0,0 +1,184 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="载具类型">
+            <el-select
+              v-model="query.vehicle_type"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              style="width: 180px;"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.vehicle_type"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="载具号">
+            <el-input
+              v-model="query.vehicle_code"
+              clearable
+              size="mini"
+              placeholder="载具号"
+              style="width: 180px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
+          <el-form-item label="载具编码">
+            <el-input v-model="form.vehicle_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="载具名称">
+            <el-input v-model="form.vehicle_name" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="载具类型">
+            <el-input v-model="form.vehicle_type" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="一维码">
+            <el-input v-model="form.one_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="二维码">
+            <el-input v-model="form.two_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="RFID编码">
+            <el-input v-model="form.rfid_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="载具宽度">
+            <el-input v-model="form.vehicle_width" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="载具长度">
+            <el-input v-model="form.vehicle_long" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="载具高度">
+            <el-input v-model="form.vehicle_height" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="载具超仓位类型">
+            <el-input v-model="form.overstruct_type" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="占仓位数">
+            <el-input v-model="form.occupystruct_qty" style="width: 370px;" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')"/>
+        <el-table-column prop="vehicle_name" label="载具名称" :min-width="flexWidth('vehicle_name',crud.data,'载具名称')"/>
+        <el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型')"/>
+        <el-table-column prop="one_code" label="一维码" :min-width="flexWidth('one_code',crud.data,'一维码')"/>
+        <el-table-column prop="two_code" label="二维码" :min-width="flexWidth('two_code',crud.data,'二维码')"/>
+        <el-table-column prop="rfid_code" label="RFID编码" :min-width="flexWidth('rfid_code',crud.data,'RFID编码')"/>
+        <el-table-column prop="vehicle_width" label="载具宽度" :min-width="flexWidth('vehicle_width',crud.data,'载具宽度')"/>
+        <el-table-column prop="vehicle_long" label="载具长度" :min-width="flexWidth('vehicle_long',crud.data,'载具长度')"/>
+        <el-table-column prop="vehicle_height" label="载具高度" :min-width="flexWidth('vehicle_height',crud.data,'载具高度')"/>
+        <el-table-column prop="overstruct_type" label="载具超仓位类型" :min-width="flexWidth('overstruct_type',crud.data,'载具超仓位类型')"/>
+        <el-table-column prop="occupystruct_qty" label="占仓位数" :min-width="flexWidth('occupystruct_qty',crud.data,'占仓位数')"/>
+        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')"/>
+        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')"/>
+        <el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')"/>
+        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')"/>
+        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudMdBaseVehicle from './mdBaseVehicle'
+import CRUD, {crud, form, header, presenter} from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+
+const defaultForm = {
+  vehicle_code: null,
+  vehicle_name: null,
+  vehicle_type: null,
+  one_code: null,
+  two_code: null,
+  rfid_code: null,
+  vehicle_width: null,
+  vehicle_long: null,
+  vehicle_height: null,
+  overstruct_type: null,
+  occupystruct_qty: null,
+  ext_id: null,
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  update_id: null,
+  update_name: null,
+  update_time: null
+}
+export default {
+  name: 'Vehicle',
+  dicts: ['vehicle_type'],
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '载具维护',
+      url: 'api/mdBaseVehicle',
+      idField: 'vehicle_code',
+      sort: 'vehicle_code,desc',
+      crudMethod: { ...crudMdBaseVehicle }
+    })
+  },
+  data() {
+    return {
+      permission: {
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/nladmin-ui/src/views/wms/basedata/vehicle/mdBaseVehicle.js b/nladmin-ui/src/views/wms/basedata/vehicle/mdBaseVehicle.js
new file mode 100644
index 0000000..a1383b2
--- /dev/null
+++ b/nladmin-ui/src/views/wms/basedata/vehicle/mdBaseVehicle.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/mdBaseVehicle',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/mdBaseVehicle/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/mdBaseVehicle',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }
diff --git a/nladmin-ui/src/views/wms/basedata/workshop/mdBaseWorkshop.js b/nladmin-ui/src/views/wms/basedata/workshop/mdBaseWorkshop.js
index 5aa4f74..9f55c89 100644
--- a/nladmin-ui/src/views/wms/basedata/workshop/mdBaseWorkshop.js
+++ b/nladmin-ui/src/views/wms/basedata/workshop/mdBaseWorkshop.js
@@ -24,4 +24,11 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del }
+export function getWorkShopList() {
+  return request({
+    url: 'api/mdBaseWorkshop/getWorkShopList',
+    method: 'get'
+  })
+}
+
+export default { add, edit, del, getWorkShopList }