From c3949ec79f06e7bdee9c3a12367bd97ddf46e033 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 24 二月 2025 15:28:38 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev

---
 rsf-admin/src/i18n/en.js |  141 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 134 insertions(+), 7 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 4288984..e65bfbb 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -106,9 +106,9 @@
     },
     menu: {
         dashboard: 'Dashboard',
+        basicInfo: 'BasicInfo',
         settings: 'Settings',
-        pakin: 'Pakin',
-        basicSettings: 'Basic Setting',
+        basicInfo: 'BasicInfo',
         system: 'System',
         user: 'User',
         role: 'Role',
@@ -123,6 +123,19 @@
         customer: 'Customer',
         shipper: 'shipper',
         matnr: 'Matnr',
+        matnrGroup: 'MatnrGroup',
+        warehouse: 'Warehouse',
+        warehouseAreas: 'WarehouseAreas',
+        loc: 'Loc',
+        container: 'Container',
+        contract: 'Contract',
+        qlyInspect: 'QlyInspect',
+        dictType: 'DictType',
+        dictData: 'DictData',
+        companys: 'Companys',
+
+
+
     },
     table: {
         field: {
@@ -232,29 +245,129 @@
                 name: "name",
             },
             matnr: {
-                uuid: "uuid",
-                shipperId: "shipperId",
                 name: "name",
                 code: "code",
+                shipperId: "shipperId",
                 groupId: "groupId",
+                rglarId: "RegularId",
                 erpCode: "erpCode",
                 spec: "spec",
                 model: "model",
                 weight: "weight",
                 color: "color",
                 size: "size",
-                desc: "desc",
+                describle: "describle",
                 nromNum: "nromNum",
                 unit: "unit",
-                purchaseUnit: "purchaseUnit",
+                purUnit: "purchaseUnit",
                 stockUnit: "stockUnit",
-                stockLeval: "stockLeval",
+                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",
+            },
+            loc: {
+                areaId: "areaId",
+                code: "code",
+                type: "type",
+                name: "name",
+                flagLogic: "flagLogic",
+                fucAtrrs: "fucAtrrs",
+                barcode: "barcode",
+                unit: "unit",
+                size: "size",
+                row: "row",
+                col: "col",
+                lev: "lev",
+                channel: "channel",
+                maxParts: "maxParts",
+                maxPack: "maxPack",
+                flagLabelMange: "flagLabelMange",
+                locAttrs: "locAttrs",
+            },
+            container: {
+                code: "code",
+                name: "name",
+                typeId: "typeId",
+                used: "used",
+                lenght: "lenght",
+                width: "width",
+                height: "height",
+                rstLen: "rstLen",
+                rstWid: "rstWid",
+                rstWei: "rstWei",
+                rstHei: "rstHei",
+                panrentId: "panrentId",
+                vaildTime: "vaildTime",
+                flagRycle: "flagRycle",
+                flagLogic: "flagLogic",
+            },
+            contract: {
+                code: "Code",
+                name: "Name",
+                projectName: "ProjectName",
+            },
+            qlyInspect: {
+                code: "code",
+                name: "name",
+            },
+            dictType: {
+                code: "Code",
+                name: "Name",
+                description: "Description",
+            },
+            dictData: {
+                dictTypeId: "dictTypeId",
+                dictTypeCode: "dictTypeCode",
+                value: "value",
+                label: "label",
+                sort: "sort",
+                color: "color",
+            },
+            companys: {
+                code: "Code",
+                name: "Name",
+                nameEn: "NameEn",
+                breifCode: "BreifCode",
+                type: "Type",
+                contact: "Contact",
+                tel: "Tel",
+                email: "Email",
+                pcode: "PCode",
+                province: "Province",
+                city: "City",
+                address: "Address",
             },
         }
     },
@@ -312,6 +425,20 @@
                 },
             },
         },
+        matnr: {
+            title: {
+                basic: 'basic info',
+                control: 'control',
+                batchRole: 'batch role',
+            }
+        },
+        
+    },
+    form: {
+        matnr: {
+            shipper: 'shipper is required',
+            groupId: 'groupId is required',
+        }
     }
 };
 

--
Gitblit v1.9.1