diff --git a/src/api/mes/md/workstation.js b/src/api/mes/md/workstation.js
new file mode 100644
index 0000000..78905b9
--- /dev/null
+++ b/src/api/mes/md/workstation.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询工作站列表
+export function listWorkstation(query) {
+  return request({
+    url: '/mes/md/workstation/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询工作站详细
+export function getWorkstation(workstationId) {
+  return request({
+    url: '/mes/md/workstation/' + workstationId,
+    method: 'get'
+  })
+}
+
+// 新增工作站
+export function addWorkstation(data) {
+  return request({
+    url: '/mes/md/workstation',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改工作站
+export function updateWorkstation(data) {
+  return request({
+    url: '/mes/md/workstation',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除工作站
+export function delWorkstation(workstationId) {
+  return request({
+    url: '/mes/md/workstation/' + workstationId,
+    method: 'delete'
+  })
+}
diff --git a/src/views/mes/md/workstation/index.vue b/src/views/mes/md/workstation/index.vue
new file mode 100644
index 0000000..7fd7133
--- /dev/null
+++ b/src/views/mes/md/workstation/index.vue
@@ -0,0 +1,446 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="工作站编码" prop="workstationCode">
+            <el-input
+              v-model="queryParams.workstationCode"
+              placeholder="请输入工作站编码"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="工作站名称" prop="workstationName">
+            <el-input
+              v-model="queryParams.workstationName"
+              placeholder="请输入工作站名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="所在车间名称" prop="workshopName">
+            <el-select v-model="queryParams.workshopId" placeholder="请选择车间">
+              <el-option
+                v-for="item in workshopOptions"
+                :key="item.workshopId"
+                :label="item.workshopName"
+                :value="item.workshopId"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="工序名称" prop="processName">
+            <el-input
+              v-model="queryParams.processName"
+              placeholder="请输入工序名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['mes:md:workstation:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['mes:md:workstation:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['mes:md:workstation:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['mes:md:workstation:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="workstationList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="工作站编码" align="center" prop="workstationCode" >
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            @click="handleView(scope.row)"
+            v-hasPermi="['mes:md:workstation:query']"
+          >{{scope.row.workstationCode}}</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="工作站名称" align="center" prop="workstationName" />
+      <el-table-column label="工作站地点" align="center" prop="workstationAddress" />
+      <el-table-column label="所在车间名称" align="center" prop="workshopName" />
+      <el-table-column label="所属工序" align="center" prop="processName" />
+      <el-table-column label="是否启用" align="center" prop="enableFlag">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['mes:md:workstation:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes:md:workstation:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改工作站对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="工作站编码" prop="workstationCode">
+              <el-input v-model="form.workstationCode" placeholder="请输入工作站编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item  label-width="80">
+              <el-switch v-model="autoGenFlag"
+                  active-color="#13ce66"
+                  active-text="自动生成"
+                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">               
+              </el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工作站名称" prop="workstationName">
+              <el-input v-model="form.workstationName" placeholder="请输入工作站名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="工作站地点" prop="workstationAddress">
+              <el-input v-model="form.workstationAddress" placeholder="请输入工作站地点" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所在车间" prop="workshopId">
+                <el-select v-model="form.workshopId" placeholder="请选择车间">
+                  <el-option
+                    v-for="item in workshopOptions"
+                    :key="item.workshopId"
+                    :label="item.workshopName"
+                    :value="item.workshopId"
+                  ></el-option>
+                </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="所属工序" prop="processId">
+              <el-input v-model="form.processId" placeholder="请选择工序" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否启用" prop="enableFlag">
+              <el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+              <el-radio-group v-model="form.enableFlag" v-else>
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
+        <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listWorkstation, getWorkstation, delWorkstation, addWorkstation, updateWorkstation } from "@/api/mes/md/workstation";
+import {genCode} from "@/api/system/autocode/rule"
+import { listAllWorkshop } from "@/api/mes/md/workshop";
+export default {
+  name: "Workstation",
+  dicts: ['sys_yes_no'],
+  data() {
+    return {
+      //自动生成编码
+      autoGenFlag:false,
+      optType: undefined,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 工作站表格数据
+      workstationList: [],
+      //车间选项
+      workshopOptions:[],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        workstationCode: null,
+        workstationName: null,
+        workstationAddress: null,
+        workshopId: null,
+        workshopCode: null,
+        workshopName: null,
+        processId: null,
+        processCode: null,
+        processName: null,
+        enableFlag: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        workstationCode: [
+          { required: true, message: "工作站编码不能为空", trigger: "blur" }
+        ],
+        workstationName: [
+          { required: true, message: "工作站名称不能为空", trigger: "blur" }
+        ],
+        enableFlag: [
+          { required: true, message: "是否启用不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getWorkshops();
+  },
+  methods: {
+    /** 查询工作站列表 */
+    getList() {
+      this.loading = true;
+      listWorkstation(this.queryParams).then(response => {
+        this.workstationList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    //查询车间信息
+    getWorkshops(){
+      listAllWorkshop().then( response => {
+        debugger;
+        this.workshopOptions =response.data;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        workstationId: null,
+        workstationCode: null,
+        workstationName: null,
+        workstationAddress: null,
+        workshopId: null,
+        workshopCode: null,
+        workshopName: null,
+        processId: null,
+        processCode: null,
+        processName: null,
+        enableFlag: 'Y',
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.autoGenFlag = false;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.workstationId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.getWorkshops();
+      this.open = true;
+      this.title = "添加工作站";
+      this.optType = "add";
+    },
+    // 查询明细按钮操作
+    handleView(row){
+      this.reset();
+      this.getWorkshops();
+      const workstationId = row.workstationId || this.ids;
+      getWorkstation(workstationId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "查看车间信息";
+        this.optType = "view";
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getWorkshops();
+      const workstationId = row.workstationId || this.ids
+      getWorkstation(workstationId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改工作站";
+        this.optType = "edit";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.workstationId != null) {
+            updateWorkstation(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addWorkstation(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const workstationIds = row.workstationId || this.ids;
+      this.$modal.confirm('是否确认删除工作站？').then(function() {
+        return delWorkstation(workstationIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('mes/md/workstation/export', {
+        ...this.queryParams
+      }, `workstation_${new Date().getTime()}.xlsx`)
+    },
+    //自动生成编码
+    handleAutoGenChange(autoGenFlag){
+      if(autoGenFlag){
+        genCode('WORKSTATION_CODE').then(response =>{
+          this.form.workstationCode = response;
+        });
+      }else{
+        this.form.workstationCode = null;
+      }
+    }
+  }
+};
+</script>
diff --git a/src/views/system/autocode/part.vue b/src/views/system/autocode/part.vue
index 2ade0a2..d402b41 100644
--- a/src/views/system/autocode/part.vue
+++ b/src/views/system/autocode/part.vue
@@ -309,7 +309,7 @@ export default {
     },
     /** 返回按钮操作 */
     handleClose() {
-      const obj = { path: "/system/autocode/rule" };
+      const obj = { path: "/system/autocodeRule" };
       this.$tab.closeOpenPage(obj);
     },
     /** 重置按钮操作 */