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 | 35 ++++++++++++++++++++++++++--------- 1 files changed, 26 insertions(+), 9 deletions(-) diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js index df68657..0fabcf6 100644 --- a/rsf-admin/src/i18n/zh.js +++ b/rsf-admin/src/i18n/zh.js @@ -140,12 +140,12 @@ warehouse: '浠撳簱', warehouseAreas: '搴撳尯', loc: '搴撲綅', - locType: '搴撲綅绫诲瀷', - locArea: '閫昏緫鍒嗗尯', - locAreaMat: '閫昏緫鍒嗗尯', + locType: '搴撲綅绫诲瀷(搴�)', + locArea: '閫昏緫鍒嗗尯(搴�)', + locAreaMat: '閫昏緫鍒嗗尯(搴�)', locAreaMatRela: '搴撳尯鐗╂枡鍏崇郴', - container: '瀹瑰櫒绠$悊', - contract: '鍚堝悓淇℃伅', + container: '瀹瑰櫒绠$悊(搴�)', + contract: '鍚堝悓淇℃伅(搴�)', qlyInspect: '璐ㄦ淇℃伅', qlyIsptItem: '璐ㄦ淇℃伅鏄庣粏', dictType: '鏁版嵁瀛楀吀', @@ -189,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: { }, @@ -470,7 +486,7 @@ }, qlyIsptItem: { ispectId: "涓诲崟ID", - matnrCode: "鐗╂枡缂栧彿", + matnrCode: "鐗╂枡缂栫爜", maktx: "鐗╂枡鍚嶇О", label: "鏍囩", splrName: "渚涘簲鍟�", @@ -482,7 +498,7 @@ dlyQty: "閫佽揣鏁伴噺", disQty: "涓嶅悎鏁伴噺", safeQty: "鍚堟牸鏁伴噺", - anfme: '鏁伴噺', + anfme: '宸叉鏁伴噺', picPath: "鍥剧墖璺緞", trackCode: "鏉″舰鐮�", }, @@ -580,7 +596,7 @@ spec: "瑙勬牸", model: "鍨嬪彿", matnrCode: "鐗╂枡缂栫爜", - anfme: "璁″垝鏁�", + anfme: "璁″垝鏁伴噺", stockUnit: "鍗曚綅", isptResult: "璐ㄦ缁撴灉", purQty: "閲囪喘閲�", @@ -1063,6 +1079,7 @@ complete: "瀹岀粨", close: "鍏抽棴", asnCreate: "閫氳繃鍗曟嵁鍒涘缓", + poCreate: "閫氳繃PO鍗曞垱寤�", orderPrint: '鎵撳嵃鍗曟嵁', createTask: "涓嬪彂浠诲姟", createWave: "鐢熸垚娉㈡", -- Gitblit v1.9.1