From 85b8e7ba6c4d0d780a7f90360150f2bd955eb874 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 29 三月 2025 08:07:17 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/en.js | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index cda7790..955d2bc 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -129,6 +129,7 @@
loc: 'Loc',
locType: 'LocType',
locArea: 'locArea',
+ LocAreaMat: 'LocAreaMat',
locAreaMatRela: 'LocAreaMatRela',
container: 'Container',
contract: 'Contract',
@@ -146,12 +147,9 @@
fields: 'Extend Fields',
fieldsItem: 'Extend Fields Items',
warehouseAreasItem: 'WarehouseAreasItem',
- endBay: "endBay",
- endLev: "endLev",
- endRow: "endRow",
- startBay: "startBay",
- startLev: "startLev",
- startRow: "startRow",
+ deviceSite: 'deviceSite',
+ waitPakin: 'WaitPakin',
+ waitPakinItem: 'WaitPakinItem',
},
table: {
field: {
@@ -291,6 +289,7 @@
name: "name",
code: "code",
parentId: "parentId",
+ parCode: "parCode",
},
warehouse: {
name: "name",
@@ -369,6 +368,13 @@
code: "code",
areaId: "areaId",
locId: "locId",
+ },
+ locAreaMat: {
+ code: "code",
+ depict: "depict",
+ name: "name",
+ warehouseId: "warehouseId",
+ areaId: "areaId",
},
locAreaMatRela: {
areaId: "areaId",
@@ -552,6 +558,38 @@
matnrId: "MatnrId",
shiperId: "Shipper",
},
+ deviceSite: {
+ type: "type",
+ site: "site",
+ name: "name",
+ wcsCode: "wcsCode",
+ label: "label",
+ device: "device",
+ deviceCode: "deviceCode",
+ deviceSite: "deviceSite",
+ flagInit: "flagInit",
+ sites: "sites",
+ },
+ waitPakin: {
+ code: "code",
+ ansId: "ansId",
+ asnCode: "asnCode",
+ barcode: "barcode",
+ anfme: "anfme",
+ ioStatus: "ioStatus",
+ },
+ waitPakinItem: {
+ pakinId: "pakinId",
+ maktx: "maktx",
+ matnrId: "matnrId",
+ matnrCode: "matnrCode",
+ anfme: "anfme",
+ workQty: "workQty",
+ unit: "unit",
+ fieldsIndex: "fieldsIndex",
+ qty: "qty",
+ batch: "batch",
+ },
}
},
page: {
@@ -634,11 +672,20 @@
enable: 'enable',
unenable: 'unenable',
locInit: 'loc init',
+ siteInit: 'site init',
batch: 'batch',
confirm: 'confirm',
subzone: 'subzone',
bindmatnr: 'bind matnr',
bindloc: 'bind loc',
+ batchMatnrGropu: 'batchMatnrGropu',
+ batchStatus: 'batchStatus',
+ batchMix: 'batchFiexed',
+ batchWarehouse: 'batchWarehouse',
+ batchStockLevel: "batchStockLevel",
+ batchWarehouseAreas: "batchWarehouseAreas",
+ batchLocType: "batchLocType",
+ batchPrint: "batch print",
},
};
--
Gitblit v1.9.1