diff --git a/src/api/base/qualityInspectionItem.js b/src/api/base/qualityInspectionItem.js
index b6287b2..94528c7 100644
--- a/src/api/base/qualityInspectionItem.js
+++ b/src/api/base/qualityInspectionItem.js
@@ -9,6 +9,15 @@ export function listQualityInspectionItem(query) {
   })
 }
 
+// 查询缺陷下拉框
+export function getDefectList(query) {
+  return request({
+    url: '/base/qualityInspectionItem/getDefectList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询质检项信息维护详细
 export function getQualityInspectionItem(objId) {
   return request({
diff --git a/src/views/base/productStation/index.vue b/src/views/base/productStation/index.vue
index 293e9f3..6d4098b 100644
--- a/src/views/base/productStation/index.vue
+++ b/src/views/base/productStation/index.vue
@@ -93,11 +93,11 @@
       <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
       <el-table-column label="工位编号" align="center" prop="productLineCode" v-if="columns[1].visible"/>
       <el-table-column label="工位名称" align="center" prop="productLineName" v-if="columns[2].visible"/>
-<!--      <el-table-column label="工位类别" align="center" prop="productLineType" v-if="columns[3].visible">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.line_type" :value="scope.row.productLineType"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column label="工位类型" align="center" prop="stationType" v-if="columns[3].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.station_type" :value="scope.row.stationType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="所属工厂" align="center" prop="plantName" v-if="columns[4].visible"/>
       <el-table-column label="所属产线" align="center" prop="parentName" v-if="columns[10].visible"/>
       <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[5].visible" >
@@ -154,16 +154,15 @@
         <el-form-item label="工位名称" prop="productLineName">
           <el-input v-model="form.productLineName" placeholder="请输入工位名称" />
         </el-form-item>
-<!--        <el-form-item label="工位类别" prop="productLineType">-->
-<!--          <el-select v-model="form.productLineType" placeholder="请选择工位类别">-->
-<!--            <el-option-->
-<!--              v-for="dict in dict.type.line_type"-->
-<!--              :key="dict.value"-->
-<!--              :label="dict.label"-->
-<!--              :value="parseInt(dict.value)"-->
-<!--            ></el-option>-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
+        <el-form-item label="工位类型" prop="stationType">
+          <el-radio-group v-model="form.stationType">
+            <el-radio
+              v-for="dict in dict.type.station_type"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="所属工厂">
           <el-select v-model="form.plantCode" placeholder="请选择所属工厂">
             <el-option
@@ -184,15 +183,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="启用标识" prop="isFlag">
-          <el-radio-group v-model="form.isFlag">
-            <el-radio
-              v-for="dict in dict.type.is_flag"
-              :key="dict.value"
-              :label="parseInt(dict.value)"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -215,7 +205,7 @@ import { findFactoryList } from '@/api/base/factory'
 
 export default {
   name: "ProductLine",
-  dicts: ['line_type', 'is_flag'],
+  dicts: ['station_type', 'is_flag'],
   data() {
     return {
       // 遮罩层
@@ -245,6 +235,7 @@ export default {
         productLineType: 2,
         plantCode: null,
         isFlag: null,
+        stationType: null,
         createdBy: null,
         createdTime: null,
         updatedBy: null,
@@ -262,10 +253,10 @@ export default {
             { key: 2, label: `工位名称`, visible: true },
             { key: 3, label: `工位类别`, visible: true },
             { key: 4, label: `所属工厂`, visible: true },
-            { key: 5, label: `启用标识`, visible: true },
-            { key: 6, label: `创建人`, visible: true },
+            { key: 5, label: `启用标识`, visible: false },
+            { key: 6, label: `创建人`, visible: false },
             { key: 7, label: `创建时间`, visible: true },
-            { key: 8, label: `更新人`, visible: true },
+            { key: 8, label: `更新人`, visible: false },
             { key: 9, label: `更新时间`, visible: true },
             { key: 10, label: `所属产线`, visible: true },
         ],
@@ -312,6 +303,7 @@ export default {
         productLineName: null,
         productLineType: 2,
         plantCode: null,
+        stationType: 1,
         isFlag: 0,
         createdBy: null,
         createdTime: null,
diff --git a/src/views/base/stationDefectRelation/index.vue b/src/views/base/stationDefectRelation/index.vue
new file mode 100644
index 0000000..424c2c9
--- /dev/null
+++ b/src/views/base/stationDefectRelation/index.vue
@@ -0,0 +1,370 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80">
+      <el-form-item label="质检工位" prop="stationCode">
+        <el-select v-model="queryParams.stationCode" placeholder="请选择质检工位">
+          <el-option
+            v-for="item in productLineList"
+            :key="item.productLineCode"
+            :label="item.productLineName"
+            :value="item.productLineCode"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <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-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="['base:stationDefectRelation: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="['base:stationDefectRelation: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="['base:stationDefectRelation: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="['base:stationDefectRelation:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="stationDefectRelationList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
+      <el-table-column label="产线编号" align="center" prop="productionLine" v-if="columns[5].visible"/>
+      <el-table-column label="质检工位编号" align="center" prop="stationCode" v-if="columns[1].visible"/>
+      <el-table-column label="质检工位名称" align="center" prop="stationName" v-if="columns[2].visible"/>
+      <el-table-column label="缺陷编号" align="center" prop="defectCode" v-if="columns[3].visible"/>
+      <el-table-column label="缺陷名称" align="center" prop="defectName" v-if="columns[4].visible"/>
+      <el-table-column label="物料大类" align="center" prop="materialCategories" v-if="columns[11].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.material_categories" :value="scope.row.materialCategories"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="物料小类" align="center" prop="materialSubclass" v-if="columns[12].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.material_subclass" :value="scope.row.materialSubclass"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[6].visible"/>
+      <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[7].visible"/>
+      <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[8].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updatedBy" v-if="columns[9].visible"/>
+      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180" v-if="columns[10].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+
+      <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="['base:stationDefectRelation:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['base:stationDefectRelation: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="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="质检工位" prop="stationCode">
+          <el-select v-model="form.stationCode" placeholder="请选择质检工位">
+            <el-option
+              v-for="item in productLineList"
+              :key="item.productLineCode"
+              :label="item.productLineName"
+              :value="item.productLineCode"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+<!--        <el-form-item label="质检工位名称" prop="stationName">-->
+<!--          <el-input v-model="form.stationName" placeholder="请输入质检工位名称" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="缺陷描述" prop="defectCode">
+          <el-select v-model="form.defectCode" placeholder="缺陷描述">
+            <el-option
+              v-for="item in defectList"
+              :key="item.qualityDefectCode"
+              :label="item.qualityDefectName"
+              :value="item.qualityDefectCode"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+<!--        <el-form-item label="缺陷名称" prop="defectName">-->
+<!--          <el-input v-model="form.defectName" placeholder="请输入缺陷名称" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="所属产线" prop="productionLine">-->
+<!--          <el-input v-model="form.productionLine" placeholder="请输入所属产线" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="启用标识" prop="isFlag">-->
+<!--          <el-input v-model="form.isFlag" placeholder="请输入启用标识" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="创建人" prop="createdBy">-->
+<!--          <el-input v-model="form.createdBy" placeholder="请输入创建人" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="创建时间" prop="createdTime">-->
+<!--          <el-date-picker clearable-->
+<!--            v-model="form.createdTime"-->
+<!--            type="date"-->
+<!--            value-format="yyyy-MM-dd"-->
+<!--            placeholder="请选择创建时间">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="更新人" prop="updatedBy">-->
+<!--          <el-input v-model="form.updatedBy" placeholder="请输入更新人" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="更新时间" prop="updatedTime">-->
+<!--          <el-date-picker clearable-->
+<!--            v-model="form.updatedTime"-->
+<!--            type="date"-->
+<!--            value-format="yyyy-MM-dd"-->
+<!--            placeholder="请选择更新时间">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listStationDefectRelation, getStationDefectRelation, delStationDefectRelation, addStationDefectRelation, updateStationDefectRelation } from "@/api/base/stationDefectRelation";
+import { findProductLineList } from '@//api/base/productLine'
+import { getDefectList } from '@//api/base/qualityInspectionItem'
+
+export default {
+  name: "StationDefectRelation",
+  dicts: ['material_categories','material_subclass'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 质检工位/缺陷维护表格数据
+      stationDefectRelationList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        stationCode: null,
+        stationName: null,
+        defectCode: null,
+        defectName: null,
+        productionLine: null,
+        isFlag: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      columns: [
+            { key: 0, label: `主键标识`, visible: false },
+            { key: 1, label: `质检工位编号`, visible: true },
+            { key: 2, label: `质检工位名称`, visible: true },
+            { key: 3, label: `缺陷编号`, visible: true },
+            { key: 4, label: `缺陷名称`, visible: true },
+            { key: 5, label: `所属产线`, visible: true },
+            { key: 6, label: `启用标识`, visible: false },
+            { key: 7, label: `创建人`, visible: false },
+            { key: 8, label: `创建时间`, visible: false },
+            { key: 9, label: `更新人`, visible: false },
+            { key: 10, label: `更新时间`, visible: false },
+            { key: 11, label: `物料大类`, visible: true },
+            { key: 12, label: `物料小类`, visible: true },
+        ],
+      productLineList: [],
+      defectList: []
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询质检工位/缺陷维护列表 */
+    getList() {
+      this.loading = true;
+      listStationDefectRelation(this.queryParams).then(response => {
+        this.stationDefectRelationList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+      findProductLineList({productLineType: 2, stationType: 2}).then(response => {
+        this.productLineList = response.data;
+      });
+      getDefectList(null).then(response => {
+        this.defectList = response.data;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        stationCode: null,
+        stationName: null,
+        defectCode: null,
+        defectName: null,
+        productionLine: null,
+        isFlag: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加质检工位/缺陷维护";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const objId = row.objId || this.ids
+      getStationDefectRelation(objId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改质检工位/缺陷维护";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateStationDefectRelation(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addStationDefectRelation(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const objIds = row.objId || this.ids;
+      this.$modal.confirm('是否确认删除质检工位/缺陷维护编号为"' + objIds + '"的数据项？').then(function() {
+        return delStationDefectRelation(objIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('base/stationDefectRelation/export', {
+        ...this.queryParams
+      }, `stationDefectRelation_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>