From 8eaee61fbbdea1eaa294b0f1a7d9f2a10da9ade9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 10 三月 2025 17:06:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev

---
 rsf-admin/src/i18n/zh.js |  176 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 136 insertions(+), 40 deletions(-)

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index afff7b2..c3db3fc 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -1,4 +1,3 @@
-import { s } from "motion/react-client";
 import chineseMessages from "./core/chineseMessages";
 
 const customChineseMessages = {
@@ -129,11 +128,17 @@
         loc: '鍩虹搴撲綅',
         container: '瀹瑰櫒绠$悊',
         contract: '鍚堝悓淇℃伅',
-        stockItem: '搴撳瓨鏄庣粏',
-        stock: '搴撳瓨淇℃伅',
         qlyInspect: '璐ㄦ淇℃伅',
-
-
+        dictType: '鏁版嵁瀛楀吀',
+        dictData: '瀛楀吀鏁版嵁闆�',
+        companys: '寰�鏉ヤ紒涓�',
+        serialRuleItem: '缂栫爜瑙勫垯瀛愯〃',
+        serialRule: '缂栫爜瑙勫垯',
+        asnOrder: '鏀惰揣閫氱煡鍗�',
+        asnOrderItem: '鏀惰揣鏄庣粏',
+        purchase: 'PO鍗�',
+        purchaseItem: 'PO鍗曟槑缁�',
+        whMat: '搴撳尯鐗╂枡鍏崇郴',
     },
     table: {
         field: {
@@ -296,7 +301,8 @@
                 flagMix: "娣锋斁",
             },
             loc: {
-                areaId: "搴撳尯鏍囪瘑",
+                warehouseId: "浠撳簱",
+                areaId: "搴撳尯",
                 code: "缂栫爜",
                 type: "绫诲瀷",
                 name: "鍚嶇О",
@@ -337,43 +343,127 @@
                 name: "鍚嶇О",
                 projectName: "椤圭洰鍚嶇О",
             },
-            stock: {
-                asnOrder: "搴撳瓨鍗曟嵁",
-                erpToken: "ERP鍑瘉",
-                erpOrder: "ERP鍗曟嵁",
-                erpStkAdr: "ERP搴撳瓨鍦�",
-                contractId: "鍚堝悓鏍囪瘑",
-                lockReason: "鍔犻攣鍘熷洜",
-                lockStatus: "鍔犺浇鐘舵��",
-                locker: "鍔犻攣浜�",
-                lockedTime: "鍔犻攣鏃堕棿",
-            },
-            stockItem: {
-                stockId: "搴撳瓨鏍囪瘑",
-                matnrId: "鐗╂枡鏍囪瘑",
-                code: "鐗╂枡缂栫爜",
-                matnrk: "鐗╂枡鍚嶇О",
-                anfme: "鏁伴噺",
-                workQty: "鎵ц涓暟閲�",
-                qty: "宸插畬鎴愭暟閲�",
-                weight: "閲嶉噺",
-                unit: "鍗曚綅",
-                shipperId: "璐т富",
-                splrId: "渚涘簲鍟�",
-                brand: "鍝佺墝",
-                batch: "鎵规",
-                prodTime: "鐢熶骇鏃ユ湡",
-                inspectId: "璐ㄦ煡鏍囪瘑",
-                splrBtch: "渚涘簲鍟嗘壒娆�",
-                locId: "搴撲綅鏍囪瘑",
-                barcode: "瀹瑰櫒缂栫爜",
-                purPrice: "閲囪喘浠�",
-            },
             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: "鍦板潃",
+            },
+            serialRuleItem: {
+                ruleId: "瑙勫垯鏍囪瘑",
+                wkType: "瑙勫垯绫诲瀷",
+                feildValue: "瑙勫垯鍙傛暟",
+                len: "鎴彇闀垮害",
+                lenStr: "鎴彇璧峰浣嶇疆",
+                sort: "鎺掑簭",
+            },
+            serialRule: {
+                code: "瑙勫垯缂栫爜",
+                name: "瑙勫垯鍚嶇О",
+                delimit: "鍒嗛殧绗�",
+                reset: "閲嶇疆瑙勫垯",
+                resetDep: "閲嶇疆渚濊禆",
+                currValue: "褰撳墠娴佹按鍙�",
+                lastCode: "鏈�杩戠敓鎴愮紪鐮�",
+            },
+            whMat: {
+                matnrCode: "鐗╂枡缂栫爜",
+                matnrName: "鐗╂枡鍚嶇О",
+                matnrGroupId: "鐗╂枡鍒嗙粍",
+                spec: "瑙勬牸",
+                color: "棰滆壊",
+                size: "灏哄",
+                minWeight: "鏈�灏忛噸閲�",
+                maxWeight: "鏈�澶ч噸閲�",
+            },
+            asnOrder: {
+                code: "缂栫爜",
+                poCode: "PO缂栫爜",
+                poId: "PO鏍囪瘑",
+                type: "鍗曟嵁绫诲瀷",
+                wkType: "涓氬姟绫诲瀷",
+                anfme: "鏁伴噺",
+                qty: "宸插畬鎴愭暟閲�",
+                logisNo: "logisNo",
+                arrTime: "棰勮鍒拌揪鏃堕棿",
+                rleStatus: "閲婃斁鐘舵��",
+                ntyStatus: "璐ㄦ涓婃姤鐘舵��",
+            },
+            asnOrderItem: {
+                asnId: "涓诲崟鏍囪瘑",
+                asnCode: "涓诲崟缂栫爜",
+                poDetlId: "PO鍗曟爣璇�",
+                poDetlCode: "PO鍗曠紪鐮�",
+                matnrId: "鐗╂枡鏍囪瘑",
+                matnk: "鐗╂枡鍚嶇О",
+                anfme: "鏁伴噺",
+                stockUnit: "搴撳瓨鍗曚綅",
+                purQty: "閲囪喘鏁伴噺",
+                purUnit: "閲囪喘鍗曚綅",
+                qty: "宸插畬鎴愭暟閲�",
+                splrCode: "渚涘簲鍟嗙紪鐮�",
+                splrName: "渚涘簲鍟嗗悕绉�",
+                qrcode: "浜岀淮鐮�",
+                barcode: "鏉″舰鐮�",
+                packName: "鍖呰鍚嶇О",
+                ntyStatus: "鎶ユ鐘舵��",
+            },
+            purchase: {
+                code: "缂栫爜",
+                erpId: "erp鏍囪瘑",
+                type: "鍗曟嵁绫诲瀷",
+                wkType: "涓氬姟绫诲瀷",
+                source: "鏉ユ簮",
+                preArr: "棰勮鍒拌揪",
+                anfme: "鏁伴噺",
+                qty: "宸插畬鎴愭暟閲�",
+                workQty: "鎵ц涓暟閲�",
+                channel: "鏀惰揣閫氶亾",
+                erpCode: "Erp缂栫爜",
+                project: "椤圭洰鍚嶇О",
+                startTime: "寮�濮嬫椂闂�",
+                endTime: "缁撴潫鏃堕棿",
+            },
+            purchaseItem: {
+                purchaseId: "PO涓诲崟鏍囪瘑",
+                platItemId: "erp鏄庣粏鏍囪瘑",
+                matnrCode: "鐗╂枡缂栫爜",
+                matnrName: "鐗╂枡鍚嶇О",
+                unit: "璁¢噺鍗曚綅",
+                anfme: "鏁伴噺",
+                qty: "宸插畬鎴�",
+                nromQty: "鏍囧寘鏁伴噺",
+                asnQty:  "鍗曟嵁鏁伴噺",
+                printQty: "鎵撳嵃鏁伴噺",
+                splrName: "渚涘簲鍟嗗悕绉�",
+                splrCode: "渚涘簲鍟嗙紪鐮�",
+                splrBatch: "渚涘簲鍟嗘壒娆�",
+            },
         }
     },
     page: {
@@ -436,11 +526,17 @@
                 control: '鎺у埗灞炴��',
                 batchRole: '鎵规瑙勫垯',
             }
-        }
+        },
+        whMat: {
+            title: {
+                add: '娣诲姞',
+            }
+        },
     },
     form: {
         matnr: {
             name: '鐗╂枡鍚嶇О涓嶈兘涓虹┖',
+            code: '鐗╂枡缂栫爜涓嶈兘涓虹┖',
             shipper: '璐т富涓嶈兘涓虹┖',
             groupId: '鍒嗙粍涓嶈兘涓虹┖',
         }

--
Gitblit v1.9.1