From 183d1e50c7b9a040e39eec36de81e5331aa7b31c Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 26 三月 2025 08:58:12 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/en.js | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 45dbed4..e767188 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -128,6 +128,9 @@
warehouseAreas: 'WarehouseAreas',
loc: 'Loc',
locType: 'LocType',
+ locArea: 'locArea',
+ LocAreaMat: 'LocAreaMat',
+ locAreaMatRela: 'LocAreaMatRela',
container: 'Container',
contract: 'Contract',
qlyInspect: 'QlyInspect',
@@ -147,7 +150,6 @@
endBay: "endBay",
endLev: "endLev",
endRow: "endRow",
- locType: "locType",
startBay: "startBay",
startLev: "startLev",
startRow: "startRow",
@@ -290,6 +292,7 @@
name: "name",
code: "code",
parentId: "parentId",
+ parCode: "parCode",
},
warehouse: {
name: "name",
@@ -305,6 +308,7 @@
warehouseAreas: {
uuid: "uuid",
name: "name",
+ wareId: "ware",
code: "code",
shipperId: "shipperId",
supplierId: "supplierId",
@@ -353,12 +357,35 @@
maxPack: "MaxPack",
flagLabelMange: "FlagLabelMange",
locAttrs: "LocAttrs",
- useStatus: 'useStatus'
+ 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",
+ name: "name",
+ warehouseId: "warehouseId",
+ areaId: "areaId",
+ },
+ locAreaMatRela: {
+ areaId: "areaId",
+ code: "code",
+ matnrId: "matnrId",
+ groupId: "groupId",
+ locTypeId: "locTypeId",
+ locId: "locId",
},
container: {
code: "Code",
@@ -617,6 +644,15 @@
unenable: 'unenable',
locInit: 'loc init',
batch: 'batch',
+ confirm: 'confirm',
+ subzone: 'subzone',
+ bindmatnr: 'bind matnr',
+ bindloc: 'bind loc',
+ batchMatnrGropu: 'batchMatnrGropu',
+ batchStatus: 'batchStatus',
+ batchMix: 'batchFiexed',
+ batchWarehouse: 'batchWarehouse',
+ batchStockLevel: "batchStockLevel",
},
};
--
Gitblit v1.9.1