Merge remote-tracking branch 'origin/master'

lms/nladmin-system/src/main/resources/language/i18n/en.js

@@ -49,6 +49,11 @@ var config = {
         "mesErrorTitle": "MES Error"
     },
     "common": {
+        "warehousing_time": "Warehousing Time",
+        "stock_age": "Stock Age",
+        "produce_age": "Production Duration (Days)",
+        "reason_for_overdue": "Reason for Overdue",
+        "box_weight": "Gross Weight",
         "documentNumber": "Document Number",
         "biheight": "Height",
         "biwidth": "Width",

lms/nladmin-system/src/main/resources/language/i18n/id.js

@@ -48,6 +48,11 @@ var config = {
         "load_text5": "Hanya dapat mengunggah satu file excel!"
     },
     "common": {
+        "warehousing_time": "Waktu Pemasukan Gudang",
+        "stock_age": "Usia Inventaris",
+        "produce_age": "Durasi Produksi (hari)",
+        "reason_for_overdue": "Alasan Keterlambatan",
+        "box_weight": "Berat Kotor",
         "documentNumber": "Nomor Dokumen",
         "biheight": "Tinggi",
         "biwidth": "Lebar",

lms/nladmin-system/src/main/resources/language/i18n/zh.js

@@ -93,6 +93,11 @@ var config = {
         "correspondingDeepLocationError": "对应的深货位错误!"
     },
     "common": {
+        "warehousing_time":"入库时间",
+        "stock_age":"库龄",
+        "produce_age":"生产时长（天）",
+        "reason_for_overdue":"超期原因",
+        "box_weight":"毛重",
         "documentNumber": "单据号",
         "biheight":"高度",
         "biwidth":"宽度",
@@ -179,7 +184,7 @@ var config = {
         "syscompanyid": "公司ID",
         "sysdeptid": "部门ID",
         "product_name": "产品编码",
-        "package_box_sn": "木箱唯一码",
+        "package_box_sn": "木箱码",
         "ext_code": "外部编码",
         "bill_code": "单据编号",
         "io_type": "出入类型",
@@ -1542,7 +1547,7 @@ var config = {
         "product_description": "产品描述",
         "product_name": "产品编码",
         "quality_guaran_period": "保质期",
-        "quanlity_in_box": "箱内子卷数量",
+        "quanlity_in_box": "子卷数",
         "real_weight": "实际木箱自身重量",
         "remark": "备注",
         "sale_order_description": "销售订单描述",