From 8e622d6a1d07937cd654364748b52e15a50c67d8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 14 五月 2025 09:14: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 | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index baad648..0fabcf6 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -79,7 +79,9 @@
stockError: '娌℃湁搴撳瓨',
resend: '閲嶅彂',
selected: '椤归�変腑',
- batch: '鎵归噺缂栬緫'
+ batch: '鎵归噺缂栬緫',
+ batchSafe: '鎵归噺鍚堟牸',
+ batchDef: '鎵归噺涓嶅悎鏍�',
},
msg: {
confirm: {
@@ -138,12 +140,12 @@
warehouse: '浠撳簱',
warehouseAreas: '搴撳尯',
loc: '搴撲綅',
- locType: '搴撲綅绫诲瀷',
- locArea: '閫昏緫鍒嗗尯',
- locAreaMat: '閫昏緫鍒嗗尯',
+ locType: '搴撲綅绫诲瀷(搴�)',
+ locArea: '閫昏緫鍒嗗尯(搴�)',
+ locAreaMat: '閫昏緫鍒嗗尯(搴�)',
locAreaMatRela: '搴撳尯鐗╂枡鍏崇郴',
- container: '瀹瑰櫒绠＄悊',
- contract: '鍚堝悓淇℃伅',
+ container: '瀹瑰櫒绠＄悊(搴�)',
+ contract: '鍚堝悓淇℃伅(搴�)',
qlyInspect: '璐ㄦ淇℃伅',
qlyIsptItem: '璐ㄦ淇℃伅鏄庣粏',
dictType: '鏁版嵁瀛楀吀',
@@ -187,9 +189,25 @@
deviceBind: '璁惧缁戝畾',
tasks: '浠诲姟绠＄悊',
wave: '娉㈡绠＄悊',
+ basStation: '绔欑偣淇℃伅'
},
- table: {
+ table: {
field: {
+ basStation: {
+ stationName: '绔欑偣鍚嶇О',
+ inAble: '鑳藉叆',
+ outAble: '鑳藉嚭',
+ useStatus: '鐘舵��',
+ status: '鐘舵��',
+ area: '鎵�灞炲簱鍖虹被鍨�',
+ isCrossZone: '鏄惁璺ㄥ尯',
+ crossZoneArea: '鍙法鍖虹被鍨�',
+ isWcs: '鏄惁WCS绔欑珯鐐�',
+ wcsData: 'wcs鏁版嵁',
+ containerType: '瀹瑰櫒绫诲瀷',
+ barcode: '鏉＄爜',
+ autoTransfer: '鑷姩璋冩嫧',
+ },
host: {
},
@@ -353,8 +371,8 @@
},
warehouseAreasItem: {
asnCode: '鍗曞彿',
- areaId: "浠撳簱鍖哄煙",
- areaName: "鍖哄煙鍚嶇О ",
+ areaId: "搴撳尯ID",
+ areaName: "搴撳尯鍚嶇О ",
matnrId: "鐗╂枡鏍囪瘑",
matnrName: "鐗╂枡鍚嶇О",
matnrCode: "鐗╂枡缂栫爜",
@@ -468,18 +486,19 @@
},
qlyIsptItem: {
ispectId: "涓诲崟ID",
- matnrCode: "鐗╂枡缂栧彿",
+ matnrCode: "鐗╂枡缂栫爜",
maktx: "鐗╂枡鍚嶇О",
label: "鏍囩",
- splrName: "渚涘簲鍟嗗悕绉�",
- splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrName: "渚涘簲鍟�",
+ splrBatch: "鎵规",
stockBatch: "搴撳瓨鎵规",
isptResult: '璐ㄦ缁撹',
isptStatus: '璐ㄦ鐘舵��',
- rcptQty: "鏀惰揣鏁伴噺",
+ rcptQty: "鍙鏁伴噺",
dlyQty: "閫佽揣鏁伴噺",
disQty: "涓嶅悎鏁伴噺",
safeQty: "鍚堟牸鏁伴噺",
+ anfme: '宸叉鏁伴噺',
picPath: "鍥剧墖璺緞",
trackCode: "鏉″舰鐮�",
},
@@ -577,7 +596,7 @@
spec: "瑙勬牸",
model: "鍨嬪彿",
matnrCode: "鐗╂枡缂栫爜",
- anfme: "璁″垝鏁�",
+ anfme: "璁″垝鏁伴噺",
stockUnit: "鍗曚綅",
isptResult: "璐ㄦ缁撴灉",
purQty: "閲囪喘閲�",
@@ -1060,6 +1079,7 @@
complete: "瀹岀粨",
close: "鍏抽棴",
asnCreate: "閫氳繃鍗曟嵁鍒涘缓",
+ poCreate: "閫氳繃PO鍗曞垱寤�",
orderPrint: '鎵撳嵃鍗曟嵁',
createTask: "涓嬪彂浠诲姟",
createWave: "鐢熸垚娉㈡",
--
Gitblit v1.9.1