diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptMarkServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptMarkServiceImpl.java
index 7fddf619..46ca3051 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptMarkServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptMarkServiceImpl.java
@@ -93,7 +93,6 @@ public class AcceptMarkServiceImpl implements AcceptMarkService {
         String nickName = SecurityUtils.getNickName();
         String now = DateUtil.now();
         JwtUserDto currentUser = (JwtUserDto) SecurityUtils.getCurrentUser();
-        Long deptId = currentUser.getDeptId();
 
         WQLObject mstTab = WQLObject.getWQLObject("QL_TEST_AcceptMark");
         WQLObject dtlTab = WQLObject.getWQLObject("QL_TEST_AcceptMarkBOM");
@@ -106,9 +105,9 @@ public class AcceptMarkServiceImpl implements AcceptMarkService {
         jsonMst.put("mark_id", IdUtil.getSnowflake(1, 1).nextId());
         jsonMst.put("is_delete", "0");
         jsonMst.put("remark", (String) whereJson.get("remark"));
-        JSONObject jonow = mstTab.query("is_delete='0' and mark_code='" + jsonMst.getString("mark_code") + "'").uniqueResult(0);
+        JSONObject jonow = mstTab.query("is_delete='0' and material_id='" + jsonMst.getString("material_id") + "'").uniqueResult(0);
         if (jonow != null) {
-            throw new BadRequestException("该牌号已存在！");
+            throw new BadRequestException("该碳化钨已存在！");
         }
         jsonMst.put("create_id", currentUserId);
         jsonMst.put("create_name", nickName);
@@ -149,12 +148,12 @@ public class AcceptMarkServiceImpl implements AcceptMarkService {
         JSONObject jsonMst = new JSONObject();
         whereJson.remove("tableData");
         jsonMst = (JSONObject) JSON.toJSON(whereJson);
-        String mark_code = jsonMst.getString("mark_code");
+        String material_id = jsonMst.getString("material_id");
         String mark_id = jsonMst.getString("mark_id");
 
-        JSONObject oldJO = mstTab.query("mark_id <> '" + mark_id + "' and mark_code='"+mark_code+"'").uniqueResult(0);
+        JSONObject oldJO = mstTab.query("mark_id <> '" + mark_id + "' and material_id='"+material_id+"'").uniqueResult(0);
         if(oldJO !=null){
-            throw new BadRequestException("已存在相同牌号！");
+            throw new BadRequestException("已存在相同碳化钨！");
         }
         JSONObject now = mstTab.query("mark_id = '" + mark_id + "'").uniqueResult(0);
         //主表
diff --git a/mes/qd/src/views/wms/basedata/em/devicebom/AddDialog.vue b/mes/qd/src/views/wms/basedata/em/devicebom/AddDialog.vue
index 72500166..0606f356 100644
--- a/mes/qd/src/views/wms/basedata/em/devicebom/AddDialog.vue
+++ b/mes/qd/src/views/wms/basedata/em/devicebom/AddDialog.vue
@@ -215,13 +215,21 @@ export default {
         this.form.tableData = res
       })
     },
-    [CRUD.HOOK.afterToView]() {
+    [CRUD.HOOK.afterToView](crud, form) {
       const data = {
         'device_bom_id': this.form.device_bom_id
       }
       crudDevicebom.getDtl(data).then(res => {
         this.form.tableData = res
       })
+      if (!form.device_bom_code) {
+        this.queryClassId()
+      } else {
+        const data = {}
+        data.id = form.material_type_id
+        data.goal_id = this.classBj_id
+        this.getSubTypes(data)
+      }
     },
     [CRUD.HOOK.afterToCU](crud, form) {
       if (!form.device_bom_code) {
diff --git a/mes/qd/src/views/wms/pf/acceptmark/index.vue b/mes/qd/src/views/wms/pf/acceptmark/index.vue
index c3405ba2..1ac2bc7a 100644
--- a/mes/qd/src/views/wms/pf/acceptmark/index.vue
+++ b/mes/qd/src/views/wms/pf/acceptmark/index.vue
@@ -46,19 +46,19 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="mark_code" width="150px" label="牌号" align="center">
+        <el-table-column prop="material_code" label="碳化钨编码" width="120" align="center"  />
+        <el-table-column prop="material_name" width="120" label="碳化钨名称" align="center">
           <template slot-scope="scope">
-            <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.mark_code }}</el-link>
+            <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.material_name }}</el-link>
           </template>
         </el-table-column>
+        <el-table-column prop="mark_code" width="150px" label="牌号" align="center" />
         <el-table-column prop="c_balance" label="碳平衡" width="90px" align="center" :formatter="crud.formatQlNum4" />
         <el-table-column prop="liquid_rate" label="液料比" width="60" align="center" :formatter="crud.formatNum2" />
         <el-table-column prop="ball_rate" label="球料比" width="60" align="center" :formatter="crud.formatNum2" />
         <el-table-column prop="ball_speed" label="球磨转速(RPM)" width="120px" align="center" :formatter="crud.formatNum2" />
         <el-table-column prop="ball_time" label="研磨时间(h)" width="90px" align="center" :formatter="crud.formatNum2" />
         <el-table-column prop="accept_qty" label="标准重量(g)" width="90px" align="center" :formatter="crud.formatNum2" />
-        <el-table-column prop="material_code" label="碳化钨编码" width="120" align="center"  />
-        <el-table-column prop="material_name" label="碳化钨名称" width="120" align="center"  />
         <el-table-column prop="detail_count" label="明细数" align="center" min-width="60" />
         <el-table-column prop="remark" label="备注" align="center"  min-width="135" />
         <el-table-column prop="create_name" label="创建人" align="center" min-width="80" />
diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/StartDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/StartDialog.vue
index 1fa6aaf9..03e92d58 100644
--- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/StartDialog.vue
+++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/StartDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="开始维修"
+    title="开始保养"
     append-to-body
     :visible.sync="dialogVisible"
     :before-close="handleClose"
diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/StartDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/StartDialog.vue
index 1fa6aaf9..03e92d58 100644
--- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/StartDialog.vue
+++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/StartDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="开始维修"
+    title="开始保养"
     append-to-body
     :visible.sync="dialogVisible"
     :before-close="handleClose"