From eb8ded2565e746a360985f702c556b26f750d35a Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 25 三月 2025 09:07:51 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/i18n/en.js | 139 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 115 insertions(+), 24 deletions(-) diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js index e2a33b9..fe02573 100644 --- a/rsf-admin/src/i18n/en.js +++ b/rsf-admin/src/i18n/en.js @@ -68,6 +68,7 @@ deprecate: 'Deprecate', resend: 'RESEND', selected: 'selected', + batch: 'batch' }, msg: { confirm: { @@ -106,7 +107,6 @@ }, menu: { dashboard: 'Dashboard', - basicInfo: 'BasicInfo', settings: 'Settings', basicInfo: 'BasicInfo', system: 'System', @@ -127,6 +127,10 @@ warehouse: 'Warehouse', warehouseAreas: 'WarehouseAreas', loc: 'Loc', + locType: 'LocType', + locArea: 'locArea', + LocAreaMat: 'LocAreaMat', + locAreaMatRela: 'LocAreaMatRela', container: 'Container', contract: 'Contract', qlyInspect: 'QlyInspect', @@ -140,6 +144,15 @@ purchase: 'Purchase', purchaseItem: 'PurchaseItem', whMat: 'Warehouse Mat', + fields: 'Extend Fields', + fieldsItem: 'Extend Fields Items', + warehouseAreasItem: 'WarehouseAreasItem', + endBay: "endBay", + endLev: "endLev", + endRow: "endRow", + startBay: "startBay", + startLev: "startLev", + startRow: "startRow", }, table: { field: { @@ -254,7 +267,7 @@ shipperId: "shipperId", groupId: "groupId", rglarId: "RegularId", - erpCode: "erpCode", + platCode: "platCode", spec: "spec", model: "model", weight: "weight", @@ -294,12 +307,32 @@ warehouseAreas: { uuid: "uuid", name: "name", + wareId: "ware", code: "code", shipperId: "shipperId", supplierId: "supplierId", flagMinus: "flagMinus", flagLabelMange: "flagLabelMange", flagMix: "flagMix", + }, + warehouseAreasItem: { + areaId: "areaId", + areaName: "areaName", + matnrId: "matnrId", + matnrName: "matnrName", + matnrCode: "matnrCode", + fieldsIndex: "fieldsIndex", + barcode: "barcode", + anfme: "anfme", + batch: "batch", + unit: "unit", + stockUnit: "stockUnit", + brand: "brand", + shipperId: "shipperId", + splrId: "splrId", + weight: "weight", + prodTime: "prodTime", + splrBtch: "splrBtch", }, loc: { warehouseId: "Warehouse", @@ -312,6 +345,9 @@ barcode: "Barcode", unit: "Unit", size: "Size", + length: "length", + width: "width", + height: "height", row: "Row", col: "Col", lev: "Lev", @@ -320,6 +356,32 @@ maxPack: "MaxPack", flagLabelMange: "FlagLabelMange", locAttrs: "LocAttrs", + useStatus: 'useStatus', + locAreaId: 'locAreaId' + }, + locType: { + uuid: "uuid", + code: "code", + name: "name", + regex: "regex", + }, + locArea: { + name: "name", + code: "code", + areaId: "areaId", + locId: "locId", + }, + locAreaMat: { + code: "code", + depict: "depict", + }, + locAreaMatRela: { + areaId: "areaId", + code: "code", + matnrId: "matnrId", + groupId: "groupId", + locTypeId: "locTypeId", + locId: "locId", }, container: { code: "Code", @@ -344,8 +406,26 @@ projectName: "ProjectName", }, qlyInspect: { - code: "Code", - name: "Name", + code: "code", + wkType: "wkType", + safeQty: "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: "Code", @@ -420,7 +500,7 @@ poDetlId: "poDetlId", poDetlCode: "poDetlCode", matnrId: "matnrId", - matnk: "matnk", + maktx: "maktx", anfme: "anfme", stockUnit: "stockUnit", purQty: "purQty", @@ -433,24 +513,9 @@ packName: "packName", ntyStatus: "ntyStatus", }, - purchaseItem: { - purchaseId: "purchaseId", - erpItemId: "erpItemId", - matnrCode: "matnrCode", - matnrName: "matnrName", - unit: "unit", - anfme: "anfme", - qty: "qty", - nromQty: "nromQty", - asnQty: "asnQty", - printQty: "printQty", - splrName: "splrName", - splrCode: "splrCode", - splrBatch: "splrBatch", - }, purchase: { code: "code", - erpId: "erpId", + platId: "PlatId", type: "type", wkType: "wkType", source: "source", @@ -459,14 +524,14 @@ qty: "qty", workQty: "workQty", channel: "channel", - erpCode: "erpCode", + platCode: "platCode", project: "project", startTime: "startTime", endTime: "endTime", }, purchaseItem: { purchaseId: "purchaseId", - erpItemId: "erpItemId", + platItemId: "erpItemId", matnrCode: "matnrCode", matnrName: "matnrName", unit: "unit", @@ -478,6 +543,19 @@ splrName: "splrName", splrCode: "splrCode", splrBatch: "splrBatch", + }, + fields: { + fields: "Fields", + fieldsAlise: "FieldsAlise", + unique: "Unique", + flagEnable: "FlagEnable", + }, + fieldsItem: { + uuid: "uuid", + fieldsId: "FieldsId", + value: "Value", + matnrId: "MatnrId", + shiperId: "Shipper", }, } }, @@ -553,7 +631,20 @@ shipper: 'shipper is required', groupId: 'groupId is required', } - } + }, + toolbar: { + inspection: "Inspection", + creatcode: "creatcode", + print: "print", + enable: 'enable', + unenable: 'unenable', + locInit: 'loc init', + batch: 'batch', + confirm: 'confirm', + subzone: 'subzone', + bindmatnr: 'bind matnr', + bindloc: 'bind loc', + }, }; export default customEnglishMessages; -- Gitblit v1.9.1