diff --git a/ZR.Admin.WebApi/Controllers/mes/md/WorkshopController.cs b/ZR.Admin.WebApi/Controllers/mes/md/MdWorkshopController.cs
similarity index 88%
rename from ZR.Admin.WebApi/Controllers/mes/md/WorkshopController.cs
rename to ZR.Admin.WebApi/Controllers/mes/md/MdWorkshopController.cs
index e12ad050..bec8c7ec 100644
--- a/ZR.Admin.WebApi/Controllers/mes/md/WorkshopController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/md/MdWorkshopController.cs
@@ -3,17 +3,18 @@ using Microsoft.AspNetCore.Mvc;
 using System.Diagnostics.CodeAnalysis;
 using ZR.Admin.WebApi.Extensions;
 using ZR.Model.mes.md;
+using ZR.Model.System.Dto;
 using ZR.Service.mes.md;
 using ZR.Service.mes.md.IService;
 
 namespace ZR.Admin.WebApi.Controllers.mes.md
 {
     [Route("mes/md/workshop")]
-    public class WorkshopController : BaseController
+    public class MdWorkshopController : BaseController
     {
         IMdWorkshopService mdWorkshopService;
 
-        public WorkshopController(IMdWorkshopService mdWorkshopService)
+        public MdWorkshopController(IMdWorkshopService mdWorkshopService)
         {
             this.mdWorkshopService = mdWorkshopService;
         }
@@ -43,6 +44,10 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
         [HttpPost("addWorkshop")]
         public IActionResult AddWorkshop([FromBody] MdWorkshop workshop)
         {
+            if (workshop == null)
+            {
+                return ToResponse(new ApiResult((int)ResultCode.NO_DATA, "null"));
+            }
             if (workshop != null)
                 workshop.ToCreate(HttpContext);
             int result = mdWorkshopService.AddWorkshop(workshop);
diff --git a/ZR.Admin.WebApi/Program.cs b/ZR.Admin.WebApi/Program.cs
index e811fe2b..9f45f91f 100644
--- a/ZR.Admin.WebApi/Program.cs
+++ b/ZR.Admin.WebApi/Program.cs
@@ -85,6 +85,7 @@ builder.Services.AddMvc(options =>
     options.JsonSerializerOptions.WriteIndented = true;
     options.JsonSerializerOptions.Converters.Add(new JsonConverterUtil.DateTimeConverter());
     options.JsonSerializerOptions.Converters.Add(new JsonConverterUtil.DateTimeNullConverter());
+    options.JsonSerializerOptions.PropertyNameCaseInsensitive = false;
 });
 
 builder.Services.AddSwaggerConfig();
diff --git a/ZR.Model/mes/md/MdUnit.cs b/ZR.Model/mes/md/MdUnit.cs
index 1fca5022..37c4efa1 100644
--- a/ZR.Model/mes/md/MdUnit.cs
+++ b/ZR.Model/mes/md/MdUnit.cs
@@ -10,7 +10,7 @@
   /// 单位ID 
   ///</summary>
   [SugarColumn(ColumnName = "measure_id", IsPrimaryKey = true, IsIdentity = true)]
-  public int MeasureId { get; set; }
+  public int? MeasureId { get; set; }
 
   /// <summary>
   /// 单位编码 
diff --git a/ZR.Vue/src/utils/request.js b/ZR.Vue/src/utils/request.js
index dbeb4e55..9feebbe9 100644
--- a/ZR.Vue/src/utils/request.js
+++ b/ZR.Vue/src/utils/request.js
@@ -68,6 +68,8 @@ service.interceptors.response.use(
         type: 'error',
       })
       return Promise.reject(res.data)
+    } else if (code == 210) {
+      this.$notify.error('新增失败（null）,联系技术人员')
     } else {
       //返回标准 code/msg/data字段
       return res.data
diff --git a/ZR.Vue/src/views/basisManagement/devicestation.vue b/ZR.Vue/src/views/basisManagement/devicestation.vue
index 966cba16..bae42971 100644
--- a/ZR.Vue/src/views/basisManagement/devicestation.vue
+++ b/ZR.Vue/src/views/basisManagement/devicestation.vue
@@ -50,9 +50,9 @@
         <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 title="所属工序">
+          <vxe-column field="workstation.stationCode" title="工序id" width="20"></vxe-column>
+          <vxe-column field="workstation.stationName" title="工序名称"></vxe-column>
         </vxe-colgroup>
 
         <vxe-column title="操作" show-overflow>
@@ -83,8 +83,8 @@
           <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-form-item label="工序">
+          <el-select v-model="DMLdialog.form.fkWorkstationId" placeholder="请选择工序">
             <el-option
               v-for="item in DMLdialog.workstationOption"
               :key="item.id"
diff --git a/ZR.Vue/src/views/basisManagement/unit.vue b/ZR.Vue/src/views/basisManagement/unit.vue
index 7e266ea1..48f9b2e1 100644
--- a/ZR.Vue/src/views/basisManagement/unit.vue
+++ b/ZR.Vue/src/views/basisManagement/unit.vue
@@ -271,10 +271,12 @@ export default {
             })
           } else {
             addUnitmeasure(this.dmlform).then((response) => {
-              if (response.data == 1) {
+              if (response.code==200) {
                 this.$modal.msgSuccess('新增成功')
                 this.open = false
                 this.getList()
+              }else if(response.code==210){
+                this.$notify.error("新增失败（null）,联系技术人员")
               }
             })
           }
diff --git a/ZR.Vue/src/views/basisManagement/workUnitComponent/workLine.vue b/ZR.Vue/src/views/basisManagement/workUnitComponent/workLine.vue
index f08340c6..2317ee8a 100644
--- a/ZR.Vue/src/views/basisManagement/workUnitComponent/workLine.vue
+++ b/ZR.Vue/src/views/basisManagement/workUnitComponent/workLine.vue
@@ -3,11 +3,11 @@
     <!-- 搜索部分 -->
     <div>
       <el-form :model="search" inline v-show="search.showSearch">
-        <el-form-item label="线体编码 ">
-          <el-input v-model="search.lineCode" placeholder="输入线体编号"></el-input>
+        <el-form-item label="产线编码 ">
+          <el-input v-model="search.lineCode" placeholder="输入产线编号"></el-input>
         </el-form-item>
-        <el-form-item label="线体名称 ">
-          <el-input v-model="search.lineName" placeholder="输入线体名称"></el-input>
+        <el-form-item label="产线名称 ">
+          <el-input v-model="search.lineName" placeholder="输入产线名称"></el-input>
         </el-form-item>
         <el-button icon="el-icon-search" circle @click="getList"></el-button>
       </el-form>
@@ -48,10 +48,10 @@
         :row-config="{ isHover: true }"
       >
         <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="lineCode" title="产线编码" sortable></vxe-column>
+        <vxe-column field="lineName" title="产线名称" sortable></vxe-column>
         <vxe-colgroup title="所属车间">
-          <vxe-column field="workshop.workshopId" title="车间id"></vxe-column>
+          <vxe-column field="workshop.workshopId" title="车间id" width="20"></vxe-column>
           <vxe-column field="workshop.workshopName" title="车间名称"></vxe-column>
         </vxe-colgroup>
 
@@ -76,18 +76,18 @@
     <!-- 弹窗-- 修改和删除 -->
     <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="lineCode">
-          <el-input v-model="DMLdialog.form.lineCode" placeholder="输入线体编码"></el-input>
+        <el-form-item label="产线编码 " prop="lineCode">
+          <el-input v-model="DMLdialog.form.lineCode" placeholder="输入产线编码"></el-input>
         </el-form-item>
-        <el-form-item label="线体名称 " prop="lineName">
-          <el-input v-model="DMLdialog.form.lineName" placeholder="输入线体名称"></el-input>
+        <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"
+              :label="item.workshopId + '|' + item.workshopName"
               :value="item.id"
             >
             </el-option>
@@ -137,8 +137,8 @@ export default {
         },
         workshopOption: [],
         rules: {
-          lineCode: [{ required: true, message: '线体编码不能为空', trigger: 'blur' }],
-          lineName: [{ required: true, message: '线体名称不能为空', trigger: 'blur' }],
+          lineCode: [{ required: true, message: '产线编码不能为空', trigger: 'blur' }],
+          lineName: [{ required: true, message: '产线名称不能为空', trigger: 'blur' }],
         },
       },
       //修改按钮
@@ -256,7 +256,7 @@ export default {
     deleteItem(flag, row) {
       if (!flag) {
         this.$modal
-          .confirm('是否确认删除线体名称为"' + row.lineName + '"的数据项？')
+          .confirm('是否确认删除产线名称为"' + row.lineName + '"的数据项？')
           .then(function () {
             const array = []
             array.push(row.id)
@@ -271,7 +271,7 @@ export default {
         const records = this.$refs.xTable1.getCheckboxRecords()
         if (records.length > 0) {
           this.$modal
-            .confirm('是否确认删除线体名称为"' + records.map((it) => it.lineName) + '"的数据项？')
+            .confirm('是否确认删除产线名称为"' + records.map((it) => it.lineName) + '"的数据项？')
             .then(function () {
               return delWorkline(records.map((it) => it.id))
             })
diff --git a/ZR.Vue/src/views/basisManagement/workUnitComponent/workshop.vue b/ZR.Vue/src/views/basisManagement/workUnitComponent/workshop.vue
index 8e44408c..6d016fcf 100644
--- a/ZR.Vue/src/views/basisManagement/workUnitComponent/workshop.vue
+++ b/ZR.Vue/src/views/basisManagement/workUnitComponent/workshop.vue
@@ -80,7 +80,7 @@
           <el-input v-model="DMLdialog.form.workshopName" placeholder="输入车间名称"></el-input>
         </el-form-item>
         <el-form-item label="车间位置 " prop="workshopPosition">
-          <el-input v-model="DMLdialog.form.workshopPosition" placeholder="输入车间名称"></el-input>
+          <el-input v-model="DMLdialog.form.workshopPosition" placeholder="输入车间位置"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -196,6 +196,8 @@ export default {
                 this.getList()
                 this.DMLdialog.visiable = false
                 this.reset()
+              }else if(res.data==210){
+                 this.$notify.error("新增失败（null）,联系技术人员")
               }
             })
           }
diff --git a/ZR.Vue/src/views/basisManagement/workUnitComponent/workstation.vue b/ZR.Vue/src/views/basisManagement/workUnitComponent/workstation.vue
index 7451b395..517bec49 100644
--- a/ZR.Vue/src/views/basisManagement/workUnitComponent/workstation.vue
+++ b/ZR.Vue/src/views/basisManagement/workUnitComponent/workstation.vue
@@ -3,11 +3,11 @@
     <!-- 搜索部分 -->
     <div>
       <el-form :model="search" inline v-show="search.showSearch">
-        <el-form-item label="工位编码 ">
-          <el-input v-model="search.stationCode" placeholder="输入工位编号"></el-input>
+        <el-form-item label="工序编码 ">
+          <el-input v-model="search.stationCode" placeholder="输入工序编号"></el-input>
         </el-form-item>
-        <el-form-item label="工位名称 ">
-          <el-input v-model="search.stationName" placeholder="输入工位名称"></el-input>
+        <el-form-item label="工序名称 ">
+          <el-input v-model="search.stationName" placeholder="输入工序名称"></el-input>
         </el-form-item>
         <el-button icon="el-icon-search" circle @click="getList"></el-button>
       </el-form>
@@ -48,11 +48,11 @@
         :row-config="{ isHover: true }"
       >
         <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-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">
@@ -75,14 +75,14 @@
     <!-- 弹窗-- 修改和删除 -->
     <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="stationCode">
-          <el-input v-model="DMLdialog.form.stationCode" placeholder="输入设备编码"></el-input>
+        <el-form-item label="工序编码 " prop="stationCode">
+          <el-input v-model="DMLdialog.form.stationCode" placeholder="输入工序编码"></el-input>
         </el-form-item>
-        <el-form-item label="工位名称 " prop="stationName">
-          <el-input v-model="DMLdialog.form.stationName" placeholder="输入设备名称"></el-input>
+        <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-form-item label="产线 " >
+          <el-select v-model="DMLdialog.form.fkWorklineId" placeholder="请选择产线">
             <el-option
               v-for="item in DMLdialog.workLineOption"
               :key="item.id"
@@ -136,8 +136,8 @@ export default {
         },
         workLineOption:[],
         rules: {
-          stationCode: [{ required: true, message: '工位编码不能为空', trigger: 'blur' }],
-          stationName: [{ required: true, message: '工位名称不能为空', trigger: 'blur' }],
+          stationCode: [{ required: true, message: '工序编码不能为空', trigger: 'blur' }],
+          stationName: [{ required: true, message: '工序名称不能为空', trigger: 'blur' }],
         },
       },
       //修改按钮