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 |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index f229ecc..cd137a4 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -158,10 +158,10 @@
         fieldsItem: '鎵╁睍瀛楁鏄庣粏',
         warehouseAreasItem: '搴撳尯搴撳瓨淇℃伅',
         deviceSite: '璺緞绠$悊',
-        waitPakin: '缁勬嫋閫氱煡妗�',
-        waitPakinItem: '缁勬嫋妗f槑缁�',
-        waitPakinLog: '缁勬嫋鍘嗗彶妗�',
-        waitPakinItemLog: '缁勬嫋鍘嗗彶妗f槑缁�',
+        waitPakin: '缁勬墭閫氱煡妗�',
+        waitPakinItem: '缁勬墭妗f槑缁�',
+        waitPakinLog: '缁勬墭鍘嗗彶妗�',
+        waitPakinItemLog: '缁勬墭鍘嗗彶妗f槑缁�',
         task: '浠诲姟宸ヤ綔妗�',
         taskItem: '浠诲姟妗f槑缁�',
         taskLog: '浠诲姟鍘嗗彶妗�',
@@ -353,6 +353,8 @@
                 matnrName: "鐗╂枡鍚嶇О",
                 matnrCode: "鐗╂枡缂栫爜",
                 fieldsIndex: "鎵╁睍瀛楁鍞竴鏍囪瘑",
+                workQty: '涓婃灦涓�',
+                qty: '宸插畬鎴�',
                 barcode: "鏉″舰鐮�",
                 anfme: "鏁伴噺",
                 batch: "鎵规鍙�",
@@ -568,6 +570,7 @@
                 stockUnit: "搴撳瓨鍗曚綅",
                 purQty: "閲囪喘閲�",
                 purUnit: "閲囪喘鍗曚綅",
+                unit: '鍗曚綅',
                 qty: "瀹屾垚鏁伴噺",
                 splrBatch: "渚涘簲鍟嗘壒娆�",
                 splrCode: "渚涘簲鍟嗙紪鐮�",
@@ -721,6 +724,7 @@
                 deviceCode: "璁惧缂栧彿",
                 deviceSite: "璁惧绔欑偣",
                 flagInit: "鏄惁鍒濆鍖�",
+                wcsCode: "wcs缂栧彿",
             },
             waitPakin: {
                 code: "缂栫爜",
@@ -806,7 +810,7 @@
                 orgSite: "婧愮珯鐐�",
                 targLoc: "鐩爣搴撲綅",
                 targSite: "鐩爣绔欑偣",
-                barcode: "鎷栫洏鐮�",
+                barcode: "鎵樼洏鐮�",
                 robotCode: "鏈哄櫒缂栫爜",
                 exceStatus: "鎵ц鐘舵��",
                 expDesc: "寮傚父璇存槑",
@@ -824,7 +828,7 @@
                 orgSite: "婧愮珯鐐�",
                 targLoc: "鐩爣搴撲綅",
                 targSite: "鐩爣绔欑偣",
-                barcode: "鎷栫洏鐮�",
+                barcode: "鎵樼洏鐮�",
                 robotCode: "鏈哄櫒缂栫爜",
                 exceStatus: "鎵ц鐘舵��",
                 expDesc: "寮傚父璇存槑",
@@ -897,6 +901,7 @@
             },
             locItem: {
                 locId: "搴撲綅ID",
+                locCode: "搴撲綅缂栫爜",
                 orderId: "璁㈠崟ID",
                 type: "鍗曟嵁绫诲瀷",
                 orderItemId: "鍗曟嵁鏄庣粏ID",
@@ -905,8 +910,7 @@
                 maktx: "鐗╂枡鍚嶇О",
                 matnrCode: "鐗╂枡缂栫爜",
                 trackCode: "璺熻釜鐮�",
-                unit: "鍗曚綅",
-                anfme: "鏁伴噺",
+                workQty: '鎵ц鏁�',
                 batch: "鎵规",
                 splrBatch: "渚涘簲鍟嗘壒娆�",
                 spec: "瑙勬牸",

--
Gitblit v1.9.1