From 626147af938796224b8e81c0a30073a561af5642 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 25 三月 2025 13:55:39 +0800
Subject: [PATCH] Merge branch 'front' into devlop

---
 rsf-admin/src/i18n/zh.js |   66 ++++++++++++++++++++++++++++-----
 1 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 31ca842..a1976a7 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -13,8 +13,8 @@
             id: 'ID',
             uuid: '缂栧彿',
             name: '鍚嶇О',
-            createTime: '娣诲姞鏃堕棿',
-            createBy: '娣诲姞浜哄憳',
+            createTime: '鍒涘缓鏃堕棿',
+            createBy: '鍒涘缓浜哄憳',
             updateTime: '淇敼鏃堕棿',
             updateBy: '淇敼浜哄憳',
             status: '鐘舵��',
@@ -122,11 +122,15 @@
         userLogin: '鐧诲綍鏃ュ織',
         customer: '瀹㈡埛琛�',
         shipper: '璐т富淇℃伅',
-        matnr: '鐗╂枡鏁版嵁',
+        matnr: '鐗╂枡',
         matnrGroup: '鐗╂枡鍒嗙粍',
-        warehouse: '浠撳簱淇℃伅',
-        warehouseAreas: '浠撳簱搴撳尯',
-        loc: '鍩虹搴撲綅',
+        warehouse: '浠撳簱',
+        warehouseAreas: '搴撳尯',
+        loc: '搴撲綅',
+        locType: '搴撲綅绫诲瀷',
+        locArea: '閫昏緫鍒嗗尯',
+        locAreaMat: '閫昏緫鍒嗗尯',
+        locAreaMatRela: '搴撳尯鐗╂枡鍏崇郴',
         container: '瀹瑰櫒绠＄悊',
         contract: '鍚堝悓淇℃伅',
         qlyInspect: '璐ㄦ淇℃伅',
@@ -282,6 +286,7 @@
                 name: "鍚嶇О",
                 code: "缂栫爜",
                 parentId: "涓婄骇鏍囪瘑",
+                parCode: "涓婄骇缂栫爜",
             },
             warehouse: {
                 name: "浠撳簱鍚嶇О",
@@ -297,6 +302,7 @@
             warehouseAreas: {
                 uuid: "鍞竴缂栫爜",
                 name: "鍚嶇О",
+                wareId: "鎵�灞炰粨搴�",
                 code: "缂栫爜",
                 shipperId: "璐т富",
                 supplierId: "渚涘簲鍟�",
@@ -324,10 +330,10 @@
                 splrBtch: "渚涘簲鍟嗘壒娆�",
             },
             loc: {
-                warehouseId: "浠撳簱",
-                areaId: "搴撳尯",
+                warehouseId: "鎵�灞炰粨搴�",
+                areaId: "鎵�灞炲簱鍖�",
                 code: "缂栫爜",
-                type: "绫诲瀷",
+                type: "搴撲綅绫诲瀷",
                 name: "鍚嶇О",
                 flagLogic: "铏氭嫙搴撲綅",
                 fucAtrrs: "鍔熻兘灞炴��",
@@ -345,8 +351,39 @@
                 maxPack: "鏈�澶у寘瑁呮暟",
                 flagLabelMange: "鏍囩绠＄悊",
                 locAttrs: "灞炴��",
+                endBay: "缁堟鍒�",
+                endLev: "缁堟灞�",
+                endRow: "缁堟鎺�",
+                locType: "瀹界獎绫诲瀷",
+                startBay: "璧峰鍒�",
+                startLev: "璧峰灞�",
+                startRow: "璧峰鎺�",
+                useStatus: '搴撲綅鐘舵��',
+                locAreaId: '閫昏緫鍒嗗尯'
             },
-
+            locType: {
+                name: "搴撲綅绫诲瀷",
+                code: "缂栧彿",
+                regex: "瑙勫垯琛ㄨ揪寮�",
+            },
+            locArea: {
+                name: "鍚嶇О",
+                code: "缂栫爜",
+                areaId: "搴撳尯",
+                locId: "搴撲綅",
+            },
+            locAreaMat: {
+                code: "閫昏緫缂栫爜",
+                depict: "閫昏緫鎻忚堪",
+            },
+            locAreaMatRela: {
+                areaId: "搴撳尯",
+                code: "缂栫爜",
+                matnrId: "鐗╂枡",
+                groupId: "鐗╂枡鍒嗙粍",
+                locTypeId: "搴撲綅绫诲瀷",
+                locId: "搴撲綅",
+            },
             container: {
                 code: "缂栫爜",
                 name: "鍚嶇О",
@@ -602,6 +639,15 @@
         inspection: "鎶ユ",
         creatcode: "鐢熸垚鏉＄爜",
         print: "鎵撳嵃",
+        enable: '鍚敤',
+        unenable: '绂佺敤',
+        locInit: '聽搴撲綅鍒濆鍖�',
+        batch: '鎵归噺鎿嶄綔',
+        confirm: '纭',
+        subzone: '缁戝畾鍒嗗尯',
+        bindmatnr: '缁戝畾鐗╂枡',
+        bindloc: '缁戝畾搴撲綅',
+        batchMatnrGropu: '鎵归噺鐗╂枡鍒嗙粍',
     },
 };
 

--
Gitblit v1.9.1