From 17f9f7d74b7f2f3344b335441f9bf1653cff03f0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 15:38:52 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/i18n/zh.js |   61 ++++++++++++++++++++++++++----
 1 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 82b5bb0..cd137a4 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -56,6 +56,7 @@
             expand: '灞曞紑',
             expandAll: '鍏ㄩ儴灞曞紑',
             collapse: '鎶樺彔',
+            newAddMats: '鏂板鐗╂枡',
             collapseAll: '鍏ㄩ儴鎶樺彔',
             scope: '鏉冮檺',
             inputPlaceholder: '绔欑偣鍙~澶氫釜锛屼腑闂翠互鑻辨枃閫楀彿鍖哄垎锛�,锛�',
@@ -71,6 +72,7 @@
             loadMore: '鍔犺浇鏇村',
             complete: '瀹屾垚',
             deprecate: '搴熷純',
+            stockError: '娌℃湁搴撳瓨',
             resend: '閲嶅彂',
             selected: '椤归�変腑',
             batch: '鎵归噺缂栬緫'
@@ -155,11 +157,11 @@
         fields: '鎵╁睍瀛楁',
         fieldsItem: '鎵╁睍瀛楁鏄庣粏',
         warehouseAreasItem: '搴撳尯搴撳瓨淇℃伅',
-        deviceSite: '绔欑偣绠$悊',
-        waitPakin: '缁勬嫋閫氱煡妗�',
-        waitPakinItem: '缁勬嫋妗f槑缁�',
-        waitPakinLog: '缁勬嫋鍘嗗彶妗�',
-        waitPakinItemLog: '缁勬嫋鍘嗗彶妗f槑缁�',
+        deviceSite: '璺緞绠$悊',
+        waitPakin: '缁勬墭閫氱煡妗�',
+        waitPakinItem: '缁勬墭妗f槑缁�',
+        waitPakinLog: '缁勬墭鍘嗗彶妗�',
+        waitPakinItemLog: '缁勬墭鍘嗗彶妗f槑缁�',
         task: '浠诲姟宸ヤ綔妗�',
         taskItem: '浠诲姟妗f槑缁�',
         taskLog: '浠诲姟鍘嗗彶妗�',
@@ -178,6 +180,8 @@
         inStockPoces: '鍏ュ簱娴佺▼',
         outStockPoces: '鍑哄簱娴佺▼',
         deviceBind: '璁惧缁戝畾',
+        wave: '娉㈡绠$悊',
+
     },
     table: {
         field: {
@@ -333,6 +337,7 @@
             warehouseAreas: {
                 uuid: "鍞竴缂栫爜",
                 name: "搴撳尯鍚嶇О",
+                type: "搴撳尯绫诲瀷",
                 wareId: "鎵�灞炰粨搴�",
                 code: "搴撳尯缂栫爜",
                 shipperId: "璐т富",
@@ -348,6 +353,8 @@
                 matnrName: "鐗╂枡鍚嶇О",
                 matnrCode: "鐗╂枡缂栫爜",
                 fieldsIndex: "鎵╁睍瀛楁鍞竴鏍囪瘑",
+                workQty: '涓婃灦涓�',
+                qty: '宸插畬鎴�',
                 barcode: "鏉″舰鐮�",
                 anfme: "鏁伴噺",
                 batch: "鎵规鍙�",
@@ -563,6 +570,7 @@
                 stockUnit: "搴撳瓨鍗曚綅",
                 purQty: "閲囪喘閲�",
                 purUnit: "閲囪喘鍗曚綅",
+                unit: '鍗曚綅',
                 qty: "瀹屾垚鏁伴噺",
                 splrBatch: "渚涘簲鍟嗘壒娆�",
                 splrCode: "渚涘簲鍟嗙紪鐮�",
@@ -578,6 +586,7 @@
                 asnId: "涓诲崟鏍囪瘑",
                 asnCode: "鍗曞彿",
                 poDetlId: "骞冲彴鏄庣粏ID",
+                poDetlCode: "DO鍗�",
                 matnrId: "鐗╂枡鏍囪瘑",
                 maktx: "鐗╂枡鍚嶇О",
                 matnrCode: "鐗╂枡缂栫爜",
@@ -715,6 +724,7 @@
                 deviceCode: "璁惧缂栧彿",
                 deviceSite: "璁惧绔欑偣",
                 flagInit: "鏄惁鍒濆鍖�",
+                wcsCode: "wcs缂栧彿",
             },
             waitPakin: {
                 code: "缂栫爜",
@@ -765,6 +775,33 @@
                 qty: "宸插畬鎴�",
                 batch: "鎵规",
             },
+            wave: {
+                code: "娉㈡鍙�",
+                type: "鍗曟嵁绫诲瀷",
+                exceStatus: "鐘舵��",
+                anfme: "鏁伴噺",
+                qty: "瀹屾垚鏁伴噺",
+                orderNum: "鍗曟嵁鏁�",
+            },
+            waveItem: {
+                waveId: "娉㈡ID",
+                waveCode: "娉㈡鍙�",
+                matnrId: "鐗╂枡ID",
+                matnrName: "鐗╂枡鍚嶇О",
+                matnrCode: "鐗╂枡缂栫爜",
+                batch: "鎵规",
+                splrBatch: "渚涘簲鍟嗘壒娆�",
+                orderCode: "婧愬崟鍙�",
+                orderItemId: "婧愬崟鏄庣粏ID",
+                unit: "鍗曚綅",
+                trackCode: "璺熻釜鐮�",
+                fieldsIndex: "鍔ㄦ�佹墿灞�",
+                anfme: "鏁伴噺",
+                workQty: "鎵ц鏁�",
+                qty: "瀹屾垚鏁伴噺",
+                stockLocs: "搴撳瓨浣嶇疆",
+                stockQty: "搴撳瓨鏁伴噺",
+            },
             task: {
                 taskCode: "浠诲姟鍙�",
                 taskStatus: "鐘舵��",
@@ -773,7 +810,7 @@
                 orgSite: "婧愮珯鐐�",
                 targLoc: "鐩爣搴撲綅",
                 targSite: "鐩爣绔欑偣",
-                barcode: "鎷栫洏鐮�",
+                barcode: "鎵樼洏鐮�",
                 robotCode: "鏈哄櫒缂栫爜",
                 exceStatus: "鎵ц鐘舵��",
                 expDesc: "寮傚父璇存槑",
@@ -791,7 +828,7 @@
                 orgSite: "婧愮珯鐐�",
                 targLoc: "鐩爣搴撲綅",
                 targSite: "鐩爣绔欑偣",
-                barcode: "鎷栫洏鐮�",
+                barcode: "鎵樼洏鐮�",
                 robotCode: "鏈哄櫒缂栫爜",
                 exceStatus: "鎵ц鐘舵��",
                 expDesc: "寮傚父璇存槑",
@@ -864,6 +901,7 @@
             },
             locItem: {
                 locId: "搴撲綅ID",
+                locCode: "搴撲綅缂栫爜",
                 orderId: "璁㈠崟ID",
                 type: "鍗曟嵁绫诲瀷",
                 orderItemId: "鍗曟嵁鏄庣粏ID",
@@ -872,8 +910,7 @@
                 maktx: "鐗╂枡鍚嶇О",
                 matnrCode: "鐗╂枡缂栫爜",
                 trackCode: "璺熻釜鐮�",
-                unit: "鍗曚綅",
-                anfme: "鏁伴噺",
+                workQty: '鎵ц鏁�',
                 batch: "鎵规",
                 splrBatch: "渚涘簲鍟嗘壒娆�",
                 spec: "瑙勬牸",
@@ -1009,6 +1046,12 @@
         createWave: "鐢熸垚娉㈡",
         recover: "缁х画鏀惰揣",
     },
+    request: {
+        error: {
+            stock: "搴撳瓨涓嶈冻锛屾棤娉曟彁浜わ紒锛�"
+        }
+
+    }
 };
 
 export default customChineseMessages;

--
Gitblit v1.9.1