Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/lang/en.js

@@ -114,6 +114,10 @@ export default {
     stockStatus: 'Document Status',
     operate: 'Operation',
     selecInType: 'Please select stockin type',
+    netWeight: '净重',
+    totalPrice: '确定',
+    totalNetWeight: '总净重',
+    grossWeight: '毛重',
   },
   // ***************入库单据管理*************
   inStockin: {
@@ -175,7 +179,15 @@ export default {
     selectStartTime: 'Please select Start Time',
     selectFinishTime: 'Please select Finish Time',
     inputEntranceId: 'Please input Entrance ID',
-    inputExitId: 'Please input Exit ID'
+    inputExitId: 'Please input Exit ID',
+    netWeight: '净重',
+    totalPrice: '确定',
+    totalNetWeight: '总净重',
+    grossWeight: '毛重',
+    materialDesc: '物料描述',
+    englishDesc: '英文描述',
+    cartonNo: '箱号',
+    packingMethod: '包装方式',
   },
   // ***************出库单据管理**************
   outStockoutManage: {