From 031e36213941ad3430da2b0429701e742f09f5d8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 18 三月 2025 11:14:20 +0800
Subject: [PATCH] Merge branch 'front' into devlop

---
 rsf-admin/src/i18n/zh.js |  104 ++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 88 insertions(+), 16 deletions(-)

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index c3db3fc..889ea39 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -68,6 +68,7 @@
             deprecate: '搴熷純',
             resend: '閲嶅彂',
             selected: '椤归�変腑',
+            batch: '鎵归噺缂栬緫'
         },
         msg: {
             confirm: {
@@ -121,7 +122,7 @@
         userLogin: '鐧诲綍鏃ュ織',
         customer: '瀹㈡埛琛�',
         shipper: '璐т富淇℃伅',
-        matnr: '鐗╂枡琛�',
+        matnr: '鐗╂枡鏁版嵁',
         matnrGroup: '鐗╂枡鍒嗙粍',
         warehouse: '浠撳簱淇℃伅',
         warehouseAreas: '浠撳簱搴撳尯',
@@ -139,6 +140,9 @@
         purchase: 'PO鍗�',
         purchaseItem: 'PO鍗曟槑缁�',
         whMat: '搴撳尯鐗╂枡鍏崇郴',
+        fields: '鎵╁睍瀛楁',
+        fieldsItem: '鎵╁睍瀛楁鏄庣粏',
+        warehouseAreasItem: '搴撳尯搴撳瓨淇℃伅',
     },
     table: {
         field: {
@@ -253,7 +257,7 @@
                 shipperId: "璐т富鏍囪瘑",
                 groupId: "鍒嗙粍鏍囪瘑",
                 rglarId: "鎵规瑙勫垯鏍囪瘑",
-                erpCode: "ERP缂栫爜",
+                platCode: "ERP缂栫爜",
                 spec: "瑙勬牸",
                 model: "鍨嬪彿",
                 weight: "閲嶉噺",
@@ -277,18 +281,18 @@
             matnrGroup: {
                 name: "鍚嶇О",
                 code: "缂栫爜",
-                parentId: "鐖剁被鏍囪瘑",
+                parentId: "涓婄骇鏍囪瘑",
             },
             warehouse: {
-                name: "鍚嶇О",
+                name: "浠撳簱鍚嶇О",
                 code: "缂栫爜",
                 factory: "宸ュ巶",
                 address: "鍦板潃",
                 longitude: "缁忓害",
                 latgitude: "绾害",
-                length: "闀�",
-                width: "瀹�",
-                height: "楂�",
+                length: "闀�(m)",
+                width: "瀹�(m)",
+                height: "楂�(m)",
             },
             warehouseAreas: {
                 uuid: "鍞竴缂栫爜",
@@ -300,17 +304,39 @@
                 flagLabelMange: "鏍囩绠$悊",
                 flagMix: "娣锋斁",
             },
+            warehouseAreasItem: {
+                areaId: "浠撳簱鍖哄煙",
+                areaName: "鍖哄煙鍚嶇О	",
+                matnrId: "鐗╂枡鏍囪瘑",
+                matnrName: "鐗╂枡鍚嶇О",
+                matnrCode: "鐗╂枡缂栫爜",
+                fieldsIndex: "鎵╁睍瀛楁鍞竴鏍囪瘑",
+                barcode: "鏉″舰鐮�",
+                anfme: "鏁伴噺",
+                batch: "鎵规鍙�",
+                unit: "璁¢噺鍗曚綅",
+                stockUnit: "搴撳瓨鍗曚綅",
+                brand: "鍝佺墝",
+                shipperId: "璐т富鏍囪瘑",
+                splrId: "渚涘簲鍟嗘爣璇�",
+                weight: "鏀惰揣閲嶉噺",
+                prodTime: "鐢熶骇鏃ユ湡",
+                splrBtch: "渚涘簲鍟嗘壒娆�",
+            },
             loc: {
                 warehouseId: "浠撳簱",
                 areaId: "搴撳尯",
                 code: "缂栫爜",
-                type: "绫诲瀷",
+                type: "搴撲綅绫诲瀷",
                 name: "鍚嶇О",
                 flagLogic: "铏氭嫙搴撲綅",
                 fucAtrrs: "鍔熻兘灞炴��",
                 barcode: "瀹瑰櫒鐮�",
                 unit: "鍗曚綅",
                 size: "闀�/瀹�/楂�",
+                length: "闀�",
+                width: "瀹�",
+                height: "楂�",
                 row: "鎺�",
                 col: "鍒�",
                 lev: "灞�",
@@ -319,6 +345,13 @@
                 maxPack: "鏈�澶у寘瑁呮暟",
                 flagLabelMange: "鏍囩绠$悊",
                 locAttrs: "灞炴��",
+                endBay: "缁堟鍒�",
+                endLev: "缁堟灞�",
+                endRow: "缁堟鎺�",
+                locType: "瀹界獎绫诲瀷",
+                startBay: "璧峰鍒�",
+                startLev: "璧峰灞�",
+                startRow: "璧峰鎺�",
             },
 
             container: {
@@ -345,12 +378,30 @@
             },
             qlyInspect: {
                 code: "缂栫爜",
-                name: "鍚嶇О",
+                wkType: "wkType",
+                safeQty: "鍚堟牸鏁伴噺",
+                dlyQty: "dlyQty",
+                rcptQty: "rcptQty",
+                isptQty: "isptQty",
+            },
+            qlyIsptItem: {
+                ispectId: "ispectId",
+                matnrCode: "matnrCode",
+                maktx: "maktx",
+                label: "label",
+                splrName: "splrName",
+                splrBatch: "splrBatch",
+                stockBatch: "stockBatch",
+                rcptQty: "rcptQty",
+                dlyQty: "dlyQty",
+                disQty: "disQty",
+                safeQty: "safeQty",
+                picPath: "picPath",
             },
             dictType: {
                 code: "瀛楀吀缂栫爜",
                 name: "瀛楀吀鍚嶇О",
-                description: "鍐呭鎻忚堪",
+                description: "鍐呭",
             },
             dictData: {
                 dictTypeId: "瀛楀吀鏍囪瘑",
@@ -409,7 +460,7 @@
                 wkType: "涓氬姟绫诲瀷",
                 anfme: "鏁伴噺",
                 qty: "宸插畬鎴愭暟閲�",
-                logisNo: "logisNo",
+                logisNo: "鐗╂祦鍗曞彿",
                 arrTime: "棰勮鍒拌揪鏃堕棿",
                 rleStatus: "閲婃斁鐘舵��",
                 ntyStatus: "璐ㄦ涓婃姤鐘舵��",
@@ -420,7 +471,7 @@
                 poDetlId: "PO鍗曟爣璇�",
                 poDetlCode: "PO鍗曠紪鐮�",
                 matnrId: "鐗╂枡鏍囪瘑",
-                matnk: "鐗╂枡鍚嶇О",
+                maktx: "鐗╂枡鍚嶇О",
                 anfme: "鏁伴噺",
                 stockUnit: "搴撳瓨鍗曚綅",
                 purQty: "閲囪喘鏁伴噺",
@@ -435,7 +486,7 @@
             },
             purchase: {
                 code: "缂栫爜",
-                erpId: "erp鏍囪瘑",
+                platId: "骞冲彴鏍囪瘑",
                 type: "鍗曟嵁绫诲瀷",
                 wkType: "涓氬姟绫诲瀷",
                 source: "鏉ユ簮",
@@ -444,7 +495,7 @@
                 qty: "宸插畬鎴愭暟閲�",
                 workQty: "鎵ц涓暟閲�",
                 channel: "鏀惰揣閫氶亾",
-                erpCode: "Erp缂栫爜",
+                platCode: "Erp缂栫爜",
                 project: "椤圭洰鍚嶇О",
                 startTime: "寮�濮嬫椂闂�",
                 endTime: "缁撴潫鏃堕棿",
@@ -458,11 +509,24 @@
                 anfme: "鏁伴噺",
                 qty: "宸插畬鎴�",
                 nromQty: "鏍囧寘鏁伴噺",
-                asnQty:  "鍗曟嵁鏁伴噺",
+                asnQty: "鍗曟嵁鏁伴噺",
                 printQty: "鎵撳嵃鏁伴噺",
                 splrName: "渚涘簲鍟嗗悕绉�",
                 splrCode: "渚涘簲鍟嗙紪鐮�",
                 splrBatch: "渚涘簲鍟嗘壒娆�",
+            },
+            fields: {
+                fields: "瀛楁",
+                fieldsAlise: "瀛楁鍒悕",
+                unique: "绱㈠紩瀛楁",
+                flagEnable: "鍚敤",
+            },
+            fieldsItem: {
+                uuid: "鍞竴鏍囪瘑",
+                fieldsId: "涓诲崟瀛楁鏍囪瘑",
+                value: "value",
+                matnrId: "matnrId",
+                shiperId: "shiperId",
             },
         }
     },
@@ -540,7 +604,15 @@
             shipper: '璐т富涓嶈兘涓虹┖',
             groupId: '鍒嗙粍涓嶈兘涓虹┖',
         }
-    }
+    },
+    toolbar: {
+        inspection: "鎶ユ",
+        creatcode: "鐢熸垚鏉$爜",
+        print: "鎵撳嵃",
+        enable: '鍚敤',
+        unenable: '绂佺敤',
+        locInit: '聽搴撲綅鍒濆鍖�'
+    },
 };
 
 export default customChineseMessages;

--
Gitblit v1.9.1