From 47a682630b8563017db497f2d0b48b3827a2ab40 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 25 三月 2025 14:25:49 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/en.js | 103 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 98 insertions(+), 5 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 7b12baf..dfb832c 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',
@@ -142,6 +146,13 @@
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: {
@@ -281,6 +292,7 @@
name: "name",
code: "code",
parentId: "parentId",
+ parCode: "parCode",
},
warehouse: {
name: "name",
@@ -296,12 +308,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",
@@ -314,6 +346,9 @@
barcode: "Barcode",
unit: "Unit",
size: "Size",
+ length: "length",
+ width: "width",
+ height: "height",
row: "Row",
col: "Col",
lev: "Lev",
@@ -322,6 +357,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",
@@ -346,8 +407,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",
@@ -422,7 +501,7 @@
poDetlId: "poDetlId",
poDetlCode: "poDetlCode",
matnrId: "matnrId",
- matnk: "matnk",
+ maktx: "maktx",
anfme: "anfme",
stockUnit: "stockUnit",
purQty: "purQty",
@@ -553,7 +632,21 @@
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',
+ batchMatnrGropu: 'batchMatnrGropu',
+ },
};
export default customEnglishMessages;
--
Gitblit v1.9.1