From 239ab7dd1df24ec6a45e6bb2322fb8186ce8ac8f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 12 五月 2025 19:34:53 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/zh.js | 56 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 67a0b4b..84f4197 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: {
@@ -160,35 +162,52 @@
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: '鍑哄簱绠＄悊',
deviceBind: '璁惧缁戝畾',
+ tasks: '浠诲姟绠＄悊',
wave: '娉㈡绠＄悊',
-
+ basStation: '绔欑偣淇℃伅'
},
- table: {
+ table: {
field: {
+ basStation: {
+ stationName: '绔欑偣鍚嶇О',
+ inAble: '鑳藉叆',
+ outAble: '鑳藉嚭',
+ useStatus: '鐘舵��',
+ status: '鐘舵��',
+ area: '鎵�灞炲簱鍖虹被鍨�',
+ isCrossZone: '鏄惁璺ㄥ尯',
+ crossZoneArea: '鍙法鍖虹被鍨�',
+ isWcs: '鏄惁WCS绔欑珯鐐�',
+ wcsData: 'wcs鏁版嵁',
+ containerType: '瀹瑰櫒绫诲瀷',
+ barcode: '鏉＄爜',
+ autoTransfer: '鑷姩璋冩嫧',
+ },
host: {
},
@@ -352,8 +371,8 @@
},
warehouseAreasItem: {
asnCode: '鍗曞彿',
- areaId: "浠撳簱鍖哄煙",
- areaName: "鍖哄煙鍚嶇О ",
+ areaId: "搴撳尯ID",
+ areaName: "搴撳尯鍚嶇О ",
matnrId: "鐗╂枡鏍囪瘑",
matnrName: "鐗╂枡鍚嶇О",
matnrCode: "鐗╂枡缂栫爜",
@@ -361,6 +380,7 @@
workQty: '涓婃灦涓�',
qty: '宸插畬鎴�',
barcode: "鏉″舰鐮�",
+ isptResult: '璐ㄦ鐘舵��',
anfme: "鏁伴噺",
batch: "鎵规鍙�",
unit: "璁￠噺鍗曚綅",
@@ -469,15 +489,16 @@
matnrCode: "鐗╂枡缂栧彿",
maktx: "鐗╂枡鍚嶇О",
label: "鏍囩",
- splrName: "渚涘簲鍟嗗悕绉�",
- splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrName: "渚涘簲鍟�",
+ splrBatch: "鎵规",
stockBatch: "搴撳瓨鎵规",
isptResult: '璐ㄦ缁撹',
isptStatus: '璐ㄦ鐘舵��',
- rcptQty: "鏀惰揣鏁伴噺",
+ rcptQty: "鍙鏁伴噺",
dlyQty: "閫佽揣鏁伴噺",
disQty: "涓嶅悎鏁伴噺",
safeQty: "鍚堟牸鏁伴噺",
+ anfme: '宸叉鏁伴噺',
picPath: "鍥剧墖璺緞",
trackCode: "鏉″舰鐮�",
},
@@ -489,6 +510,7 @@
dictData: {
dictTypeId: "瀛楀吀鏍囪瘑",
dictTypeCode: "瀛楀吀缂栫爜",
+ group: "鍒嗙被",
value: "鍊�",
label: "鍒悕",
sort: "鎺掑簭",
@@ -588,6 +610,7 @@
splrName: "渚涘簲鍟�",
qrcode: "浜岀淮鐮�",
barcode: "搴忓垪鐮�",
+ isptResult: "璐ㄦ鐘舵��",
packName: "鍖呰",
ntyStatus: "鎶ユ鐘舵��",
prodTime: "鐢熶骇鏃ユ湡",
@@ -714,7 +737,7 @@
fields: {
fields: "瀛楁",
fieldsAlise: "瀛楁鍒悕",
- unique: "鏄惁蹇呭～",
+ unique: "鏁版嵁绫诲瀷",
flagEnable: "鍚敤",
},
fieldsItem: {
@@ -754,6 +777,7 @@
asnCode: "鏀惰揣閫氱煡鍗曠紪鐮�",
asnItemId: "鏀惰揣閫氱煡鍗曟槑缁唅d",
trackCode: "鏉″舰鐮�",
+ isptResult: '璐ㄦ鐘舵��',
anfme: "鏁伴噺",
workQty: "鎵ц涓暟閲�",
unit: "鍗曚綅",
@@ -855,6 +879,7 @@
source: "婧怚D",
matnrId: "鐗╂枡ID",
maktx: "鐗╂枡鍚嶇О",
+ isptResult: '璐ㄦ鐘舵��',
matnrCode: "鐗╂枡缂栫爜",
unit: "鍗曚綅",
anfme: "鏁伴噺",
@@ -1054,6 +1079,7 @@
complete: "瀹岀粨",
close: "鍏抽棴",
asnCreate: "閫氳繃鍗曟嵁鍒涘缓",
+ orderPrint: '鎵撳嵃鍗曟嵁',
createTask: "涓嬪彂浠诲姟",
createWave: "鐢熸垚娉㈡",
recover: "缁х画鏀惰揣",
--
Gitblit v1.9.1