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/zh.js |  146 +++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 136 insertions(+), 10 deletions(-)

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index bc97763..c617d17 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -1,3 +1,4 @@
+import { s } from "motion/react-client";
 import chineseMessages from "./core/chineseMessages";
 
 const customChineseMessages = {
@@ -107,8 +108,7 @@
     menu: {
         dashboard: '鎺у埗鍙�',
         settings: '涓汉璁剧疆',
-        basicSettings: '鍩虹璁剧疆',
-        pakin: '缁勬墭',
+        basicInfo: '鍩虹淇℃伅',
         system: '绯荤粺璁剧疆',
         user: '鐢ㄦ埛绠$悊',
         role: '瑙掕壊绠$悊',
@@ -124,6 +124,16 @@
         shipper: '璐т富淇℃伅',
         matnr: '鐗╂枡琛�',
         matnrGroup: '鐗╂枡鍒嗙粍',
+        warehouse: '浠撳簱淇℃伅',
+        warehouseAreas: '浠撳簱搴撳尯',
+        loc: '鍩虹搴撲綅',
+        container: '瀹瑰櫒绠$悊',
+        contract: '鍚堝悓淇℃伅',
+        qlyInspect: '璐ㄦ淇℃伅',
+        dictType: '鏁版嵁瀛楀吀',
+        dictData: '瀛楀吀鏁版嵁闆�',
+        companys: '寰�鏉ヤ紒涓�',
+
 
     },
     table: {
@@ -234,30 +244,132 @@
                 name: "鍚嶇О",
             },
             matnr: {
-                uuid: "缂栫爜",
-                shipperId: "璐т富ID",
-                name: "鍚嶇О",
+                name: "鐗╂枡鍚嶇О",
                 code: "鐗╂枡缂栫爜",
-                groupId: "鍒嗙被鏍囪瘑",
+                shipperId: "璐т富鏍囪瘑",
+                groupId: "鍒嗙粍鏍囪瘑",
+                rglarId: "鎵规瑙勫垯鏍囪瘑",
                 erpCode: "ERP缂栫爜",
                 spec: "瑙勬牸",
                 model: "鍨嬪彿",
                 weight: "閲嶉噺",
                 color: "棰滆壊",
                 size: "灏哄",
-                desc: "鎻忚堪",
+                describle: "鎻忚堪",
                 nromNum: "鏍囧寘鏁伴噺",
                 unit: "鍗曚綅",
-                purchaseUnit: "閲囪喘鍗曚綅",
+                purUnit: "閲囪喘鍗曚綅",
                 stockUnit: "搴撳瓨鍗曚綅",
-                stockLeval: "ABC鍒嗙被",
-                isLabelMange: "鏄惁鏍囩绠$悊",
+                stockLevel: "ABC鍒嗙被",
+                isLabelMange: "鏍囩绠$悊",
+                safeQty: "瀹夊叏鍊�",
+                minQty: "鏈�灏忓��",
+                maxQty: "鏈�澶у��",
+                stagn: "鍋滄粸棰勮鍊�",
+                valid: "淇濊川鏈�",
+                validWarn: "鏁堟湡棰勮",
+                flagCheck: "鍏嶆",
             },
             matnrGroup: {
                 name: "鍚嶇О",
                 code: "缂栫爜",
                 parentId: "鐖剁被鏍囪瘑",
             },
+            warehouse: {
+                name: "鍚嶇О",
+                code: "缂栫爜",
+                factory: "宸ュ巶",
+                address: "鍦板潃",
+                longitude: "缁忓害",
+                latgitude: "绾害",
+                length: "闀�",
+                width: "瀹�",
+                height: "楂�",
+            },
+            warehouseAreas: {
+                uuid: "鍞竴缂栫爜",
+                name: "鍚嶇О",
+                code: "缂栫爜",
+                shipperId: "璐т富",
+                supplierId: "渚涘簲鍟�",
+                flagMinus: "鍏佽璐熷簱瀛�",
+                flagLabelMange: "鏍囩绠$悊",
+                flagMix: "娣锋斁",
+            },
+            loc: {
+                areaId: "搴撳尯鏍囪瘑",
+                code: "缂栫爜",
+                type: "绫诲瀷",
+                name: "鍚嶇О",
+                flagLogic: "铏氭嫙搴撲綅",
+                fucAtrrs: "鍔熻兘灞炴��",
+                barcode: "瀹瑰櫒鐮�",
+                unit: "鍗曚綅",
+                size: "闀�/瀹�/楂�",
+                row: "鎺�",
+                col: "鍒�",
+                lev: "灞�",
+                channel: "閫氶亾",
+                maxParts: "鏈�澶ч浂浠舵暟",
+                maxPack: "鏈�澶у寘瑁呮暟",
+                flagLabelMange: "鏍囩绠$悊",
+                locAttrs: "灞炴��",
+            },
+
+            container: {
+                code: "缂栫爜",
+                name: "鍚嶇О",
+                typeId: "绫诲瀷",
+                used: "浣跨敤娆℃暟",
+                lenght: "闀垮害",
+                width: "瀹�",
+                height: "楂�",
+                rstLen: "闄愰暱",
+                rstWid: "闄愬",
+                rstWei: "闄愰噸",
+                rstHei: "闄愰珮",
+                panrentId: "鐖剁骇",
+                vaildTime: "鏈夋晥鏈�",
+                flagRycle: "鍥炴敹",
+                flagLogic: "铏氭嫙瀹瑰櫒",
+            },
+            contract: {
+                code: "缂栫爜",
+                name: "鍚嶇О",
+                projectName: "椤圭洰鍚嶇О",
+            },
+            qlyInspect: {
+                code: "缂栫爜",
+                name: "鍚嶇О",
+            },
+            dictType: {
+                code: "瀛楀吀缂栫爜",
+                name: "瀛楀吀鍚嶇О",
+                description: "鍐呭鎻忚堪",
+            },
+            dictData: {
+                dictTypeId: "瀛楀吀鏍囪瘑",
+                dictTypeCode: "瀛楀吀缂栫爜",
+                value: "鍊�",
+                label: "鍒悕",
+                sort: "鎺掑簭",
+                color: "棰滆壊",
+            },
+            companys: {
+                code: "浼佷笟缂栫爜",
+                name: "鍚嶇О",
+                nameEn: "鑻辨枃鍒悕",
+                breifCode: "鍔╄鐮�",
+                type: "绫诲瀷",
+                contact: "鑱旂郴浜�",
+                tel: "鑱旂郴鐢佃瘽",
+                email: "鐢靛瓙閭欢",
+                pcode: "閭紪",
+                province: "鐪佷唤",
+                city: "鍩庡競",
+                address: "鍦板潃",
+            },
+
         }
     },
     page: {
@@ -314,6 +426,20 @@
                 },
             },
         },
+        matnr: {
+            title: {
+                basic: '鍩虹灞炴��',
+                control: '鎺у埗灞炴��',
+                batchRole: '鎵规瑙勫垯',
+            }
+        }
+    },
+    form: {
+        matnr: {
+            name: '鐗╂枡鍚嶇О涓嶈兘涓虹┖',
+            shipper: '璐т富涓嶈兘涓虹┖',
+            groupId: '鍒嗙粍涓嶈兘涓虹┖',
+        }
     }
 };
 

--
Gitblit v1.9.1