From 1e643b7beb7ae711803b47285ca0aa7f2c1eb926 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 二月 2025 10:13:45 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev

---
 rsf-admin/src/i18n/en.js |   79 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 78 insertions(+), 1 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index e356675..921ae49 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -106,7 +106,9 @@
     },
     menu: {
         dashboard: 'Dashboard',
+        basicInfo: 'BasicInfo',
         settings: 'Settings',
+        basicInfo: 'BasicInfo',
         system: 'System',
         user: 'User',
         role: 'Role',
@@ -118,6 +120,13 @@
         config: 'Config',
         tenant: 'Tenant',
         userLogin: 'Token',
+        customer: 'Customer',
+        shipper: 'shipper',
+        matnr: 'Matnr',
+        matnrGroup: 'MatnrGroup',
+        warehouse: 'Warehouse',
+        warehouseAreas: 'WarehouseAreas',
+
     },
     table: {
         field: {
@@ -135,6 +144,7 @@
             tenant: {
                 name: "name",
                 flag: "flag",
+                root: "root",
             },
             role: {
                 name: "name",
@@ -217,17 +227,83 @@
                 result: "result",
                 userId: "user",
             },
+            customer: {
+                uuid: "uuid",
+                name: "name",
+            },
+            shipper: {
+                uuid: "uuid",
+                name: "name",
+            },
+            matnr: {
+                name: "name",
+                code: "code",
+                shipperId: "shipperId",
+                groupId: "groupId",
+                rglarId: "RegularId",
+                erpCode: "erpCode",
+                spec: "spec",
+                model: "model",
+                weight: "weight",
+                color: "color",
+                size: "size",
+                describle: "describle",
+                nromNum: "nromNum",
+                unit: "unit",
+                purUnit: "purchaseUnit",
+                stockUnit: "stockUnit",
+                stockLevel: "stockLeval",
+                isLabelMange: "isLabelMange",
+                safeQty: "safetyQty",
+                minQty: "minQty",
+                maxQty: "maxQty",
+                stagn: "stagnate",
+                valid: "validity",
+                validWarn: "validityWarn",
+                flagCheck: "flagCheck",
+            },
+            matnrGroup: {
+                name: "name",
+                code: "code",
+                parentId: "parentId",
+            },
+            warehouse: {
+                name: "name",
+                code: "code",
+                factory: "factory",
+                address: "address",
+                longitude: "longitude",
+                latgitude: "latgitude",
+                length: "length",
+                width: "width",
+                height: "height",
+            },
+            warehouseAreas: {
+                uuid: "uuid",
+                name: "name",
+                code: "code",
+                shipperId: "shipperId",
+                supplierId: "supplierId",
+                flagMinus: "flagMinus",
+                flagLabelMange: "flagLabelMange",
+                flagMix: "flagMix",
+            },
         }
     },
     page: {
-        welcome: '    Welcome to the RSF Management System.',
+        welcome: {
+            index: '    Welcome to the RSF Management System.',
+            tech: '    Technology stack: Java 17, SpringBoot2.5.3, Mybatis-plus_3.4.1, Spring Security, Druid 1.2.6, Redis, Mysql5.7, Node18, ReactJs, Material UI5.16, Axios, React-Admin5.1'
+        },
         login: {
             title: 'Welcome',
             footer: 'Footer Goes Here',
             tenant: 'Company',
+            email: 'Email Address',
             username: 'Username',
             password: 'Password',
             confirmPwd: 'Confirm Password',
+            code: 'Verification Code',
             tab: {
                 login: 'SIGN IN',
                 register: 'SIGN UP',
@@ -235,6 +311,7 @@
             button: {
                 login: 'SIGN IN',
                 register: 'SIGN UP',
+                code: 'Send Code',
             },
         },
         settings: {

--
Gitblit v1.9.1