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 |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 8130e2f..fe02573 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -128,6 +128,9 @@
         warehouseAreas: 'WarehouseAreas',
         loc: 'Loc',
         locType: 'LocType',
+        locArea: 'locArea',
+        LocAreaMat: 'LocAreaMat',
+        locAreaMatRela: 'LocAreaMatRela',
         container: 'Container',
         contract: 'Contract',
         qlyInspect: 'QlyInspect',
@@ -353,10 +356,12 @@
                 maxPack: "MaxPack",
                 flagLabelMange: "FlagLabelMange",
                 locAttrs: "LocAttrs",
-                useStatus: 'useStatus'
+                useStatus: 'useStatus',
+                locAreaId: 'locAreaId'
             },
             locType: {
                 uuid: "uuid",
+                code: "code",
                 name: "name",
                 regex: "regex",
             },
@@ -364,6 +369,18 @@
                 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: {
@@ -623,6 +640,10 @@
         unenable: 'unenable',
         locInit: 'loc init',
         batch: 'batch',
+        confirm: 'confirm',
+        subzone: 'subzone',
+        bindmatnr: 'bind matnr',
+        bindloc: 'bind loc',
     },
 };
 

--
Gitblit v1.9.1