From 50c33b34f9e6ae19c003d305e4c0b86cea062bec Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 03 七月 2025 16:30:26 +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, 15 insertions(+), 5 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 16ea7be..18807a3 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -81,6 +81,8 @@
result: '瀵煎叆瀹屾垚銆傚凡瀵煎叆 %{success} 鎴愬姛, 鍜� %{error} 澶辫触',
},
loadMore: '鍔犺浇鏇村',
+ updateSucc: '鏇存柊鎴愬姛',
+ updateFaild: '鏇存柊澶辫触',
complete: '瀹屾垚',
deprecate: '搴熷純',
stockError: '娌℃湁搴撳瓨',
@@ -443,6 +445,7 @@
flagLogic: "铏氭嫙搴撲綅",
fucAtrrs: "鍔熻兘灞炴��",
barcode: "瀹瑰櫒鐮�",
+ startChannel: "璧峰宸烽亾",
unit: "鍗曚綅",
size: "闀�/瀹�/楂�",
length: "闀�",
@@ -630,7 +633,7 @@
},
asnOrderItem: {
asnId: "涓诲崟鏍囪瘑",
- asnCode: "涓诲崟缂栫爜",
+ asnCode: "鍗曞彿",
poDetlId: "PO鍗旾D",
poDetlCode: "PO鍗�",
platItemId: '琛屽彿',
@@ -656,7 +659,7 @@
splrName: "渚涘簲鍟�",
qrcode: "浜岀淮鐮�",
barcode: "搴忓垪鐮�",
- isptResult: "璐ㄦ鐘舵��",
+ isptStatus: "璐ㄦ鐘舵��",
packName: "鍖呰",
ntyStatus: "鎶ユ鐘舵��",
prodTime: "鐢熶骇鏃ユ湡",
@@ -673,7 +676,7 @@
platOrderCode: '瀹㈠崟鍙�',
anfme: "璁″垝鍑哄簱鏁�",
stockUnit: "搴撳瓨鍗曚綅",
- workQty: '鎵ц鏁�',
+ workQty: '宸插嚭鏁伴噺',
purQty: "涓嬪崟鏁伴噺",
purUnit: "鍗曚綅",
qty: "瀹屾垚鏁伴噺",
@@ -863,8 +866,9 @@
wave: {
code: "娉㈡鍙�",
type: "鍗曟嵁绫诲瀷",
- exceStatus: "鐘舵��",
+ exceStatus: "鎵ц鐘舵��",
anfme: "鏁伴噺",
+ groupQty: '鍝佺被鏁�',
qty: "瀹屾垚鏁伴噺",
orderNum: "鍗曟嵁鏁�",
},
@@ -879,6 +883,7 @@
orderCode: "婧愬崟鍙�",
orderItemId: "婧愬崟鏄庣粏ID",
unit: "鍗曚綅",
+ exceStatus: '鎵ц鐘舵��',
trackCode: "璺熻釜鐮�",
fieldsIndex: "鍔ㄦ�佹墿灞�",
anfme: "鏁伴噺",
@@ -1026,7 +1031,6 @@
workQty: '鎵ц鏁�',
qty: '涓嶅彲鐢ㄥ簱瀛�',
splrId: '渚涘簲鍟�',
- warehouse: '浠撳簱',
batch: "鎵规",
splrBatch: "鎵规",
spec: "瑙勬牸",
@@ -1139,6 +1143,9 @@
continue: '缁х画鏀惰揣',
batch: '鎵归噺鎿嶄綔',
confirm: '纭',
+ start: '鑷姩涓嬪彂',
+ stopPub: '缁堟涓嬪彂',
+ pause: '鏆傚仠',
pick: '鎷ｆ枡',
check: '鐩樼偣',
bulkExport: "鎵归噺瀵煎嚭",
@@ -1162,6 +1169,7 @@
batchLocType: "鎵归噺搴撲綅绫诲瀷",
batchPrint: "鎵归噺鎵撳嵃",
verifyComfirm: '瀹℃牳纭',
+ allComfirm: '鍏ㄩ儴鎻愪氦',
quality: "璐ㄦ",
complete: "瀹岀粨",
close: "鍏抽棴",
@@ -1170,9 +1178,11 @@
orderPrint: '鎵撳嵃鍗曟嵁',
createTask: "涓嬪彂浠诲姟",
publicWorking: '涓嬪彂鎵ц',
+ continuePub: '缁х画涓嬪彂',
createWave: "鐢熸垚娉㈡",
recover: "缁х画鏀惰揣",
modiftySite: '淇敼搴撳彛',
+ selectWave: '娉㈡瑙勫垯',
},
request: {
error: {
--
Gitblit v1.9.1