From a8bf6a39b243af3e6b3c0d52b7b836c9cdc743de Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 26 三月 2025 09:20:39 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/zh.js | 163 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 140 insertions(+), 23 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 0b1ed79..446f610 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -13,8 +13,8 @@
id: 'ID',
uuid: '缂栧彿',
name: '鍚嶇О',
- createTime: '娣诲姞鏃堕棿',
- createBy: '娣诲姞浜哄憳',
+ createTime: '鍒涘缓鏃堕棿',
+ createBy: '鍒涘缓浜哄憳',
updateTime: '淇敼鏃堕棿',
updateBy: '淇敼浜哄憳',
status: '鐘舵��',
@@ -68,6 +68,7 @@
deprecate: '搴熷純',
resend: '閲嶅彂',
selected: '椤归�変腑',
+ batch: '鎵归噺缂栬緫'
},
msg: {
confirm: {
@@ -121,11 +122,15 @@
userLogin: '鐧诲綍鏃ュ織',
customer: '瀹㈡埛琛�',
shipper: '璐т富淇℃伅',
- matnr: '鐗╂枡琛�',
+ matnr: '鐗╂枡',
matnrGroup: '鐗╂枡鍒嗙粍',
- warehouse: '浠撳簱淇℃伅',
- warehouseAreas: '浠撳簱搴撳尯',
- loc: '鍩虹搴撲綅',
+ warehouse: '浠撳簱',
+ warehouseAreas: '搴撳尯',
+ loc: '搴撲綅',
+ locType: '搴撲綅绫诲瀷',
+ locArea: '閫昏緫鍒嗗尯',
+ locAreaMat: '閫昏緫鍒嗗尯',
+ locAreaMatRela: '搴撳尯鐗╂枡鍏崇郴',
container: '瀹瑰櫒绠＄悊',
contract: '鍚堝悓淇℃伅',
qlyInspect: '璐ㄦ淇℃伅',
@@ -139,6 +144,9 @@
purchase: 'PO鍗�',
purchaseItem: 'PO鍗曟槑缁�',
whMat: '搴撳尯鐗╂枡鍏崇郴',
+ fields: '鎵╁睍瀛楁',
+ fieldsItem: '鎵╁睍瀛楁鏄庣粏',
+ warehouseAreasItem: '搴撳尯搴撳瓨淇℃伅',
},
table: {
field: {
@@ -270,29 +278,31 @@
minQty: "鏈�灏忓��",
maxQty: "鏈�澶у��",
stagn: "鍋滄粸棰勮鍊�",
- valid: "淇濊川鏈�",
- validWarn: "鏁堟湡棰勮",
+ valid: "淇濊川鏈�(澶�)",
+ validWarn: "鏁堟湡棰勮(澶�)",
flagCheck: "鍏嶆",
},
matnrGroup: {
name: "鍚嶇О",
code: "缂栫爜",
- parentId: "鐖剁被鏍囪瘑",
+ parentId: "涓婄骇鏍囪瘑",
+ parCode: "涓婄骇缂栫爜",
},
warehouse: {
- name: "鍚嶇О",
+ name: "浠撳簱鍚嶇О",
code: "缂栫爜",
factory: "宸ュ巶",
address: "鍦板潃",
longitude: "缁忓害",
latgitude: "绾害",
- length: "闀�",
- width: "瀹�",
- height: "楂�",
+ length: "闀�(m)",
+ width: "瀹�(m)",
+ height: "楂�(m)",
},
warehouseAreas: {
uuid: "鍞竴缂栫爜",
name: "鍚嶇О",
+ wareId: "鎵�灞炰粨搴�",
code: "缂栫爜",
shipperId: "璐т富",
supplierId: "渚涘簲鍟�",
@@ -300,17 +310,39 @@
flagLabelMange: "鏍囩绠＄悊",
flagMix: "娣锋斁",
},
+ warehouseAreasItem: {
+ areaId: "浠撳簱鍖哄煙",
+ areaName: "鍖哄煙鍚嶇О ",
+ matnrId: "鐗╂枡鏍囪瘑",
+ matnrName: "鐗╂枡鍚嶇О",
+ matnrCode: "鐗╂枡缂栫爜",
+ fieldsIndex: "鎵╁睍瀛楁鍞竴鏍囪瘑",
+ barcode: "鏉″舰鐮�",
+ anfme: "鏁伴噺",
+ batch: "鎵规鍙�",
+ unit: "璁￠噺鍗曚綅",
+ stockUnit: "搴撳瓨鍗曚綅",
+ brand: "鍝佺墝",
+ shipperId: "璐т富鏍囪瘑",
+ splrId: "渚涘簲鍟嗘爣璇�",
+ weight: "鏀惰揣閲嶉噺",
+ prodTime: "鐢熶骇鏃ユ湡",
+ splrBtch: "渚涘簲鍟嗘壒娆�",
+ },
loc: {
- warehouseId: "浠撳簱",
- areaId: "搴撳尯",
+ warehouseId: "鎵�灞炰粨搴�",
+ areaId: "鎵�灞炲簱鍖�",
code: "缂栫爜",
- type: "绫诲瀷",
+ type: "搴撲綅绫诲瀷",
name: "鍚嶇О",
flagLogic: "铏氭嫙搴撲綅",
fucAtrrs: "鍔熻兘灞炴��",
barcode: "瀹瑰櫒鐮�",
unit: "鍗曚綅",
size: "闀�/瀹�/楂�",
+ length: "闀�",
+ width: "瀹�",
+ height: "楂�",
row: "鎺�",
col: "鍒�",
lev: "灞�",
@@ -319,8 +351,42 @@
maxPack: "鏈�澶у寘瑁呮暟",
flagLabelMange: "鏍囩绠＄悊",
locAttrs: "灞炴��",
+ endBay: "缁堟鍒�",
+ endLev: "缁堟灞�",
+ endRow: "缁堟鎺�",
+ locType: "瀹界獎绫诲瀷",
+ startBay: "璧峰鍒�",
+ startLev: "璧峰灞�",
+ startRow: "璧峰鎺�",
+ useStatus: '搴撲綅鐘舵��',
+ locAreaId: '閫昏緫鍒嗗尯'
},
-
+ locType: {
+ name: "搴撲綅绫诲瀷",
+ code: "缂栧彿",
+ regex: "瑙勫垯琛ㄨ揪寮�",
+ },
+ locArea: {
+ name: "鍚嶇О",
+ code: "缂栫爜",
+ areaId: "搴撳尯",
+ locId: "搴撲綅",
+ },
+ locAreaMat: {
+ code: "閫昏緫缂栫爜",
+ depict: "閫昏緫鎻忚堪",
+ name: "鍚嶇О",
+ warehouseId: "浠撳簱",
+ areaId: "搴撳尯",
+ },
+ locAreaMatRela: {
+ areaId: "搴撳尯",
+ code: "缂栫爜",
+ matnrId: "鐗╂枡",
+ groupId: "鐗╂枡鍒嗙粍",
+ locTypeId: "搴撲綅绫诲瀷",
+ locId: "搴撲綅",
+ },
container: {
code: "缂栫爜",
name: "鍚嶇О",
@@ -345,12 +411,30 @@
},
qlyInspect: {
code: "缂栫爜",
- name: "鍚嶇О",
+ wkType: "wkType",
+ safeQty: "鍚堟牸鏁伴噺",
+ dlyQty: "dlyQty",
+ rcptQty: "rcptQty",
+ isptQty: "isptQty",
+ },
+ qlyIsptItem: {
+ ispectId: "ispectId",
+ matnrCode: "matnrCode",
+ maktx: "maktx",
+ label: "label",
+ splrName: "splrName",
+ splrBatch: "splrBatch",
+ stockBatch: "stockBatch",
+ rcptQty: "rcptQty",
+ dlyQty: "dlyQty",
+ disQty: "disQty",
+ safeQty: "safeQty",
+ picPath: "picPath",
},
dictType: {
code: "瀛楀吀缂栫爜",
name: "瀛楀吀鍚嶇О",
- description: "鍐呭鎻忚堪",
+ description: "鍐呭",
},
dictData: {
dictTypeId: "瀛楀吀鏍囪瘑",
@@ -409,7 +493,7 @@
wkType: "涓氬姟绫诲瀷",
anfme: "鏁伴噺",
qty: "宸插畬鎴愭暟閲�",
- logisNo: "logisNo",
+ logisNo: "鐗╂祦鍗曞彿",
arrTime: "棰勮鍒拌揪鏃堕棿",
rleStatus: "閲婃斁鐘舵��",
ntyStatus: "璐ㄦ涓婃姤鐘舵��",
@@ -420,7 +504,7 @@
poDetlId: "PO鍗曟爣璇�",
poDetlCode: "PO鍗曠紪鐮�",
matnrId: "鐗╂枡鏍囪瘑",
- matnk: "鐗╂枡鍚嶇О",
+ maktx: "鐗╂枡鍚嶇О",
anfme: "鏁伴噺",
stockUnit: "搴撳瓨鍗曚綅",
purQty: "閲囪喘鏁伴噺",
@@ -458,11 +542,24 @@
anfme: "鏁伴噺",
qty: "宸插畬鎴�",
nromQty: "鏍囧寘鏁伴噺",
- asnQty: "鍗曟嵁鏁伴噺",
+ asnQty: "鍗曟嵁鏁伴噺",
printQty: "鎵撳嵃鏁伴噺",
splrName: "渚涘簲鍟嗗悕绉�",
splrCode: "渚涘簲鍟嗙紪鐮�",
splrBatch: "渚涘簲鍟嗘壒娆�",
+ },
+ fields: {
+ fields: "瀛楁",
+ fieldsAlise: "瀛楁鍒悕",
+ unique: "绱㈠紩瀛楁",
+ flagEnable: "鍚敤",
+ },
+ fieldsItem: {
+ uuid: "鍞竴鏍囪瘑",
+ fieldsId: "涓诲崟瀛楁鏍囪瘑",
+ value: "value",
+ matnrId: "matnrId",
+ shiperId: "shiperId",
},
}
},
@@ -540,7 +637,27 @@
shipper: '璐т富涓嶈兘涓虹┖',
groupId: '鍒嗙粍涓嶈兘涓虹┖',
}
- }
+ },
+ toolbar: {
+ inspection: "鎶ユ",
+ creatcode: "鐢熸垚鏉＄爜",
+ print: "鎵撳嵃",
+ enable: '鍚敤',
+ unenable: '绂佺敤',
+ locInit: '聽搴撲綅鍒濆鍖�',
+ batch: '鎵归噺鎿嶄綔',
+ confirm: '纭',
+ subzone: '缁戝畾鍒嗗尯',
+ bindmatnr: '缁戝畾鐗╂枡',
+ bindloc: '缁戝畾搴撲綅',
+ batchMatnrGropu: '鎵归噺鐗╂枡鍒嗙粍',
+ batchStatus: '鎵归噺鐘舵��',
+ batchMix: '鎵归噺娣锋斁',
+ batchWarehouse: '鎵归噺浠撳簱',
+ batchStockLevel: "鎵归噺ABC鍒嗙被",
+ batchValidWarn: "鎵归噺棰勮",
+ batchFlagCheck: "鎵归噺鍏嶆",
+ },
};
export default customChineseMessages;
--
Gitblit v1.9.1