From ecdc2cadd4a21b80de4e30e38878fdeb39084e3f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 23 六月 2025 17:05:12 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

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

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index a52e088..9c8251e 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -675,7 +675,7 @@
                 platOrderCode: '瀹㈠崟鍙�',
                 anfme: "璁″垝鍑哄簱鏁�",
                 stockUnit: "搴撳瓨鍗曚綅",
-                workQty: '鎵ц鏁�',
+                workQty: '宸插嚭鏁伴噺',
                 purQty: "涓嬪崟鏁伴噺",
                 purUnit: "鍗曚綅",
                 qty: "瀹屾垚鏁伴噺",
@@ -867,6 +867,7 @@
                 type: "鍗曟嵁绫诲瀷",
                 exceStatus: "鐘舵��",
                 anfme: "鏁伴噺",
+                groupQty: '鍝佺被鏁�',
                 qty: "瀹屾垚鏁伴噺",
                 orderNum: "鍗曟嵁鏁�",
             },
@@ -881,6 +882,7 @@
                 orderCode: "婧愬崟鍙�",
                 orderItemId: "婧愬崟鏄庣粏ID",
                 unit: "鍗曚綅",
+                exceStatus: '鎵ц鐘舵��',
                 trackCode: "璺熻釜鐮�",
                 fieldsIndex: "鍔ㄦ�佹墿灞�",
                 anfme: "鏁伴噺",
@@ -1140,6 +1142,8 @@
         continue: '缁х画鏀惰揣',
         batch: '鎵归噺鎿嶄綔',
         confirm: '纭',
+        start: '鑷姩涓嬪彂',
+        pause: '鏆傚仠',
         pick: '鎷ｆ枡',
         check: '鐩樼偣',
         bulkExport: "鎵归噺瀵煎嚭",
@@ -1163,6 +1167,7 @@
         batchLocType: "鎵归噺搴撲綅绫诲瀷",
         batchPrint: "鎵归噺鎵撳嵃",
         verifyComfirm: '瀹℃牳纭',
+        allComfirm: '鍏ㄩ儴鎻愪氦',
         quality: "璐ㄦ",
         complete: "瀹岀粨",
         close: "鍏抽棴",
@@ -1174,6 +1179,7 @@
         createWave: "鐢熸垚娉㈡",
         recover: "缁х画鏀惰揣",
         modiftySite: '淇敼搴撳彛',
+        selectWave: '娉㈡瑙勫垯',
     },
     request: {
         error: {

--
Gitblit v1.9.1