From d7bb8c43b17253b46c6a466cff5545e8b4bcaad3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 10 六月 2025 11:10:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/zh.js | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 94a27e4..bb18c4d 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -209,9 +209,10 @@
outBound: '鍑哄簱浣滀笟',
checkOutBound: '鐩樼偣鍑哄簱',
stockTransfer: '搴撲綅杞Щ',
-
+ waveRule: '娉㈡绛栫暐',
+
},
- table: {
+ table: {
field: {
stockTransfer: {
orgLoc: '婧愬簱浣�',
@@ -220,16 +221,16 @@
},
outBound: {
stockWithdrawal: '鎻愬彇搴撳瓨',
- withdrawal:'鎻愬彇',
+ withdrawal: '鎻愬彇',
outSta: '鍑哄簱/鎷ｆ枡绔�',
outQty: '鍑哄簱鏁伴噺',
anfme: '鏁伴噺',
createTask: '鐢熸垚浠诲姟',
checkSta: '鐩樼偣绔�'
-
+
},
basContainer: {
- containerType:'瀹瑰櫒绫诲瀷',
+ containerType: '瀹瑰櫒绫诲瀷',
codeType: '鏉＄爜绫诲瀷',
areas: '鍙叆搴撳尯',
},
@@ -245,8 +246,8 @@
isWcs: '鏄惁WCS绔欑珯鐐�',
wcsData: 'wcs鏁版嵁',
containerType: '瀹瑰櫒绫诲瀷',
- barcode: '鏉＄爜',
- autoTransfer: '鑷姩璋冩嫧',
+ barcode: '鏉＄爜',
+ autoTransfer: '鑷姩璋冩嫧',
},
host: {
@@ -613,12 +614,13 @@
},
outStock: {
code: "鍑哄簱鍗曞彿",
- poCode: "骞冲彴鍗曞彿",
- poId: "PO鏍囪瘑",
+ poCode: "DO鍗曞彿",
+ poId: "DO鏍囪瘑",
type: "绫诲瀷",
wkType: "涓氬姟绫诲瀷",
anfme: "鏁伴噺",
- qty: "宸插嚭搴撴暟閲�",
+ workQty: '鎵ц鏁�',
+ qty: "瀹屾垚鏁�",
logisNo: "鐗╂祦鍗曞彿",
arrTime: "棰勮鍒拌揪鏃堕棿",
rleStatus: "閲婃斁鐘舵��",
@@ -661,13 +663,16 @@
outStockItem: {
asnId: "涓诲崟鏍囪瘑",
asnCode: "鍗曞彿",
+ poCode: 'DO鍗曞彿',
poDetlId: "骞冲彴鏄庣粏ID",
poDetlCode: "DO鍗�",
matnrId: "鐗╂枡鏍囪瘑",
maktx: "鐗╂枡鍚嶇О",
matnrCode: "鐗╂枡缂栫爜",
+ platOrderCode: '瀹㈠崟鍙�',
anfme: "璁″垝鍑哄簱鏁�",
stockUnit: "搴撳瓨鍗曚綅",
+ workQty: '鎵ц鏁�',
purQty: "涓嬪崟鏁伴噺",
purUnit: "鍗曚綅",
qty: "瀹屾垚鏁伴噺",
@@ -755,8 +760,9 @@
fieldsIndex: "瀛楁绱㈠紩",
unit: "鍗曚綅",
anfme: "鏁伴噺",
- qty: "瀹屾垚鏁伴噺",
- nromQty: "nromQty",
+ workQty: '鎵ц鏁�',
+ qty: "瀹屾垚鏁�",
+ nromQty: "鏍囧寘鏁�",
printQty: "鎵撳嵃鏁伴噺",
splrName: "渚涘簲鍟嗗悕绉�",
splrCode: "渚涘簲鍟嗙紪鐮�",
@@ -1038,6 +1044,11 @@
beSimilar: "鐩镐技寮�鍏�",
emptySimilar: "绌烘澘闈犺繎寮�鍏�",
},
+ waveRule: {
+ code: "缂栫爜",
+ type: "娉㈡绫诲瀷",
+ name: "鍚嶇О",
+ },
}
},
page: {
@@ -1157,12 +1168,13 @@
poCreate: "閫氳繃PO鍗曞垱寤�",
orderPrint: '鎵撳嵃鍗曟嵁',
createTask: "涓嬪彂浠诲姟",
+ publicWorking: '涓嬪彂鎵ц',
createWave: "鐢熸垚娉㈡",
recover: "缁х画鏀惰揣",
},
request: {
error: {
- stock: "搴撳瓨涓嶈冻锛屾棤娉曟彁浜わ紒锛�",
+ stock: "搴撳瓨涓嶈冻锛屾棤娉曟彁浜わ紒锛�",
select_error_order: "璇烽�夋嫨閫氱煡鍗�",
out_stock_qty: "鍑哄簱鏁伴噺涓嶈兘澶т簬搴撳瓨鏁伴噺",
qty_not_negative: "鏁伴噺涓嶈兘灏忎簬绛変簬0",
--
Gitblit v1.9.1