From 99f5c058c42521640d815f3d52dc722a5d5ad4c4 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 23 五月 2025 18:59:43 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/zh.js | 184 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 146 insertions(+), 38 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 256c6a2..5606f1f 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -11,6 +11,8 @@
},
button: {
edit: "缂栬緫",
+ detail: "搴撳瓨鏄庣粏",
+ histories: "娴佹按璁板綍",
},
field: {
id: 'ID',
@@ -24,8 +26,16 @@
memoWrap: '鏄剧ず澶囨敞',
memo: '澶囨敞',
opt: '鎿嶄綔',
+ supplier: '渚涘簲鍟�',
+ customer: '瀹㈡埛',
+ shipper: '璐т富',
+ partners: '鎴樼暐鍚堜綔',
},
list: {
+ titles: {
+ stockInfo: '搴撳瓨鏄庣粏',
+ },
+
empty: {
tip: '娌℃湁鍙樉绀烘暟鎹�',
}
@@ -75,7 +85,9 @@
stockError: '娌℃湁搴撳瓨',
resend: '閲嶅彂',
selected: '椤归�変腑',
- batch: '鎵归噺缂栬緫'
+ batch: '鎵归噺缂栬緫',
+ batchSafe: '鎵归噺鍚堟牸',
+ batchDef: '鎵归噺涓嶅悎鏍�',
},
msg: {
confirm: {
@@ -84,6 +96,14 @@
},
placeholder: '璇疯緭鍏ユ悳绱㈠唴瀹�',
},
+ aside: {
+ category: '姹囨�诲垎绫�',
+ material: '鐗╂枡锛堥粯璁わ級',
+ supplier: '渚涘簲鍟�',
+ warehouse: '浠撳簱',
+ batch: '鎵规',
+ dynamicFields: '鍔ㄦ�佸瓧娈�'
+ }
},
filters: {
lastCreated: '鏈�杩戝垱寤�',
@@ -134,12 +154,12 @@
warehouse: '浠撳簱',
warehouseAreas: '搴撳尯',
loc: '搴撲綅',
- locType: '搴撲綅绫诲瀷',
- locArea: '閫昏緫鍒嗗尯',
- locAreaMat: '閫昏緫鍒嗗尯',
+ locType: '搴撲綅绫诲瀷(搴�)',
+ locArea: '閫昏緫鍒嗗尯(搴�)',
+ locAreaMat: '閫昏緫鍒嗗尯(搴�)',
locAreaMatRela: '搴撳尯鐗╂枡鍏崇郴',
- container: '瀹瑰櫒绠＄悊',
- contract: '鍚堝悓淇℃伅',
+ container: '瀹瑰櫒绠＄悊(搴�)',
+ contract: '鍚堝悓淇℃伅(搴�)',
qlyInspect: '璐ㄦ淇℃伅',
qlyIsptItem: '璐ㄦ淇℃伅鏄庣粏',
dictType: '鏁版嵁瀛楀吀',
@@ -156,35 +176,77 @@
whMat: '搴撳尯鐗╂枡鍏崇郴',
fields: '鎵╁睍瀛楁',
fieldsItem: '鎵╁睍瀛楁鏄庣粏',
- warehouseAreasItem: '搴撳尯搴撳瓨淇℃伅',
+ warehouseAreasItem: '鏀惰揣搴撳瓨',
deviceSite: '璺緞绠＄悊',
waitPakin: '缁勬墭閫氱煡妗�',
waitPakinItem: '缁勬墭妗ｆ槑缁�',
waitPakinLog: '缁勬墭鍘嗗彶妗�',
waitPakinItemLog: '缁勬墭鍘嗗彶妗ｆ槑缁�',
- task: '浠诲姟宸ヤ綔妗�',
+ task: '浠诲姟绠＄悊',
taskItem: '浠诲姟妗ｆ槑缁�',
taskLog: '浠诲姟鍘嗗彶妗�',
taskItemLog: '浠诲姟鏄庣粏鍘嗗彶妗�',
- stock: '缁煎悎鍗曟嵁绠＄悊',
+ stock: '鍏ュ嚭搴撳巻鍙�',
stockItem: '鍗曟嵁鏄庣粏',
locItem: '搴撲綅鏄庣粏',
histories: '鍘嗗彶妗�',
wareWork: '浠撳簱浣滀笟',
- statistics: '缁熻鏌ヨ',
+ statistics: '搴撳瓨鏌ヨ',
+ stockManage: '搴撳瓨绠＄悊',
logs: '鏃ュ織',
permissions: '鏉冮檺绠＄悊',
delivery: 'DO鍗�',
outStock: '鍑哄簱鍗�',
outStockItem: '鍑哄簱鍗曟槑缁�',
- inStockPoces: '鍏ュ簱娴佺▼',
- outStockPoces: '鍑哄簱娴佺▼',
+ inStockPoces: '鍏ュ簱绠＄悊',
+ outStockPoces: '鍑哄簱绠＄悊',
+ warehouseStock: '鍗虫椂搴撳瓨',
deviceBind: '璁惧缁戝畾',
+ tasks: '浠诲姟绠＄悊',
wave: '娉㈡绠＄悊',
-
+ basStation: '绔欑偣淇℃伅',
+ basContainer: '瀹瑰櫒绠＄悊',
+ outBound: '鍑哄簱浣滀笟',
+ checkOutBound: '鐩樼偣鍑哄簱',
+ stockTransfer: '搴撳瓨杞Щ',
},
- table: {
+ table: {
field: {
+ stockTransfer: {
+ orgLoc: '婧愬簱浣�',
+ tarLoc: '鐩爣搴撲綅',
+ inputLoc: '杈撳叆搴撲綅'
+ },
+ outBound: {
+ stockWithdrawal: '鎻愬彇搴撳瓨',
+ withdrawal:'鎻愬彇',
+ outSta: '鍑哄簱/鎷ｆ枡绔�',
+ outQty: '鍑哄簱鏁伴噺',
+ anfme: '鏁伴噺',
+ createTask: '鐢熸垚浠诲姟',
+ checkSta: '鐩樼偣绔�'
+
+ },
+ basContainer: {
+ containerType:'瀹瑰櫒绫诲瀷',
+ codeType: '鏉＄爜绫诲瀷',
+ areas: '鍙叆搴撳尯',
+ },
+ basStation: {
+ stationName: '绔欑偣鍚嶇О',
+ inAble: '鑳藉叆',
+ outAble: '鑳藉嚭',
+ useStatus: '鐘舵��',
+ status: '鐘舵��',
+ area: '鎵�灞炲簱鍖�',
+ isCrossZone: '鏄惁璺ㄥ尯',
+ crossZoneArea: '鍙法搴撳尯',
+ isWcs: '鏄惁WCS绔欑珯鐐�',
+ wcsData: 'wcs鏁版嵁',
+ containerType: '瀹瑰櫒绫诲瀷',
+ barcode: '鏉＄爜',
+ autoTransfer: '鑷姩璋冩嫧',
+ },
host: {
},
@@ -347,8 +409,9 @@
flagMix: "娣锋斁",
},
warehouseAreasItem: {
- areaId: "浠撳簱鍖哄煙",
- areaName: "鍖哄煙鍚嶇О ",
+ asnCode: '鍗曞彿',
+ areaId: "搴撳尯ID",
+ areaName: "搴撳尯鍚嶇О ",
matnrId: "鐗╂枡鏍囪瘑",
matnrName: "鐗╂枡鍚嶇О",
matnrCode: "鐗╂枡缂栫爜",
@@ -356,6 +419,7 @@
workQty: '涓婃灦涓�',
qty: '宸插畬鎴�',
barcode: "鏉″舰鐮�",
+ isptResult: '璐ㄦ鐘舵��',
anfme: "鏁伴噺",
batch: "鎵规鍙�",
unit: "璁￠噺鍗曚綅",
@@ -461,18 +525,19 @@
},
qlyIsptItem: {
ispectId: "涓诲崟ID",
- matnrCode: "鐗╂枡缂栧彿",
+ matnrCode: "鐗╂枡缂栫爜",
maktx: "鐗╂枡鍚嶇О",
label: "鏍囩",
- splrName: "渚涘簲鍟嗗悕绉�",
- splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrName: "渚涘簲鍟�",
+ splrBatch: "鎵规",
stockBatch: "搴撳瓨鎵规",
isptResult: '璐ㄦ缁撹',
isptStatus: '璐ㄦ鐘舵��',
- rcptQty: "鏀惰揣鏁伴噺",
+ rcptQty: "鍙鏁伴噺",
dlyQty: "閫佽揣鏁伴噺",
disQty: "涓嶅悎鏁伴噺",
safeQty: "鍚堟牸鏁伴噺",
+ anfme: '宸叉鏁伴噺',
picPath: "鍥剧墖璺緞",
trackCode: "鏉″舰鐮�",
},
@@ -484,6 +549,7 @@
dictData: {
dictTypeId: "瀛楀吀鏍囪瘑",
dictTypeCode: "瀛楀吀缂栫爜",
+ group: "鍒嗙被",
value: "鍊�",
label: "鍒悕",
sort: "鎺掑簭",
@@ -534,7 +600,7 @@
code: "ASN鍗曞彿",
poCode: "PO缂栫爜",
poId: "PO鏍囪瘑",
- type: "绫诲瀷",
+ type: "鍗曟嵁绫诲瀷",
wkType: "涓氬姟绫诲瀷",
anfme: "璁″垝鏁伴噺",
qty: "瀹屾垚鏁伴噺",
@@ -563,29 +629,33 @@
asnCode: "涓诲崟缂栫爜",
poDetlId: "PO鍗旾D",
poDetlCode: "PO鍗�",
+ platItemId: '琛屽彿',
matnrId: "鐗╂枡鏍囪瘑",
+ platOrderCode: '瀹㈡埛鍗曞彿',
+ platWorkCode: '宸ュ崟鍙�',
+ projectCode: '椤圭洰鍙�',
maktx: "鐗╂枡鍚嶇О",
spec: "瑙勬牸",
model: "鍨嬪彿",
matnrCode: "鐗╂枡缂栫爜",
- anfme: "璁″垝鏀惰揣鏁�",
- stockUnit: "搴撳瓨鍗曚綅",
+ anfme: "璁″垝鏁伴噺",
+ stockUnit: "鍗曚綅",
isptResult: "璐ㄦ缁撴灉",
purQty: "閲囪喘閲�",
purUnit: "閲囪喘鍗曚綅",
unit: '鍗曚綅',
- qty: "瀹屾垚鏁伴噺",
+ qty: "瀹屾垚鏁�",
safeQty: '鍚堟牸鏁�',
disQty: '涓嶅悎鏍兼暟',
- splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrBatch: "鎵规",
splrCode: "渚涘簲鍟嗙紪鐮�",
- splrName: "渚涘簲鍟嗗悕绉�",
+ splrName: "渚涘簲鍟�",
qrcode: "浜岀淮鐮�",
- barcode: "鏉″舰鐮�",
+ barcode: "搴忓垪鐮�",
+ isptResult: "璐ㄦ鐘舵��",
packName: "鍖呰",
ntyStatus: "鎶ユ鐘舵��",
prodTime: "鐢熶骇鏃ユ湡",
- platItemId: '琛屽彿'
},
outStockItem: {
asnId: "涓诲崟鏍囪瘑",
@@ -709,7 +779,7 @@
fields: {
fields: "瀛楁",
fieldsAlise: "瀛楁鍒悕",
- unique: "鏄惁蹇呭～",
+ unique: "鏁版嵁绫诲瀷",
flagEnable: "鍚敤",
},
fieldsItem: {
@@ -721,12 +791,12 @@
},
deviceSite: {
type: "鍏ュ嚭搴撶被鍨�",
- site: "浣滀笟绔欑偣",
+ site: "鍏ュ簱鍙�",
name: "鍚嶇О",
target: "鐩爣绔欑偣",
label: "绔欑偣鏍囩",
device: "绔嬪簱绫诲瀷",
- deviceCode: "璁惧缂栧彿",
+ deviceCode: "鎺ラ┏浣�",
deviceSite: "璁惧绔欑偣",
flagInit: "鏄惁鍒濆鍖�",
wcsCode: "wcs缂栧彿",
@@ -749,6 +819,7 @@
asnCode: "鏀惰揣閫氱煡鍗曠紪鐮�",
asnItemId: "鏀惰揣閫氱煡鍗曟槑缁唅d",
trackCode: "鏉″舰鐮�",
+ isptResult: '璐ㄦ鐘舵��',
anfme: "鏁伴噺",
workQty: "鎵ц涓暟閲�",
unit: "鍗曚綅",
@@ -810,7 +881,8 @@
task: {
taskCode: "浠诲姟鍙�",
taskStatus: "鐘舵��",
- taskType: "绫诲瀷",
+ taskType: "浣滀笟绫诲瀷",
+ warehType: "浠撳簱绫诲瀷",
orgLoc: "婧愬簱浣�",
orgSite: "婧愮珯鐐�",
targLoc: "鐩爣搴撲綅",
@@ -850,6 +922,7 @@
source: "婧怚D",
matnrId: "鐗╂枡ID",
maktx: "鐗╂枡鍚嶇О",
+ isptResult: '璐ㄦ鐘舵��',
matnrCode: "鐗╂枡缂栫爜",
unit: "鍗曚綅",
anfme: "鏁伴噺",
@@ -884,13 +957,13 @@
},
stockItem: {
orderId: "涓诲崟ID",
- orderCode: "鍗曟嵁缂栫爜",
+ orderCode: "鍗曞彿",
sourceItemId: "婧愭槑缁咺D",
matnrId: "鐗╂枡ID",
matnrCode: "鐗╂枡缂栫爜",
maktx: "鐗╂枡鍚嶇О",
anfme: "鏁伴噺",
- stockUnit: "stockUnit",
+ stockUnit: "鍗曚綅",
workQty: "鎵ц鏁�",
purQty: "閲囪喘鏁�",
purUnit: "閲囪喘鍗曚綅",
@@ -906,18 +979,46 @@
},
locItem: {
locId: "搴撲綅ID",
- locCode: "搴撲綅缂栫爜",
+ locCode: "搴撲綅",
+ orderId: "璁㈠崟ID",
+ type: "鍗曟嵁绫诲瀷",
+ orderItemId: "鍗曟嵁鏄庣粏ID",
+ wkType: "涓氬姟绫诲瀷",
+ aggType: "姹囨�荤被鍨�",
+ wareArea: '搴撳尯',
+ matnrId: "鐗╂枡ID",
+ maktx: "鐗╂枡鍚嶇О",
+ unit: '鍗曚綅',
+ anfme: '鏁伴噺',
+ matnrCode: "鐗╂枡缂栫爜",
+ trackCode: "璺熻釜鐮�",
+ workQty: '鎵ц鏁�',
+ qty: '瀹屾垚鏁�',
+ batch: "鎵规",
+ splrBatch: "渚涘簲鍟嗘壒娆�",
+ spec: "瑙勬牸",
+ model: "鍨嬪彿",
+ fieldsIndex: "鍔ㄦ�佺储寮�",
+ },
+ warehouseStock: {
+ locId: "搴撲綅ID",
+ locCode: "搴撲綅",
+ warehouse: '浠撳簱',
orderId: "璁㈠崟ID",
type: "鍗曟嵁绫诲瀷",
orderItemId: "鍗曟嵁鏄庣粏ID",
wkType: "涓氬姟绫诲瀷",
matnrId: "鐗╂枡ID",
maktx: "鐗╂枡鍚嶇О",
+ unit: '鍗曚綅',
+ anfme: '搴撳瓨鏁伴噺',
matnrCode: "鐗╂枡缂栫爜",
- trackCode: "璺熻釜鐮�",
workQty: '鎵ц鏁�',
+ qty: '涓嶅彲鐢ㄥ簱瀛�',
+ splrId: '渚涘簲鍟�',
+ warehouse: '浠撳簱',
batch: "鎵规",
- splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrBatch: "鎵规",
spec: "瑙勬牸",
model: "鍨嬪彿",
fieldsIndex: "鍔ㄦ�佺储寮�",
@@ -1023,6 +1124,8 @@
continue: '缁х画鏀惰揣',
batch: '鎵归噺鎿嶄綔',
confirm: '纭',
+ pick: '鎷ｆ枡',
+ check: '鐩樼偣',
bulkExport: "鎵归噺瀵煎嚭",
selectSite: '閫夋嫨绔欑偣',
confirmSelect: '纭閫夋嫨',
@@ -1043,10 +1146,13 @@
batchWarehouseAreas: "鎵归噺搴撳尯",
batchLocType: "鎵归噺搴撲綅绫诲瀷",
batchPrint: "鎵归噺鎵撳嵃",
+ verifyComfirm: '瀹℃牳纭',
quality: "璐ㄦ",
- complete: "瀹屾垚",
+ complete: "瀹岀粨",
close: "鍏抽棴",
asnCreate: "閫氳繃鍗曟嵁鍒涘缓",
+ poCreate: "閫氳繃PO鍗曞垱寤�",
+ orderPrint: '鎵撳嵃鍗曟嵁',
createTask: "涓嬪彂浠诲姟",
createWave: "鐢熸垚娉㈡",
recover: "缁х画鏀惰揣",
@@ -1055,6 +1161,8 @@
error: {
stock: "搴撳瓨涓嶈冻锛屾棤娉曟彁浜わ紒锛�",
select_error_order: "璇烽�夋嫨閫氱煡鍗�",
+ out_stock_qty: "鍑哄簱鏁伴噺涓嶈兘澶т簬搴撳瓨鏁伴噺",
+
}
}
--
Gitblit v1.9.1