From 50c0a7a016eb04779596b0950afa2414e87f7590 Mon Sep 17 00:00:00 2001
From: "DESKTOP-H2PAFLR\\Administrator" <xuqianhao@88.com>
Date: Fri, 8 Sep 2023 13:10:26 +0800
Subject: [PATCH] 9/8

---
 .../Controllers/mes/md/MdDeviceController.cs  |   8 +-
 .../mes/md/MdWorklineController.cs            |   4 +
 .../mes/md/MdWorksortController.cs            |  73 -----
 .../mes/md/MdWorkstationController.cs         |  14 +-
 ZR.Model/mes/md/MdDevice.cs                   |   3 +
 ZR.Model/mes/md/MdWorkstation.cs              |   6 +-
 .../mes/md/IService/IMdDeviceService.cs       |   2 +
 .../mes/md/IService/IMdWorkstationService.cs  |   3 +
 ZR.Service/mes/md/MdDeviceService.cs          |   8 +-
 ZR.Service/mes/md/MdWorkstationService.cs     |  10 +-
 ZR.Vue/src/api/basisManagement/device.js      |   9 +
 ZR.Vue/src/api/basisManagement/workstation.js |  10 +-
 .../views/basisManagement/devicestation.vue   |  36 ++-
 .../src/views/basisManagement/procedure.vue   | 267 -----------------
 ZR.Vue/src/views/basisManagement/process.vue  | 278 ------------------
 .../workUnitComponent/workLine.vue            |   2 -
 .../workUnitComponent/workstation.vue         |  36 ++-
 17 files changed, 129 insertions(+), 640 deletions(-)
 delete mode 100644 ZR.Admin.WebApi/Controllers/mes/md/MdWorksortController.cs
 delete mode 100644 ZR.Vue/src/views/basisManagement/procedure.vue
 delete mode 100644 ZR.Vue/src/views/basisManagement/process.vue

diff --git a/ZR.Admin.WebApi/Controllers/mes/md/MdDeviceController.cs b/ZR.Admin.WebApi/Controllers/mes/md/MdDeviceController.cs
index 3c5acdde..e864dcab 100644
--- a/ZR.Admin.WebApi/Controllers/mes/md/MdDeviceController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/md/MdDeviceController.cs
@@ -68,7 +68,13 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
         
         }
 
-
+      
+        [HttpGet("getworkstationList")]
+        public IActionResult GetworkstationList()
+        {
+           List<MdWorkstation>  workstations= deviceService.getworkstationList();
+            return SUCCESS(workstations);   
+        }
 
 
 
diff --git a/ZR.Admin.WebApi/Controllers/mes/md/MdWorklineController.cs b/ZR.Admin.WebApi/Controllers/mes/md/MdWorklineController.cs
index e9c8b41f..bc017785 100644
--- a/ZR.Admin.WebApi/Controllers/mes/md/MdWorklineController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/md/MdWorklineController.cs
@@ -77,5 +77,9 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
             List<MdWorkshop> MdWorkshopList= worklineService.GetMdWorkshops(worklineId);
             return SUCCESS(MdWorkshopList);
         }
+
+
+
+
     }
 }
diff --git a/ZR.Admin.WebApi/Controllers/mes/md/MdWorksortController.cs b/ZR.Admin.WebApi/Controllers/mes/md/MdWorksortController.cs
deleted file mode 100644
index d3817822..00000000
--- a/ZR.Admin.WebApi/Controllers/mes/md/MdWorksortController.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using ZR.Model.mes.md;
-using ZR.Service.mes.md.IService;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System.Diagnostics.CodeAnalysis;
-using ZR.Admin.WebApi.Extensions;
-using ZR.Model.mes.md;
-using ZR.Service.mes.md;
-using ZR.Service.mes.md.IService;
-
-namespace ZR.Admin.WebApi.Controllers.mes.md
-{
-    [Route("mes/md/Worksort")]
-    public class MdWorksortController : BaseController
-    {
-        IMdWorksortService worksortService;
-
-        public MdWorksortController(IMdWorksortService worksortService)
-        {
-            this.worksortService = worksortService;
-        }
-
-        [HttpGet("list")]
-        public IActionResult List(int pageNum, int pageSize, string WorksortCode = "", string WorksortName = "")
-        {
-
-            (int, List<MdWorksort>) data = worksortService.GetAll(WorksortCode, WorksortName, pageNum, pageSize);
-
-            return ToResponse(new ApiResult(200, "success", data));
-
-        }
-        /// <summary>
-        /// 插入车间
-        /// </summary>
-        /// <param name="worksort"></param>
-        /// <returns></returns>
-        [HttpPost("addWorksort")]
-        public IActionResult AddWorksort([FromBody] MdWorksort worksort)
-        {
-            if (worksort != null)
-                worksort.ToCreate(HttpContext);
-            int result = worksortService.AddWorksort(worksort);
-            return SUCCESS(result);
-        }
-
-
-        [HttpPost("updateWorksort")]
-        public IActionResult UpdateWorksort([FromBody] MdWorksort worksort)
-        {
-            if (worksort != null)
-                worksort.ToUpdate(HttpContext);
-            int result = worksortService.UpdateWorksort(worksort);
-            return SUCCESS(result);
-        }
-
-
-        [HttpPost("delWorksort")]
-        public IActionResult deleteWorksort([FromBody] List<int> ids)
-        {
-            if (ids != null)
-            {
-                int result = worksortService.deleteWorksort(ids.ToArray());
-                return ToResponse(result);
-            }
-            return null;
-        }
-
-
-
-
-    }
-}
diff --git a/ZR.Admin.WebApi/Controllers/mes/md/MdWorkstationController.cs b/ZR.Admin.WebApi/Controllers/mes/md/MdWorkstationController.cs
index 7cae37dd..96799e71 100644
--- a/ZR.Admin.WebApi/Controllers/mes/md/MdWorkstationController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/md/MdWorkstationController.cs
@@ -5,10 +5,11 @@ using ZR.Admin.WebApi.Extensions;
 using ZR.Model.mes.md;
 using ZR.Service.mes.md;
 using ZR.Service.mes.md.IService;
+using ZR.Service.MES.md;
+
 namespace ZR.Admin.WebApi.Controllers.mes.md
 {
 
-
     [Route("mes/md/workstation")]
     public class MdWorkstationController : BaseController
     {
@@ -60,9 +61,14 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
             }
             return null;
         }
+      
+
+        [HttpGet("getworkLineList")]
+        public IActionResult GetworkLineList()
+        {
+            List<MdWorkline> MdWorkshopList = workstationService.GetworkLineList();
+            return SUCCESS(MdWorkshopList);
+        }
 
     }
-
-
-
 }
diff --git a/ZR.Model/mes/md/MdDevice.cs b/ZR.Model/mes/md/MdDevice.cs
index 6f3476d3..c27dcf71 100644
--- a/ZR.Model/mes/md/MdDevice.cs
+++ b/ZR.Model/mes/md/MdDevice.cs
@@ -30,6 +30,9 @@ namespace ZR.Model.mes.md
         ///</summary>
          [SugarColumn(ColumnName="fk_workstation_id"    )]
          public int? FkWorkstationId { get; set; }
+
+        [Navigate(NavigateType.OneToOne, nameof(FkWorkstationId))]
+        public  MdWorkstation  Workstation { get; set; }
         /// <summary>
         /// 租户号 
         ///</summary>
diff --git a/ZR.Model/mes/md/MdWorkstation.cs b/ZR.Model/mes/md/MdWorkstation.cs
index 30d61ec5..2385a46d 100644
--- a/ZR.Model/mes/md/MdWorkstation.cs
+++ b/ZR.Model/mes/md/MdWorkstation.cs
@@ -29,10 +29,10 @@ namespace ZR.Model.mes.md
         /// fk_工序id 
         ///</summary>
          [SugarColumn(ColumnName= "fk_workline_id")]
-         public int? FkWorksortId { get; set; }
+         public int? FkWorklineId { get; set; }
 
-        [Navigate(NavigateType.OneToOne, nameof(FkWorksortId))]
-         public MdWorksort worksort { get; set; }
+        [Navigate(NavigateType.OneToOne, nameof(FkWorklineId))]
+         public MdWorkline Workline { get; set; }
 
 
         /// <summary>
diff --git a/ZR.Service/mes/md/IService/IMdDeviceService.cs b/ZR.Service/mes/md/IService/IMdDeviceService.cs
index 1aa140f4..b3efc88a 100644
--- a/ZR.Service/mes/md/IService/IMdDeviceService.cs
+++ b/ZR.Service/mes/md/IService/IMdDeviceService.cs
@@ -15,5 +15,7 @@ namespace ZR.Service.mes.md.IService
         public int UpdateDevice(MdDevice workshop);
 
         public int deleteDevice(int[] ids);
+
+        public List<MdWorkstation> getworkstationList();
     }
 }
diff --git a/ZR.Service/mes/md/IService/IMdWorkstationService.cs b/ZR.Service/mes/md/IService/IMdWorkstationService.cs
index 60e81029..25b9125d 100644
--- a/ZR.Service/mes/md/IService/IMdWorkstationService.cs
+++ b/ZR.Service/mes/md/IService/IMdWorkstationService.cs
@@ -15,5 +15,8 @@ namespace ZR.Service.mes.md.IService
         public int UpdateWorkshop(MdWorkstation workshop);
 
         public int deleteWorkshop(int[] ids);
+
+
+        public List<MdWorkline> GetworkLineList();
     }
 }
diff --git a/ZR.Service/mes/md/MdDeviceService.cs b/ZR.Service/mes/md/MdDeviceService.cs
index f9a5fa14..c3b3b782 100644
--- a/ZR.Service/mes/md/MdDeviceService.cs
+++ b/ZR.Service/mes/md/MdDeviceService.cs
@@ -35,7 +35,7 @@ namespace ZR.Service.mes.md
                 .AndIF(!string.IsNullOrEmpty(deviceCode), it => it.DeviceCode.Contains(deviceCode))
                 .AndIF(!string.IsNullOrEmpty(deviceName), it => it.DeviceName.Contains(deviceName))
                 .ToExpression();
-            List<MdDevice> data = Context.Queryable<MdDevice>().Where(predicate).ToPageList(pageNum, pageSize, ref totalNum);
+            List<MdDevice> data = Context.Queryable<MdDevice>().Includes(x => x.Workstation).Where(predicate).ToPageList(pageNum, pageSize, ref totalNum);
             return (totalNum, data);
         }
 
@@ -44,6 +44,10 @@ namespace ZR.Service.mes.md
             return Update(workshop, true);
         }
 
-        
+
+        public List<MdWorkstation> getworkstationList()
+        {
+          return Context.Queryable<MdWorkstation>().ToList();   
+        }
     }
 }
diff --git a/ZR.Service/mes/md/MdWorkstationService.cs b/ZR.Service/mes/md/MdWorkstationService.cs
index da5a880a..546a9fae 100644
--- a/ZR.Service/mes/md/MdWorkstationService.cs
+++ b/ZR.Service/mes/md/MdWorkstationService.cs
@@ -33,15 +33,19 @@ namespace ZR.Service.mes.md
                 .AndIF(!string.IsNullOrEmpty(StationCode), it => it.StationCode.Contains(StationCode))
                 .AndIF(!string.IsNullOrEmpty(StationName), it => it.StationName.Contains(StationName))
                 .ToExpression();
-            List<MdWorkstation> data = Context.Queryable<MdWorkstation>().Where(predicate).ToPageList(pageNum, pageSize, ref totalNum);
+            List<MdWorkstation> data = Context.Queryable<MdWorkstation>().Includes(x => x.Workline).Where(predicate).ToPageList(pageNum, pageSize, ref totalNum);
             return (totalNum, data);
         }
 
+
+
         public int UpdateWorkshop(MdWorkstation workshop)
         {
             return Update(workshop, true);
         }
-
-
+        public List<MdWorkline> GetworkLineList()
+        {
+            return Context.Queryable<MdWorkline>().ToList();
+        }
     }
 }
diff --git a/ZR.Vue/src/api/basisManagement/device.js b/ZR.Vue/src/api/basisManagement/device.js
index 6c5bd8a0..9ef1552b 100644
--- a/ZR.Vue/src/api/basisManagement/device.js
+++ b/ZR.Vue/src/api/basisManagement/device.js
@@ -37,3 +37,12 @@ export function delDevice(data) {
     contextType:"application/json"
   })
 }
+
+
+export function getworkstationList(query) {
+  return request({
+    url: '/mes/md/device/getworkstationList',
+    method: 'get',
+    params: query,
+  })
+}
diff --git a/ZR.Vue/src/api/basisManagement/workstation.js b/ZR.Vue/src/api/basisManagement/workstation.js
index a4b1c654..ae979ce4 100644
--- a/ZR.Vue/src/api/basisManagement/workstation.js
+++ b/ZR.Vue/src/api/basisManagement/workstation.js
@@ -38,4 +38,12 @@ export function getWorkstationList(query) {
       contextType:"application/json"
     })
   }
-  
\ No newline at end of file
+  
+  
+  export function getworkLineList(query) {
+    return request({
+      url: '/mes/md/workstation/getworkLineList',
+      method: 'get',
+      params: query,
+    })
+  }
\ No newline at end of file
diff --git a/ZR.Vue/src/views/basisManagement/devicestation.vue b/ZR.Vue/src/views/basisManagement/devicestation.vue
index 5309db8f..966cba16 100644
--- a/ZR.Vue/src/views/basisManagement/devicestation.vue
+++ b/ZR.Vue/src/views/basisManagement/devicestation.vue
@@ -40,6 +40,8 @@
       <vxe-table
         border
         ref="xTable1"
+        align="center"
+        :print-config="{}"
         :data="table.workshopList"
         :loading="table.loading"
         @checkbox-change="selectChangeEvent"
@@ -48,6 +50,10 @@
         <vxe-column type="checkbox" width="60"></vxe-column>
         <vxe-column field="deviceCode" title="设备编码" sortable></vxe-column>
         <vxe-column field="deviceName" title="设备名称" sortable></vxe-column>
+        <vxe-colgroup title="所属工位">
+          <vxe-column field="workstation.stationCode" title="工位id"></vxe-column>
+          <vxe-column field="workstation.stationName" title="工位名称"></vxe-column>
+        </vxe-colgroup>
 
         <vxe-column title="操作" show-overflow>
           <template slot-scope="scope">
@@ -76,6 +82,18 @@
         <el-form-item label="设备名称 " prop="deviceName">
           <el-input v-model="DMLdialog.form.deviceName" placeholder="输入设备名称"></el-input>
         </el-form-item>
+
+        <el-form-item label="工位">
+          <el-select v-model="DMLdialog.form.fkWorkstationId" placeholder="请选择工位">
+            <el-option
+              v-for="item in DMLdialog.workstationOption"
+              :key="item.id"
+              :label="item.id + '_' + item.stationCode + '_' + item.stationName"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -86,9 +104,9 @@
 </template>
 
 <script>
-import { getDeviceList, insertDevice, updateDevice, delDevice } from '@/api/basisManagement/device.js'
+import { getDeviceList, insertDevice, updateDevice, delDevice, getworkstationList } from '@/api/basisManagement/device.js'
 export default {
-  name: 'workshop',
+  name: 'devicestation',
   data() {
     return {
       //搜索框配置
@@ -115,7 +133,9 @@ export default {
         form: {
           deviceCode: '',
           deviceName: '',
+          fkWorkstationId:"",
         },
+        workstationOption: [],
         rules: {
           deviceCode: [{ required: true, message: '设备编码不能为空', trigger: 'blur' }],
           deviceName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
@@ -130,6 +150,7 @@ export default {
   },
   created() {
     this.getList()
+    this.getworkstationOption()
   },
   methods: {
     //获取表格数据
@@ -144,6 +165,13 @@ export default {
         }
       })
     },
+    getworkstationOption() {
+      getworkstationList().then((res) => {
+        if ((res.code = 200)) {
+          this.DMLdialog.workstationOption = res.data
+        }
+      })
+    },
 
     //行更新
     handleUpdate(row) {},
@@ -202,7 +230,7 @@ export default {
         deviceCode: '',
         deviceName: '',
       }
-      this.DMLdialog.form.reset()
+      this.DMLdialog.form.resetFields()
     },
     //修改事件
     updataItem(flag, row) {
@@ -262,7 +290,7 @@ export default {
   ::v-deep .el-icon-delete {
     color: #f56c6c;
   }
-  
+
   ::v-deep span {
     color: #f56c6c;
   }
diff --git a/ZR.Vue/src/views/basisManagement/procedure.vue b/ZR.Vue/src/views/basisManagement/procedure.vue
deleted file mode 100644
index 969cc668..00000000
--- a/ZR.Vue/src/views/basisManagement/procedure.vue
+++ /dev/null
@@ -1,267 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 搜索部分 -->
-    <div>
-      <el-form :model="search" inline v-show="search.showSearch">
-        <el-form-item label="工序编码 ">
-          <el-input v-model="search.worksortCode" placeholder="输入工序编码"></el-input>
-        </el-form-item>
-        <el-form-item label="工序名称 ">
-          <el-input v-model="search.WorksortName" placeholder="输入工序名称"></el-input>
-        </el-form-item>
-        <el-button icon="el-icon-search" circle @click="getList"></el-button>
-      </el-form>
-    </div>
-    <!-- 按钮排 -->
-    <div>
-      <el-row :gutter="2">
-        <el-col :span="1.5">
-          <el-button type="primary" size="small" @click="addItem">增加</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="warning" size="small" @click="updataItem(true)" :disabled="updateDisable">修改</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="danger" size="small" @click="deleteItem(true)" :disabled="delDisable">删除</el-button>
-        </el-col>
-        <right-toolbar :showSearch.sync="search.showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-      <el-row>
-        <pagination
-          :v-show="true"
-          :total="pagination.total"
-          :page.sync="pagination.pageNum"
-          :limit.sync="pagination.pageSize"
-          @pagination="getList"
-        />
-      </el-row>
-    </div>
-    <div>
-      <vxe-table
-        border
-        ref="xTable1"
-        :data="table.WorksortList"
-        :loading="table.loading"
-        @checkbox-change="selectChangeEvent"
-        :row-config="{ isHover: true }"
-      >
-        <vxe-column type="checkbox" width="60"></vxe-column>
-        <vxe-column field="worksortCode" title="工序编码" sortable></vxe-column>
-        <vxe-column field="worksortName" title="工序名称" sortable></vxe-column>
-        <vxe-column title="查看工位">
-          <template slot-scope="scope">
-            <el-button type="primary" round @click="updataItem(false, scope.row)">选择工位</el-button>
-          </template>
-        </vxe-column>
-        <vxe-column title="操作" show-overflow>
-          <template slot-scope="scope">
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="updataItem(false, scope.row)">修改</el-button>
-            <el-button size="mini" type="text" icon="el-icon-delete" @click="deleteItem(false, scope.row)" class="delred">删除</el-button>
-          </template>
-        </vxe-column>
-      </vxe-table>
-    </div>
-
-    <!-- 弹窗-- 修改和删除 -->
-    <el-dialog :title="DMLdialog.title" :visible.sync="DMLdialog.visiable" width="600px" append-to-body>
-      <el-form ref="DMLdialog" :model="DMLdialog.form" label-width="150px" label-position="left" :rules="DMLdialog.rules">
-        <el-form-item label="工序编码 " prop="worksortCode">
-          <el-input v-model="DMLdialog.form.worksortCode" placeholder="输入工序编码"></el-input>
-        </el-form-item>
-        <el-form-item label="工序名称 " prop="WorksortName">
-          <el-input v-model="DMLdialog.form.worksortName" placeholder="输入工序名称"></el-input>
-        </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 { getWorksortList, insertWorksort, updateWorksort, delWorksort } from '@/api/basisManagement/worksort.js'
-export default {
-  name: 'procedure', //工序名称
-  data() {
-    return {
-      //搜索框配置
-      search: {
-        id: '',
-        worksortCode: '',
-        WorksortName: '',
-        showSearch: true,
-      },
-      //表格
-      table: {
-        loading: true,
-        WorksortList: [],
-      },
-      //分页
-      pagination: {
-        total: 0,
-        pageNum: 1,
-        pageSize: 10,
-      },
-      //新增修改数据项配置
-      DMLdialog: {
-        title: '',
-        visiable: false,
-        form: {
-          id: '',
-          worksortCode: '',
-          worksortName: '',
-        },
-        rules: {
-          worksortCode: [{ required: true, message: '工序编码不能为空', trigger: 'blur' }],
-          WorksortName: [{ required: true, message: '工序名称不能为空', trigger: 'blur' }],
-        },
-      },
-      //修改按钮
-      updateDisable: true,
-      //删除按钮
-      delDisable: true,
-      flag: 'update', //区分修改和删除
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    //获取表格数据
-    getList() {
-      const query = { ...this.search, ...this.pagination }
-      delete query.showSearch
-      getWorksortList(query).then((res) => {
-        if (res.code == 200) {
-          this.table.loading = false
-          this.pagination.total = res.data.item1
-          this.table.WorksortList = res.data.item2
-        }
-      })
-    },
-
-    //行更新
-    handleUpdate(row) {},
-    //行删除
-    handleDelete(row) {},
-    selectChangeEvent({ checked }) {
-      const records = this.$refs.xTable1.getCheckboxRecords()
-      if (records.length == 1) {
-        this.updateDisable = false
-      } else {
-        this.updateDisable = true
-      }
-      if (records.length > 0) {
-        this.delDisable = false
-      } else {
-        this.delDisable = true
-      }
-    },
-    //新增按钮
-    addItem() {
-      this.DMLdialog.title = '新增'
-      this.DMLdialog.visiable = true
-      this.flag = 'add'
-    },
-    //新增确认
-    submitForm() {
-      if (this.flag == 'update') {
-        updateWorksort(this.DMLdialog.form).then((res) => {
-          if (res.code == 200 && res.data == 1) {
-            this.$notify.success('修改成功')
-            this.getList()
-            this.DMLdialog.visiable = false
-            this.reset()
-          }
-        })
-      } else if (this.flag == 'add') {
-        this.$refs['DMLdialog'].validate((valid) => {
-          if (valid) {
-            insertWorksort(this.DMLdialog.form).then((res) => {
-              if (res.code == 200) {
-                this.getList()
-                this.DMLdialog.visiable = false
-                this.reset()
-              }
-            })
-          }
-        })
-      }
-    },
-    cancel() {
-      this.DMLdialog.visiable = false
-      this.reset()
-    },
-    reset() {
-      this.DMLdialog.form = {
-        worksortCode: '',
-        worksortName: '',
-      }
-      this.DMLdialog.form.reset();
-    },
-    //修改事件
-    updataItem(flag, row) {
-      debugger
-      this.DMLdialog.title = '修改'
-      this.DMLdialog.visiable = true
-      this.flag = 'update'
-      if (!flag) {
-        this.DMLdialog.form.worksortCode = row.worksortCode
-        this.DMLdialog.form.worksortName = row.worksortName
-        this.DMLdialog.form.id = row.id
-      } else {
-        const records = this.$refs.xTable1.getCheckboxRecords()
-        if (records.length == 1) {         
-          this.DMLdialog.form.worksortCode = records[0].worksortCode
-          this.DMLdialog.form.worksortName = records[0].worksortName
-          this.DMLdialog.form.id = records[0].id
-        }
-      }
-    },
-    //删除事件
-    deleteItem(flag, row) {
-      if (!flag) {
-        this.$modal
-          .confirm('是否确认删除车间名称为"' + row.WorksortName + '"的数据项？')
-          .then(function () {
-            const array = []
-            array.push(row.id)
-            return delWorksort(array)
-          })
-          .then(() => {
-            this.getList()
-            this.$modal.msgSuccess('删除成功')
-          })
-          .catch(() => {})
-      } else {
-        const records = this.$refs.xTable1.getCheckboxRecords()
-        if (records.length > 0) {
-          this.$modal
-            .confirm('是否确认删除车间名称为"' + records.map((it) => it.WorksortName) + '"的数据项？')
-            .then(function () {
-              return delWorksort(records.map((it) => it.id))
-            })
-            .then(() => {
-              this.getList()
-              this.$modal.msgSuccess('删除成功')
-            })
-            .catch(() => {})
-        }
-      }
-    },
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-.delred {
-  ::v-deep .el-icon-delete {
-    color: #f56c6c;
-  }
-  ::v-deep span {
-    color: #f56c6c;
-  }
-}
-</style>
diff --git a/ZR.Vue/src/views/basisManagement/process.vue b/ZR.Vue/src/views/basisManagement/process.vue
deleted file mode 100644
index 93b41360..00000000
--- a/ZR.Vue/src/views/basisManagement/process.vue
+++ /dev/null
@@ -1,278 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 搜索部分 -->
-    <div>
-      <el-form :model="search" inline v-show="search.showSearch">
-        <el-form-item label="线体编码 ">
-          <el-input v-model="search.prorouteCode" placeholder="输入线体编码"></el-input>
-        </el-form-item>
-        <el-form-item label="线体名称 ">
-          <el-input v-model="search.prorouteName" placeholder="输入线体名称"></el-input>
-        </el-form-item>
-        <el-button icon="el-icon-search" circle @click="getList"></el-button>
-      </el-form>
-    </div>
-    <!-- 按钮排 -->
-    <div>
-      <el-row :gutter="2">
-        <el-col :span="1.5">
-          <el-button type="primary" size="small" @click="addItem">增加</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="warning" size="small" @click="updataItem(true)" :disabled="updateDisable">修改</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="danger" size="small" @click="deleteItem(true)" :disabled="delDisable">删除</el-button>
-        </el-col>
-        <right-toolbar :showSearch.sync="search.showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-      <el-row>
-        <pagination
-          :v-show="true"
-          :total="pagination.total"
-          :page.sync="pagination.pageNum"
-          :limit.sync="pagination.pageSize"
-          @pagination="getList"
-        />
-      </el-row>
-    </div>
-    <div>
-      <vxe-table
-        border
-        ref="xTable1"
-        :data="table.WorksortList"
-        :loading="table.loading"
-        @checkbox-change="selectChangeEvent"
-        :row-config="{ isHover: true }"
-      >
-        <vxe-column type="checkbox" width="60"></vxe-column>
-        <vxe-column field="prorouteCode" title="线体编码" sortable></vxe-column>
-        <vxe-column field="prorouteName" title="线体名称" sortable></vxe-column>
-        <vxe-column title="查看工位">
-          <template slot-scope="scope">
-            <el-button type="primary" round @click="updataItem(false, scope.row)">调整工序</el-button>
-          </template>
-        </vxe-column>
-        <vxe-column title="操作" show-overflow>
-          <template slot-scope="scope">
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="updataItem(false, scope.row)">修改</el-button>
-            <el-button size="mini" type="text" icon="el-icon-delete" @click="deleteItem(false, scope.row)" class="delred">删除</el-button>
-          </template>
-        </vxe-column>
-      </vxe-table>
-    </div>
-
-    <!-- 弹窗-- 修改和删除 -->
-    <el-dialog :title="DMLdialog.title" :visible.sync="DMLdialog.visiable" width="600px" append-to-body>
-      <el-form ref="DMLdialog" :model="DMLdialog.form" label-width="150px" label-position="left" :rules="DMLdialog.rules">
-        <el-form-item label="线体编码 " prop="prorouteCode">
-          <el-input v-model="DMLdialog.form.prorouteCode" placeholder="输入线体编码"></el-input>
-        </el-form-item>
-        <el-form-item label="线体名称 " prop="prorouteName">
-          <el-input v-model="DMLdialog.form.prorouteName" placeholder="输入线体名称"></el-input>
-        </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 { getProcessList, insertProcess, updateProcess, delProcess } from '@/api/basisManagement/process.js'
-export default {
-  name: 'process', //工艺流程
-  data() {
-    return {
-      //搜索框配置
-      search: {
-        id: '',
-        prorouteCode: '',
-        prorouteName: '',
-        showSearch: true,
-      },
-      //表格
-      table: {
-        loading: true,
-        WorksortList: [],
-      },
-      //分页
-      pagination: {
-        total: 0,
-        pageNum: 1,
-        pageSize: 10,
-      },
-      //新增修改数据项配置
-      DMLdialog: {
-        title: '',
-        visiable: false,
-        form: {
-          id: '',
-          prorouteCode: '',
-          prorouteName: '',
-        },
-        rules: {
-          prorouteCode: [{ required: true, message: '线体编码不能为空', trigger: 'blur' }],
-          prorouteName: [{ required: true, message: '线体名称不能为空', trigger: 'blur' }],
-        },
-      },
-      //修改按钮
-      updateDisable: true,
-      //删除按钮
-      delDisable: true,
-      flag: 'update', //区分修改和删除
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    //获取表格数据
-    getList() {
-      const query = { ...this.search, ...this.pagination }
-      delete query.showSearch
-      getProcessList(query).then((res) => {
-        if (res.code == 200) {
-          this.table.loading = false
-          this.pagination.total = res.data.item1
-          this.table.WorksortList = res.data.item2
-        }
-      })
-    },
-
-    //行更新
-    handleUpdate(row) {},
-    //行删除
-    handleDelete(row) {},
-    selectChangeEvent({ checked }) {
-      const records = this.$refs.xTable1.getCheckboxRecords()
-      if (records.length == 1) {
-        this.updateDisable = false
-      } else {
-        this.updateDisable = true
-      }
-      if (records.length > 0) {
-        this.delDisable = false
-      } else {
-        this.delDisable = true
-      }
-    },
-    //新增按钮
-    addItem() {
-      this.DMLdialog.title = '新增'
-      this.DMLdialog.visiable = true
-      this.flag = 'add'
-    },
-    //新增确认
-    submitForm() {
-      if (this.flag == 'update') {
-        updateProcess(this.DMLdialog.form).then((res) => {
-          if (res.code == 200 && res.data == 1) {
-            this.$notify.success('修改成功')
-            this.getList()
-            this.DMLdialog.visiable = false
-            this.reset()
-            this.$notify.success("修改成功");
-          } else {
-            this.$notify.warning('修改错误，请联系管理员')
-          }
-        })
-      } else if (this.flag == 'add') {
-        this.$refs['DMLdialog'].validate((valid) => {
-          if (valid) {
-            let query = {
-              prorouteCode: this.DMLdialog.form.prorouteCode,
-              prorouteName: this.DMLdialog.form.prorouteName,
-            }
-
-            insertProcess(query).then((res) => {
-              if (res.code == 200 && res.data != 0) {
-                this.getList()
-                this.DMLdialog.visiable = false
-                this.reset()
-                this.$notify.success("新增成功");
-              } else {
-                this.$notify.warning('新增错误，请联系管理员')
-              }
-            })
-          }
-        })
-      }
-    },
-    cancel() {
-      this.DMLdialog.visiable = false
-      this.reset()
-    },
-    reset() {
-      this.DMLdialog.form = {
-        prorouteCode: '',
-        prorouteName: '',
-      }
-  
-    },
-    //修改事件
-    updataItem(flag, row) {
-      debugger
-      this.DMLdialog.title = '修改'
-      this.DMLdialog.visiable = true
-      this.flag = 'update'
-      if (!flag) {
-        this.DMLdialog.form.prorouteCode = row.prorouteCode
-        this.DMLdialog.form.prorouteName = row.prorouteName
-        this.DMLdialog.form.id = row.id
-      } else {
-        const records = this.$refs.xTable1.getCheckboxRecords()
-        if (records.length == 1) {
-          this.DMLdialog.form.prorouteCode = records[0].prorouteCode
-          this.DMLdialog.form.prorouteName = records[0].prorouteName
-          this.DMLdialog.form.id = records[0].id
-        }
-      }
-    },
-    //删除事件
-    deleteItem(flag, row) {
-      if (!flag) {
-        this.$modal
-          .confirm('是否确认删除线体名称为"' + row.prorouteName + '"的数据项？')
-          .then(function () {
-            const array = []
-            array.push(row.id)
-            return delProcess(array)
-          })
-          .then(() => {
-            this.getList()
-            this.$modal.msgSuccess('删除成功')
-          })
-          .catch(() => {})
-      } else {
-        const records = this.$refs.xTable1.getCheckboxRecords()
-        if (records.length > 0) {
-          this.$modal
-            .confirm('是否确认删除线体名称为"' + records.map((it) => it.prorouteName) + '"的数据项？')
-            .then(function () {
-              return delProcess(records.map((it) => it.id))
-            })
-            .then(() => {
-              this.getList()
-              this.$modal.msgSuccess('删除成功')
-            })
-            .catch(() => {})
-        }
-      }
-    },
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-.delred {
-  ::v-deep .el-icon-delete {
-    color: #f56c6c;
-  }
-  ::v-deep span {
-    color: #f56c6c;
-  }
-}
-</style>
diff --git a/ZR.Vue/src/views/basisManagement/workUnitComponent/workLine.vue b/ZR.Vue/src/views/basisManagement/workUnitComponent/workLine.vue
index 2d9c691f..f08340c6 100644
--- a/ZR.Vue/src/views/basisManagement/workUnitComponent/workLine.vue
+++ b/ZR.Vue/src/views/basisManagement/workUnitComponent/workLine.vue
@@ -50,8 +50,6 @@
         <vxe-column type="checkbox" width="60"></vxe-column>
         <vxe-column field="lineCode" title="线体编码" sortable></vxe-column>
         <vxe-column field="lineName" title="线体名称" sortable></vxe-column>
-        <!-- <vxe-column field="pkWorkshopId" title="所数车间id" sortable  v-show="false"></vxe-column> -->
-
         <vxe-colgroup title="所属车间">
           <vxe-column field="workshop.workshopId" title="车间id"></vxe-column>
           <vxe-column field="workshop.workshopName" title="车间名称"></vxe-column>
diff --git a/ZR.Vue/src/views/basisManagement/workUnitComponent/workstation.vue b/ZR.Vue/src/views/basisManagement/workUnitComponent/workstation.vue
index 7266f76b..7451b395 100644
--- a/ZR.Vue/src/views/basisManagement/workUnitComponent/workstation.vue
+++ b/ZR.Vue/src/views/basisManagement/workUnitComponent/workstation.vue
@@ -40,6 +40,8 @@
       <vxe-table
         border
         ref="xTable1"
+        align="center"
+        :print-config="{}"
         :data="table.workshopList"
         :loading="table.loading"
         @checkbox-change="selectChangeEvent"
@@ -48,6 +50,10 @@
         <vxe-column type="checkbox" width="60"></vxe-column>
         <vxe-column field="stationCode" title="工位编码" sortable></vxe-column>
         <vxe-column field="stationName" title="工位名称" sortable></vxe-column>
+        <vxe-colgroup title="所属线体">
+          <vxe-column field="workline.lineCode" title="线体id"></vxe-column>
+          <vxe-column field="workline.lineName" title="线体名称"></vxe-column>
+        </vxe-colgroup>
         <vxe-column title="操作" show-overflow>
           <template slot-scope="scope">
             <el-button size="mini" type="text" icon="el-icon-edit" @click="updataItem(false, scope.row)">修改</el-button>
@@ -75,6 +81,17 @@
         <el-form-item label="工位名称 " prop="stationName">
           <el-input v-model="DMLdialog.form.stationName" placeholder="输入设备名称"></el-input>
         </el-form-item>
+        <el-form-item label="线体 " >
+          <el-select v-model="DMLdialog.form.fkWorklineId" placeholder="请选择线体">
+            <el-option
+              v-for="item in DMLdialog.workLineOption"
+              :key="item.id"
+              :label="item.id + '_' + item.lineCode + '_' + item.lineName"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -85,7 +102,7 @@
 </template>
 
 <script>
-import { getWorkstationList, insertWorkstation, updateWorkstation, delWorkstation } from '@/api/basisManagement/workstation.js'
+import { getWorkstationList, insertWorkstation, updateWorkstation, delWorkstation,getworkLineList } from '@/api/basisManagement/workstation.js'
 export default {
   name: 'workstation',
   data() {
@@ -114,7 +131,10 @@ export default {
         form: {
           stationCode: '',
           stationName: '',
+          fkWorklineId:""
+
         },
+        workLineOption:[],
         rules: {
           stationCode: [{ required: true, message: '工位编码不能为空', trigger: 'blur' }],
           stationName: [{ required: true, message: '工位名称不能为空', trigger: 'blur' }],
@@ -129,6 +149,7 @@ export default {
   },
   created() {
     this.getList()
+    this.getworkLineOption();
   },
   methods: {
     //获取表格数据
@@ -143,6 +164,15 @@ export default {
         }
       })
     },
+    getworkLineOption()
+    {
+      getworkLineList().then((res)=>{
+        if(res.code==200)
+        this.DMLdialog.workLineOption=res.data;
+
+
+      });
+    },
 
     //行更新
     handleUpdate(row) {},
@@ -201,7 +231,7 @@ export default {
         stationCode: '',
         stationName: '',
       }
-      this.DMLdialog.form.reset()
+      this.DMLdialog.form.resetFields()
     },
     //修改事件
     updataItem(flag, row) {
@@ -212,12 +242,14 @@ export default {
         this.DMLdialog.form.stationCode = row.stationCode
         this.DMLdialog.form.stationName = row.stationName
         this.DMLdialog.form.id = row.id
+        this.DMLdialog.form.fkWorklineId = row.fkWorklineId
       } else {
         const records = this.$refs.xTable1.getCheckboxRecords()
         if (records.length == 1) {
           this.DMLdialog.form.stationCode = records[0].stationCode
           this.DMLdialog.form.stationName = records[0].stationName
           this.DMLdialog.form.id = records[0].id
+          this.DMLdialog.form.fkWorklineId = records[0].fkWorklineId
         }
       }
     },