From 632bb5a9a0f07c01ffba53e9009d69c4a50c2bd7 Mon Sep 17 00:00:00 2001 From: yangyang Date: 星期五, 21 三月 2025 12:50:01 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/i18n/en.js | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js index 45dbed4..dad32ca 100644 --- a/rsf-admin/src/i18n/en.js +++ b/rsf-admin/src/i18n/en.js @@ -128,6 +128,7 @@ warehouseAreas: 'WarehouseAreas', loc: 'Loc', locType: 'LocType', + locArea: 'locArea', container: 'Container', contract: 'Contract', qlyInspect: 'QlyInspect', @@ -147,7 +148,6 @@ endBay: "endBay", endLev: "endLev", endRow: "endRow", - locType: "locType", startBay: "startBay", startLev: "startLev", startRow: "startRow", @@ -305,6 +305,7 @@ warehouseAreas: { uuid: "uuid", name: "name", + wareId: "ware", code: "code", shipperId: "shipperId", supplierId: "supplierId", @@ -357,8 +358,15 @@ }, locType: { uuid: "uuid", + code: "code", name: "name", regex: "regex", + }, + locArea: { + name: "name", + code: "code", + areaId: "areaId", + locId: "locId", }, container: { code: "Code", @@ -617,6 +625,7 @@ unenable: 'unenable', locInit: 'loc init', batch: 'batch', + confirm: 'confirm', }, }; -- Gitblit v1.9.1