From eb8ded2565e746a360985f702c556b26f750d35a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 25 三月 2025 09:07:51 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/i18n/en.js |   73 +++++++++++++++++++++++++++++++++---
 1 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index c0a1107..fe02573 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -68,6 +68,7 @@
             deprecate: 'Deprecate',
             resend: 'RESEND',
             selected: 'selected',
+            batch: 'batch'
         },
         msg: {
             confirm: {
@@ -106,7 +107,6 @@
     },
     menu: {
         dashboard: 'Dashboard',
-        basicInfo: 'BasicInfo',
         settings: 'Settings',
         basicInfo: 'BasicInfo',
         system: 'System',
@@ -127,6 +127,10 @@
         warehouse: 'Warehouse',
         warehouseAreas: 'WarehouseAreas',
         loc: 'Loc',
+        locType: 'LocType',
+        locArea: 'locArea',
+        LocAreaMat: 'LocAreaMat',
+        locAreaMatRela: 'LocAreaMatRela',
         container: 'Container',
         contract: 'Contract',
         qlyInspect: 'QlyInspect',
@@ -143,6 +147,12 @@
         fields: 'Extend Fields',
         fieldsItem: 'Extend Fields Items',
         warehouseAreasItem: 'WarehouseAreasItem',
+        endBay: "endBay",
+        endLev: "endLev",
+        endRow: "endRow",
+        startBay: "startBay",
+        startLev: "startLev",
+        startRow: "startRow",
     },
     table: {
         field: {
@@ -297,6 +307,7 @@
             warehouseAreas: {
                 uuid: "uuid",
                 name: "name",
+                wareId: "ware",
                 code: "code",
                 shipperId: "shipperId",
                 supplierId: "supplierId",
@@ -334,6 +345,9 @@
                 barcode: "Barcode",
                 unit: "Unit",
                 size: "Size",
+                length: "length",
+                width: "width",
+                height: "height",
                 row: "Row",
                 col: "Col",
                 lev: "Lev",
@@ -342,6 +356,32 @@
                 maxPack: "MaxPack",
                 flagLabelMange: "FlagLabelMange",
                 locAttrs: "LocAttrs",
+                useStatus: 'useStatus',
+                locAreaId: 'locAreaId'
+            },
+            locType: {
+                uuid: "uuid",
+                code: "code",
+                name: "name",
+                regex: "regex",
+            },
+            locArea: {
+                name: "name",
+                code: "code",
+                areaId: "areaId",
+                locId: "locId",
+            },
+            locAreaMat: {
+                code: "code",
+                depict: "depict",
+            },
+            locAreaMatRela: {
+                areaId: "areaId",
+                code: "code",
+                matnrId: "matnrId",
+                groupId: "groupId",
+                locTypeId: "locTypeId",
+                locId: "locId",
             },
             container: {
                 code: "Code",
@@ -367,12 +407,25 @@
             },
             qlyInspect: {
                 code: "code",
-                name: "name",
-                barcode: "barcode",
-                asnItemId: "asnItemId",
-                poItemId: "poItemId",
+                wkType: "wkType",
                 safeQty: "safeQty",
+                dlyQty: "dlyQty",
+                rcptQty: "rcptQty",
+                isptQty: "isptQty",
+            },
+            qlyIsptItem: {
+                ispectId: "ispectId",
+                matnrCode: "matnrCode",
+                maktx: "maktx",
+                label: "label",
+                splrName: "splrName",
+                splrBatch: "splrBatch",
+                stockBatch: "stockBatch",
+                rcptQty: "rcptQty",
+                dlyQty: "dlyQty",
                 disQty: "disQty",
+                safeQty: "safeQty",
+                picPath: "picPath",
             },
             dictType: {
                 code: "Code",
@@ -447,7 +500,7 @@
                 poDetlId: "poDetlId",
                 poDetlCode: "poDetlCode",
                 matnrId: "matnrId",
-                matnk: "matnk",
+                maktx: "maktx",
                 anfme: "anfme",
                 stockUnit: "stockUnit",
                 purQty: "purQty",
@@ -583,6 +636,14 @@
         inspection: "Inspection",
         creatcode: "creatcode",
         print: "print",
+        enable: 'enable',
+        unenable: 'unenable',
+        locInit: 'loc init',
+        batch: 'batch',
+        confirm: 'confirm',
+        subzone: 'subzone',
+        bindmatnr: 'bind matnr',
+        bindloc: 'bind loc',
     },
 };
 

--
Gitblit v1.9.1