Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/lang/en.js

@@ -563,6 +563,7 @@ export default {
   stockManagement: {
     stockId: 'Stock ID',
     cargoSpaceId: 'Cargo Space ID',
+    cargoSpaceName: 'Cargo Space Name',
     stockStatus: 'Stock Status',
     productStatus: 'Product Status',
     lotNo: 'Lot No',
@@ -611,12 +612,23 @@ export default {
     addSuccess: 'Added successfully',
     editSuccess: 'Modified successfully',
     deleteSuccess: 'Deleted successfully',
-    confirmDelete: 'Are you sure to delete the stock information with ID "{stockIds}"?'
+    confirmDelete: 'Are you sure to delete the stock information with ID "{stockIds}"?',
+    productId:'物料编码',
+    materialDesc:'物料描述',
+    englishDesc:'英文描述',
+    netWeight:'净重',
+    length:'长',
+    width:'宽',
+    height:'高',
+    volume:'体积',
+    cargoSpaceStatus:'货位状态'
+
   },
   // *************库存操作记录***************
   stockRecord: {
     stockId: 'Stock ID',
     cargoSpaceId: 'Cargo Space ID',
+    cargoSpaceName: '货位名称',
     trayCode: 'Tray Code',
     productId: 'Product ID',
     productName: 'Product Name',
@@ -674,7 +686,8 @@ export default {
     editSuccess: 'Modified successfully',
     deleteSuccess: 'Deleted successfully',
     confirmDelete: 'Are you sure to delete the stock operation record with ID {whGuids}?',
-    fileName: 'record_{time}'
+    fileName: 'record_{time}',
+    createTime:  '创建时间',
   },
   // **************库存冻结记录**************
   stockFreeze: {
@@ -734,7 +747,8 @@ export default {
     addSuccess: 'Added successfully',
     editSuccess: 'Modified successfully',
     deleteSuccess: 'Deleted successfully',
-    deleteConfirm: 'Are you sure to delete the selected stock freeze records?'
+    deleteConfirm: 'Are you sure to delete the selected stock freeze records?',
+    createTime:  '创建时间',
   },
   menu: {
     //收货单据新增
@@ -782,7 +796,7 @@ export default {
       LogManagement_OperationLog: 'OperationLog',
       //登录日志
       LogManagement_LoginLog: 'LoginLog',
-    
+
     //********************系统监控********************
     SystemMonitor: 'SystemMonitor',
       // 在线用户
@@ -1812,7 +1826,7 @@ export default {
       //--------------当前页面交互框操作提示--------------
       placeholderJobName: 'Enter JobName',
       placeholderJobGroup: 'Select JobGroup',
-      
+
       //---------------二级窗口操作提示------------------
       placeholderInvokeTarget: 'Enter InvokeTarget',
       placeholderCronExpression: 'Enter CronExpression',