更新

src/lang/i18n.js

@@ -747,6 +747,10 @@ export default {
       HistoricalTask: {
         zh: '历史任务',
         en: 'Historical Task'
+      },
+      ProcessStorageManagement: {
+        zh: '工序存储区域管理',
+        en: 'Process Storage Management'
       }
     },
     order: {

src/lang/i18n/en/module/art.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-08 09:45:54
- * @LastEditors: gtz
- * @LastEditTime: 2021-04-15 19:34:46
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-04 15:07:12
  * @Description: file content
  */
 
@@ -47,6 +47,7 @@ export default {
   sameEqError: 'Can not choice same equipment!',
   processList: {
     processName: 'Process Step Name',
+    processCode: 'process Code',
     processEq: 'Process Step Equipment',
     description: 'Description',
     addProcess: 'Add a Process Step',

src/lang/i18n/en/module/basicData.js

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-04 10:13:58
+ * @LastEditTime: 2022-03-04 15:24:39
  * @Description: file content
  */
 export default {
@@ -287,6 +287,7 @@ export default {
     BoxStatus: 'Box Status',
     BoxNumber: 'Box Number',
     PreviousOperation: 'Previous Operation',
+    ExecutionOperation: 'Execution Operation',
     NextOperation: 'Next Operation',
     CompletionTime: 'Completion Time',
     StartLocation: 'Start Location',
@@ -315,6 +316,8 @@ export default {
     IsEmpty: 'Is Empty',
     IsEmptyBox: 'Is Empty Box',
     LocationName: 'Location Name',
-    LocationCode: 'Location Code'
+    LocationCode: 'Location Code',
+    PerformTaskManual: 'Perform Task Manual',
+    processStorageLink: 'Process Storage Link'
   }
 }

src/lang/i18n/zh/module/art.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-08 09:46:00
- * @LastEditors: gtz
- * @LastEditTime: 2021-04-15 19:35:00
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-04 15:07:02
  * @Description: file content
  */
 
@@ -47,6 +47,7 @@ export default {
   sameEqError: '不能选择相同的设备!',
   processList: {
     processName: '工序名称',
+    processCode: '工序编码',
     processEq: '工序设备',
     description: '描述',
     addProcess: '添加一道工序',

src/lang/i18n/zh/module/basicData.js

@@ -1,14 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
-<<<<<<< HEAD
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-06 19:53:27
-=======
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-04 10:13:41
->>>>>>> develop
- * @Description: file content
+ * @LastEditTime: 2022-03-07 09:14:33
  */
 export default {
   visual: {
@@ -307,6 +301,7 @@ export default {
     BoxStatus: '箱状态',
     BoxNumber: '箱号',
     PreviousOperation: '上一个工序',
+    ExecutionOperation: '执行工序',
     NextOperation: '下一个工序',
     CompletionTime: '完成时间',
     StartLocation: '开始库位',
@@ -335,7 +330,8 @@ export default {
     IsEmpty: '是否有基板',
     IsEmptyBox: '是否空箱',
     LocationName: '库位名',
-    LocationCode: '库位编码'
-
+    LocationCode: '库位编码',
+    PerformTaskManual: '手动执行任务',
+    processStorageLink: '工序关联库位'
   }
 }