From 4114759a57d73661937f28a765fb8a67c017b14b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 24 六月 2025 16:28:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/i18n/zh.js | 53 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 1dc296c..9a56047 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -45,6 +45,7 @@
main: '涓昏',
common: '閫氱敤',
changePwd: '閲嶇疆瀵嗙爜',
+ insuffInventory: '搴撳瓨涓嶈冻'
},
side: {
title: '鏇村'
@@ -80,6 +81,8 @@
result: '瀵煎叆瀹屾垚銆傚凡瀵煎叆 %{success} 鎴愬姛, 鍜� %{error} 澶辫触',
},
loadMore: '鍔犺浇鏇村',
+ updateSucc: '鏇存柊鎴愬姛',
+ updateFaild: '鏇存柊澶辫触',
complete: '瀹屾垚',
deprecate: '搴熷純',
stockError: '娌℃湁搴撳瓨',
@@ -209,9 +212,10 @@
outBound: '鍑哄簱浣滀笟',
checkOutBound: '鐩樼偣鍑哄簱',
stockTransfer: '搴撲綅杞Щ',
-
+ waveRule: '娉㈡绛栫暐',
+
},
- table: {
+ table: {
field: {
stockTransfer: {
orgLoc: '婧愬簱浣�',
@@ -220,16 +224,16 @@
},
outBound: {
stockWithdrawal: '鎻愬彇搴撳瓨',
- withdrawal:'鎻愬彇',
+ withdrawal: '鎻愬彇',
outSta: '鍑哄簱/鎷ｆ枡绔�',
outQty: '鍑哄簱鏁伴噺',
anfme: '鏁伴噺',
createTask: '鐢熸垚浠诲姟',
checkSta: '鐩樼偣绔�'
-
+
},
basContainer: {
- containerType:'瀹瑰櫒绫诲瀷',
+ containerType: '瀹瑰櫒绫诲瀷',
codeType: '鏉＄爜绫诲瀷',
areas: '鍙叆搴撳尯',
},
@@ -245,8 +249,8 @@
isWcs: '鏄惁WCS绔欑珯鐐�',
wcsData: 'wcs鏁版嵁',
containerType: '瀹瑰櫒绫诲瀷',
- barcode: '鏉＄爜',
- autoTransfer: '鑷姩璋冩嫧',
+ barcode: '鏉＄爜',
+ autoTransfer: '鑷姩璋冩嫧',
},
host: {
@@ -613,12 +617,13 @@
},
outStock: {
code: "鍑哄簱鍗曞彿",
- poCode: "骞冲彴鍗曞彿",
- poId: "PO鏍囪瘑",
+ poCode: "DO鍗曞彿",
+ poId: "DO鏍囪瘑",
type: "绫诲瀷",
wkType: "涓氬姟绫诲瀷",
anfme: "鏁伴噺",
- qty: "宸插嚭搴撴暟閲�",
+ workQty: '鎵ц鏁�',
+ qty: "瀹屾垚鏁�",
logisNo: "鐗╂祦鍗曞彿",
arrTime: "棰勮鍒拌揪鏃堕棿",
rleStatus: "閲婃斁鐘舵��",
@@ -653,7 +658,7 @@
splrName: "渚涘簲鍟�",
qrcode: "浜岀淮鐮�",
barcode: "搴忓垪鐮�",
- isptResult: "璐ㄦ鐘舵��",
+ isptStatus: "璐ㄦ鐘舵��",
packName: "鍖呰",
ntyStatus: "鎶ユ鐘舵��",
prodTime: "鐢熶骇鏃ユ湡",
@@ -661,13 +666,16 @@
outStockItem: {
asnId: "涓诲崟鏍囪瘑",
asnCode: "鍗曞彿",
+ poCode: 'DO鍗曞彿',
poDetlId: "骞冲彴鏄庣粏ID",
poDetlCode: "DO鍗�",
matnrId: "鐗╂枡鏍囪瘑",
maktx: "鐗╂枡鍚嶇О",
matnrCode: "鐗╂枡缂栫爜",
+ platOrderCode: '瀹㈠崟鍙�',
anfme: "璁″垝鍑哄簱鏁�",
stockUnit: "搴撳瓨鍗曚綅",
+ workQty: '宸插嚭鏁伴噺',
purQty: "涓嬪崟鏁伴噺",
purUnit: "鍗曚綅",
qty: "瀹屾垚鏁伴噺",
@@ -755,8 +763,9 @@
fieldsIndex: "瀛楁绱㈠紩",
unit: "鍗曚綅",
anfme: "鏁伴噺",
- qty: "瀹屾垚鏁伴噺",
- nromQty: "nromQty",
+ workQty: '鎵ц鏁�',
+ qty: "瀹屾垚鏁�",
+ nromQty: "鏍囧寘鏁�",
printQty: "鎵撳嵃鏁伴噺",
splrName: "渚涘簲鍟嗗悕绉�",
splrCode: "渚涘簲鍟嗙紪鐮�",
@@ -858,6 +867,7 @@
type: "鍗曟嵁绫诲瀷",
exceStatus: "鐘舵��",
anfme: "鏁伴噺",
+ groupQty: '鍝佺被鏁�',
qty: "瀹屾垚鏁伴噺",
orderNum: "鍗曟嵁鏁�",
},
@@ -872,6 +882,7 @@
orderCode: "婧愬崟鍙�",
orderItemId: "婧愬崟鏄庣粏ID",
unit: "鍗曚綅",
+ exceStatus: '鎵ц鐘舵��',
trackCode: "璺熻釜鐮�",
fieldsIndex: "鍔ㄦ�佹墿灞�",
anfme: "鏁伴噺",
@@ -920,6 +931,7 @@
taskId: "taskId",
orderId: "璁㈠崟ID",
orderType: "鍗曟嵁绫诲瀷",
+ wkType: '涓氬姟绫诲瀷',
orderItemId: "璁㈠崟鏄庣粏ID",
source: "婧怚D",
matnrId: "鐗╂枡ID",
@@ -1018,7 +1030,6 @@
workQty: '鎵ц鏁�',
qty: '涓嶅彲鐢ㄥ簱瀛�',
splrId: '渚涘簲鍟�',
- warehouse: '浠撳簱',
batch: "鎵规",
splrBatch: "鎵规",
spec: "瑙勬牸",
@@ -1036,6 +1047,11 @@
typeId: "搴撳尯绫诲瀷",
beSimilar: "鐩镐技寮�鍏�",
emptySimilar: "绌烘澘闈犺繎寮�鍏�",
+ },
+ waveRule: {
+ code: "缂栫爜",
+ type: "鍑哄簱绛栫暐",
+ name: "鍚嶇О",
},
}
},
@@ -1126,6 +1142,8 @@
continue: '缁х画鏀惰揣',
batch: '鎵归噺鎿嶄綔',
confirm: '纭',
+ start: '鑷姩涓嬪彂',
+ pause: '鏆傚仠',
pick: '鎷ｆ枡',
check: '鐩樼偣',
bulkExport: "鎵归噺瀵煎嚭",
@@ -1149,6 +1167,7 @@
batchLocType: "鎵归噺搴撲綅绫诲瀷",
batchPrint: "鎵归噺鎵撳嵃",
verifyComfirm: '瀹℃牳纭',
+ allComfirm: '鍏ㄩ儴鎻愪氦',
quality: "璐ㄦ",
complete: "瀹岀粨",
close: "鍏抽棴",
@@ -1156,12 +1175,16 @@
poCreate: "閫氳繃PO鍗曞垱寤�",
orderPrint: '鎵撳嵃鍗曟嵁',
createTask: "涓嬪彂浠诲姟",
+ publicWorking: '涓嬪彂鎵ц',
+ continuePub: '缁х画涓嬪彂',
createWave: "鐢熸垚娉㈡",
recover: "缁х画鏀惰揣",
+ modiftySite: '淇敼搴撳彛',
+ selectWave: '娉㈡瑙勫垯',
},
request: {
error: {
- stock: "搴撳瓨涓嶈冻锛屾棤娉曟彁浜わ紒锛�",
+ stock: "搴撳瓨涓嶈冻锛屾棤娉曟彁浜わ紒锛�",
select_error_order: "璇烽�夋嫨閫氱煡鍗�",
out_stock_qty: "鍑哄簱鏁伴噺涓嶈兘澶т簬搴撳瓨鏁伴噺",
qty_not_negative: "鏁伴噺涓嶈兘灏忎簬绛変簬0",
--
Gitblit v1.9.1