From e7dcf3d8570b6a9b2967ba0b90e982322b9cfaf7 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 11 七月 2025 17:10:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/i18n/zh.js |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 331427a..8cc2781 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -348,6 +348,7 @@
                 err: "閿欒淇℃伅",
                 result: "result",
                 userId: "鎿嶄綔鐢ㄦ埛",
+                detail: "璇︾粏淇℃伅"
             },
             customer: {
                 uuid: "缂栧彿",
@@ -434,7 +435,7 @@
                 splrId: "渚涘簲鍟嗘爣璇�",
                 weight: "鏀惰揣閲嶉噺",
                 prodTime: "鐢熶骇鏃ユ湡",
-                splrBtch: "渚涘簲鍟嗘壒娆�",
+                splrBtch: "鎵规",
             },
             loc: {
                 warehouseId: "鎵�灞炰粨搴�",
@@ -695,7 +696,7 @@
                 purQty: "涓嬪崟鏁伴噺",
                 purUnit: "鍗曚綅",
                 qty: "瀹屾垚鏁伴噺",
-                splrBatch: "渚涘簲鍟嗘壒娆�",
+                splrBatch: "鎵规",
                 splrCode: "渚涘簲鍟嗙紪鐮�",
                 splrName: "渚涘簲鍟嗗悕绉�",
                 qrcode: "浜岀淮鐮�",
@@ -733,7 +734,7 @@
                 purUnit: "閲囪喘鍗曚綅",
                 qty: "宸插畬鎴愭暟閲�",
                 splrCode: "渚涘簲鍟嗙紪鐮�",
-                splrBatch: "渚涘簲鍟嗘壒娆�",
+                splrBatch: "鎵规",
                 splrName: "渚涘簲鍟嗗悕绉�",
                 qrcode: "浜岀淮鐮�",
                 trackCode: "鏉″舰鐮�",
@@ -785,7 +786,7 @@
                 printQty: "鎵撳嵃鏁伴噺",
                 splrName: "渚涘簲鍟嗗悕绉�",
                 splrCode: "渚涘簲鍟嗙紪鐮�",
-                splrBatch: "渚涘簲鍟嗘壒娆�",
+                splrBatch: "鎵规",
             },
             purchaseItem: {
                 purchaseId: "PO涓诲崟鏍囪瘑",
@@ -800,7 +801,7 @@
                 printQty: "鎵撳嵃鏁伴噺",
                 splrName: "渚涘簲鍟嗗悕绉�",
                 splrCode: "渚涘簲鍟嗙紪鐮�",
-                splrBatch: "渚涘簲鍟嗘壒娆�",
+                splrBatch: "鎵规",
             },
             fields: {
                 fields: "瀛楁",
@@ -886,6 +887,7 @@
                 groupQty: '鍝佺被鏁�',
                 qty: "瀹屾垚鏁伴噺",
                 orderNum: "鍗曟嵁鏁�",
+                progress:"杩涘害"
             },
             waveItem: {
                 waveId: "娉㈡ID",
@@ -894,7 +896,7 @@
                 matnrName: "鐗╂枡鍚嶇О",
                 matnrCode: "鐗╂枡缂栫爜",
                 batch: "鎵规",
-                splrBatch: "渚涘簲鍟嗘壒娆�",
+                splrBatch: "鎵规",
                 orderCode: "婧愬崟鍙�",
                 orderItemId: "婧愬崟鏄庣粏ID",
                 unit: "鍗曚綅",
@@ -1000,7 +1002,7 @@
                 qty: "鎬绘暟",
                 splrCode: "渚涘簲鍟嗙紪鐮�",
                 batch: "鎵规",
-                splrBatch: "渚涘簲鍟嗘壒娆�",
+                splrBatch: "鎵规",
                 splrName: "渚涘簲鍟嗗悕绉�",
                 trackCode: "璺熻釜鐮�",
                 barcode: "鏉″舰鐮�",
@@ -1025,7 +1027,7 @@
                 workQty: '鎵ц鏁�',
                 qty: '瀹屾垚鏁�',
                 batch: "鎵规",
-                splrBatch: "渚涘簲鍟嗘壒娆�",
+                splrBatch: "鎵规",
                 spec: "瑙勬牸",
                 model: "鍨嬪彿",
                 fieldsIndex: "鍔ㄦ�佺储寮�",

--
Gitblit v1.9.1