diff --git a/ZR.Admin.WebApi/Controllers/mes/md/MdWorklineController.cs b/ZR.Admin.WebApi/Controllers/mes/md/MdWorklineController.cs
index 7dab2f05..e9c8b41f 100644
--- a/ZR.Admin.WebApi/Controllers/mes/md/MdWorklineController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/md/MdWorklineController.cs
@@ -69,5 +69,13 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
             return null;
 
         }
+
+       
+        [HttpGet("getWorkshopList")]
+        public  IActionResult GetWorkshopList(int worklineId=0)
+        {
+            List<MdWorkshop> MdWorkshopList= worklineService.GetMdWorkshops(worklineId);
+            return SUCCESS(MdWorkshopList);
+        }
     }
 }
diff --git a/ZR.Model/mes/md/MdWorkline.cs b/ZR.Model/mes/md/MdWorkline.cs
index 3b7ca850..ef0196e0 100644
--- a/ZR.Model/mes/md/MdWorkline.cs
+++ b/ZR.Model/mes/md/MdWorkline.cs
@@ -30,10 +30,14 @@ namespace ZR.Model.mes.md
         ///</summary>
          [SugarColumn(ColumnName= "pk_workshop_id")]
          public int? FkWorkShopId { get; set; }
+
+
+        [Navigate(NavigateType.OneToOne, nameof(FkWorkShopId))]//一对一 SchoolId是StudentA类里面的
+        public MdWorkshop  Workshop { get; set; } //不能赋值只能是null
         /// <summary>
         /// 租户号 
         ///</summary>
-         [SugarColumn(ColumnName="TENANT_ID"    )]
+        [SugarColumn(ColumnName="TENANT_ID"    )]
          public string TenantId { get; set; }
         /// <summary>
         /// 乐观锁 
diff --git a/ZR.Service/mes/md/IService/IMdWorklineService.cs b/ZR.Service/mes/md/IService/IMdWorklineService.cs
index 6f185dbd..ea5866a0 100644
--- a/ZR.Service/mes/md/IService/IMdWorklineService.cs
+++ b/ZR.Service/mes/md/IService/IMdWorklineService.cs
@@ -16,5 +16,9 @@ namespace ZR.Service.MES.md.IService
         public int UpdateWorkline(MdWorkline workline);
 
         public int deleteWorkline(int[] ids);
+
+        public  List<MdWorkshop>  GetMdWorkshops(int lineCode=0);  
+
+
     }
 }
diff --git a/ZR.Service/mes/md/MdWorklineService.cs b/ZR.Service/mes/md/MdWorklineService.cs
index 059738c5..26dd1c35 100644
--- a/ZR.Service/mes/md/MdWorklineService.cs
+++ b/ZR.Service/mes/md/MdWorklineService.cs
@@ -15,6 +15,8 @@ namespace ZR.Service.MES.md
     [AppService(ServiceType = typeof(IMdWorklineService), ServiceLifetime = LifeTime.Transient)]
     public class MdWorklineService : BaseService<MdWorkline>, IMdWorklineService
     {
+
+
         int IMdWorklineService.AddWorkline(MdWorkline workline)
         {
             return Insert(workline);
@@ -25,6 +27,7 @@ namespace ZR.Service.MES.md
             return Delete(ids);
         }
 
+        // 导航查询
         (int, List<MdWorkline>) IMdWorklineService.GetAll(string lineCode, string lineName, int pageNum, int pageSize)
         {
             int totalNum = 0;
@@ -32,13 +35,22 @@ namespace ZR.Service.MES.md
                 .AndIF(!string.IsNullOrEmpty(lineCode), it => it.LineCode.Contains(lineCode))
                 .AndIF(!string.IsNullOrEmpty(lineName), it => it.LineName.Contains(lineName))
                 .ToExpression();
-            List<MdWorkline> data = Context.Queryable<MdWorkline>().Where(predicate).ToPageList(pageNum, pageSize, ref totalNum);
+            List<MdWorkline> data = Context.Queryable<MdWorkline>().Includes(x => x.Workshop).Where(predicate).ToPageList(pageNum, pageSize, ref totalNum);
             return (totalNum, data);
+
         }
 
         int IMdWorklineService.UpdateWorkline(MdWorkline workline)
         {
             return Update(workline, true);
         }
+
+        public List<MdWorkshop> GetMdWorkshops(int lineCode = 0)
+        {
+            if(lineCode == 0)
+                return Context.Queryable<MdWorkshop>().ToList();
+            else
+               return  Context.Queryable<MdWorkshop>().Where(it=>it.Equals(lineCode)).ToList();         
+        }
     }
 }
diff --git a/ZR.Vue/src/api/basisManagement/workLine.js b/ZR.Vue/src/api/basisManagement/workLine.js
index 79e4404a..7e461113 100644
--- a/ZR.Vue/src/api/basisManagement/workLine.js
+++ b/ZR.Vue/src/api/basisManagement/workLine.js
@@ -37,3 +37,12 @@ export function delWorkline(data) {
     contextType:"application/json"
   })
 }
+
+export function getWorkshopList(query) {
+    return request({
+      url: '/mes/md/workline/getWorkshopList',
+      method: 'get',
+      params: query,
+    })
+  }
+  
\ No newline at end of file
diff --git a/ZR.Vue/src/views/basisManagement/workUnitComponent/workLine.vue b/ZR.Vue/src/views/basisManagement/workUnitComponent/workLine.vue
index e5a127ea..2d9c691f 100644
--- a/ZR.Vue/src/views/basisManagement/workUnitComponent/workLine.vue
+++ b/ZR.Vue/src/views/basisManagement/workUnitComponent/workLine.vue
@@ -39,6 +39,8 @@
     <div>
       <vxe-table
         border
+        align="center"
+        :print-config="{}"
         ref="xTable1"
         :data="table.worklineList"
         :loading="table.loading"
@@ -48,6 +50,12 @@
         <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>
+        </vxe-colgroup>
 
         <vxe-column title="操作" show-overflow>
           <template slot-scope="scope">
@@ -76,6 +84,17 @@
         <el-form-item label="线体名称 " prop="lineName">
           <el-input v-model="DMLdialog.form.lineName" placeholder="输入线体名称"></el-input>
         </el-form-item>
+        <el-form-item label="车间 " prop="pkWorkshopName">
+          <el-select v-model="DMLdialog.form.fkWorkShopId" placeholder="请选择车间">
+            <el-option
+              v-for="item in DMLdialog.workshopOption"
+              :key="item.id"
+              :label="item.id + '_' + item.workshopId + '_' + item.workshopName"
+              :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,7 +105,7 @@
 </template>
 
 <script>
-import { getWorklineList, insertworkline, updateWorkline, delWorkline } from '@/api/basisManagement/workLine.js'
+import { getWorklineList, insertworkline, updateWorkline, delWorkline, getWorkshopList } from '@/api/basisManagement/workLine.js'
 export default {
   name: 'workLine',
   data() {
@@ -95,6 +114,7 @@ export default {
       search: {
         lineCode: '',
         lineName: '',
+        pkWorkshopName: '',
         showSearch: true,
       },
       //表格
@@ -115,7 +135,9 @@ export default {
         form: {
           lineCode: '',
           lineName: '',
+          fkWorkShopId: '',
         },
+        workshopOption: [],
         rules: {
           lineCode: [{ required: true, message: '线体编码不能为空', trigger: 'blur' }],
           lineName: [{ required: true, message: '线体名称不能为空', trigger: 'blur' }],
@@ -130,6 +152,7 @@ export default {
   },
   created() {
     this.getList()
+    this.getWorkshopOption()
   },
   methods: {
     //获取表格数据
@@ -144,6 +167,12 @@ export default {
         }
       })
     },
+    //获取车间
+    getWorkshopOption() {
+      getWorkshopList().then((res) => {
+        if (res.code == 200) this.DMLdialog.workshopOption = res.data
+      })
+    },
 
     //行更新
     handleUpdate(row) {},
@@ -213,12 +242,15 @@ export default {
         this.DMLdialog.form.lineCode = row.lineCode
         this.DMLdialog.form.lineName = row.lineName
         this.DMLdialog.form.id = row.id
+
+        this.DMLdialog.form.fkWorkShopId = row.fkWorkShopId
       } else {
         const records = this.$refs.xTable1.getCheckboxRecords()
         if (records.length == 1) {
           this.DMLdialog.form.lineCode = records[0].lineCode
           this.DMLdialog.form.lineName = records[0].lineName
           this.DMLdialog.form.id = records[0].id
+          this.DMLdialog.form.fkWorkShopId =records[0].fkWorkShopId
         }
       }
     },
@@ -262,7 +294,7 @@ export default {
   ::v-deep .el-icon-delete {
     color: #f56c6c;
   }
-  
+
   ::v-deep span {
     color: #f56c6c;
   }