From ad84e7d81cbd3fd7d9e7fed430d2004c0f43fc0a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 18 二月 2025 09:47:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev

---
 rsf-admin/src/i18n/zh.js |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 48ec586..53667aa 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -107,6 +107,7 @@
     menu: {
         dashboard: '鎺у埗鍙�',
         settings: '涓汉璁剧疆',
+        basicInfo: '鍩虹淇℃伅',
         system: '绯荤粺璁剧疆',
         user: '鐢ㄦ埛绠$悊',
         role: '瑙掕壊绠$悊',
@@ -232,24 +233,31 @@
                 name: "鍚嶇О",
             },
             matnr: {
-                uuid: "缂栫爜",
-                shipperId: "璐т富ID",
-                name: "鍚嶇О",
+                name: "鐗╂枡鍚嶇О",
                 code: "鐗╂枡缂栫爜",
-                groupId: "鍒嗙被鏍囪瘑",
+                shipperId: "璐т富鏍囪瘑",
+                groupId: "鍒嗙粍鏍囪瘑",
+                batchRegularId: "鎵规瑙勫垯鏍囪瘑",
                 erpCode: "ERP缂栫爜",
                 spec: "瑙勬牸",
                 model: "鍨嬪彿",
                 weight: "閲嶉噺",
                 color: "棰滆壊",
                 size: "灏哄",
-                desc: "鎻忚堪",
+                describle: "鎻忚堪",
                 nromNum: "鏍囧寘鏁伴噺",
                 unit: "鍗曚綅",
                 purchaseUnit: "閲囪喘鍗曚綅",
                 stockUnit: "搴撳瓨鍗曚綅",
                 stockLeval: "ABC鍒嗙被",
-                isLabelMange: "鏄惁鏍囩绠$悊",
+                isLabelMange: "鏍囩绠$悊",
+                safetyQty: "瀹夊叏鍊�",
+                minQty: "鏈�灏忓��",
+                maxQty: "鏈�澶у��",
+                stagnate: "鍋滄粸棰勮鍊�",
+                validity: "淇濊川鏈�",
+                validityWarr: "鏁堟湡棰勮",
+                flagCheck: "鍏嶆",
             },
             matnrGroup: {
                 name: "鍚嶇О",

--
Gitblit v1.9.1