From 8eaee61fbbdea1eaa294b0f1a7d9f2a10da9ade9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 10 三月 2025 17:06:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev
---
rsf-admin/src/i18n/en.js | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 227 insertions(+), 8 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 01d776a..fcb6747 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -106,7 +106,9 @@
},
menu: {
dashboard: 'Dashboard',
+ basicInfo: 'BasicInfo',
settings: 'Settings',
+ basicInfo: 'BasicInfo',
system: 'System',
user: 'User',
role: 'Role',
@@ -122,7 +124,22 @@
shipper: 'shipper',
matnr: 'Matnr',
matnrGroup: 'MatnrGroup',
-
+ warehouse: 'Warehouse',
+ warehouseAreas: 'WarehouseAreas',
+ loc: 'Loc',
+ container: 'Container',
+ contract: 'Contract',
+ qlyInspect: 'QlyInspect',
+ dictType: 'DictType',
+ dictData: 'DictData',
+ companys: 'Companys',
+ serialRuleItem: 'SerialRuleItem',
+ serialRule: 'SerialRule',
+ asnOrder: 'AsnOrder',
+ asnOrderItem: 'AsnOrderItem',
+ purchase: 'Purchase',
+ purchaseItem: 'PurchaseItem',
+ whMat: 'Warehouse Mat',
},
table: {
field: {
@@ -236,7 +253,7 @@
code: "code",
shipperId: "shipperId",
groupId: "groupId",
- batchRegularId: "batchRegularId",
+ rglarId: "RegularId",
erpCode: "erpCode",
spec: "spec",
model: "model",
@@ -246,22 +263,206 @@
describle: "describle",
nromNum: "nromNum",
unit: "unit",
- purchaseUnit: "purchaseUnit",
+ purUnit: "purchaseUnit",
stockUnit: "stockUnit",
- stockLeval: "stockLeval",
+ stockLevel: "stockLeval",
isLabelMange: "isLabelMange",
- safetyQty: "safetyQty",
+ safeQty: "safetyQty",
minQty: "minQty",
maxQty: "maxQty",
- stagnate: "stagnate",
- validity: "validity",
- validityWarr: "validityWarr",
+ stagn: "stagnate",
+ valid: "validity",
+ validWarn: "validityWarn",
flagCheck: "flagCheck",
},
matnrGroup: {
name: "name",
code: "code",
parentId: "parentId",
+ },
+ warehouse: {
+ name: "name",
+ code: "code",
+ factory: "factory",
+ address: "address",
+ longitude: "longitude",
+ latgitude: "latgitude",
+ length: "length",
+ width: "width",
+ height: "height",
+ },
+ warehouseAreas: {
+ uuid: "uuid",
+ name: "name",
+ code: "code",
+ shipperId: "shipperId",
+ supplierId: "supplierId",
+ flagMinus: "flagMinus",
+ flagLabelMange: "flagLabelMange",
+ flagMix: "flagMix",
+ },
+ loc: {
+ warehouseId: "Warehouse",
+ areaId: "Area",
+ code: "Code",
+ type: "Type",
+ name: "Name",
+ flagLogic: "FlagLogic",
+ fucAtrrs: "FucAtrrs",
+ barcode: "Barcode",
+ unit: "Unit",
+ size: "Size",
+ row: "Row",
+ col: "Col",
+ lev: "Lev",
+ channel: "Channel",
+ maxParts: "MaxParts",
+ maxPack: "MaxPack",
+ flagLabelMange: "FlagLabelMange",
+ locAttrs: "LocAttrs",
+ },
+ container: {
+ code: "Code",
+ name: "Name",
+ typeId: "TypeId",
+ used: "Used",
+ lenght: "Lenght",
+ width: "Width",
+ height: "Height",
+ rstLen: "RstLen",
+ rstWid: "RstWid",
+ rstWei: "RstWei",
+ rstHei: "RstHei",
+ panrentId: "PanrentId",
+ vaildTime: "VaildTime",
+ flagRycle: "FlagRycle",
+ flagLogic: "FlagLogic",
+ },
+ contract: {
+ code: "Code",
+ name: "Name",
+ projectName: "ProjectName",
+ },
+ qlyInspect: {
+ code: "Code",
+ name: "Name",
+ },
+ dictType: {
+ code: "Code",
+ name: "Name",
+ description: "Description",
+ },
+ dictData: {
+ dictTypeId: "dictTypeId",
+ dictTypeCode: "dictTypeCode",
+ value: "value",
+ label: "label",
+ sort: "sort",
+ color: "color",
+ },
+ companys: {
+ code: "Code",
+ name: "Name",
+ nameEn: "NameEn",
+ breifCode: "BreifCode",
+ type: "Type",
+ contact: "Contact",
+ tel: "Tel",
+ email: "Email",
+ pcode: "PCode",
+ province: "Province",
+ city: "City",
+ address: "Address",
+ },
+ serialRuleItem: {
+ ruleId: "ruleId",
+ wkType: "wkType",
+ feildValue: "feildValue",
+ len: "len",
+ lenStr: "lenStr",
+ sort: "sort",
+ },
+ serialRule: {
+ code: "code",
+ name: "name",
+ delimit: "delimit",
+ reset: "reset",
+ resetDep: "resetDep",
+ currValue: "currValue",
+ lastCode: "lastCode",
+ },
+ whMat: {
+ matnrCode: "matnrCode",
+ matnrName: "matnrName",
+ matnrGroupId: "matnrGroupId",
+ spec: "spec",
+ color: "color",
+ size: "size",
+ minWeight: "minWeight",
+ maxWeight: "maxWeight",
+ },
+ asnOrder: {
+ code: "Code",
+ poCode: "poCode",
+ poId: "poId",
+ type: "Type",
+ wkType: "wkType",
+ anfme: "anfme",
+ qty: "qty",
+ logisNo: "logisNo",
+ arrTime: "Arrived",
+ rleStatus: "Release",
+ ntyStatus: "Notify",
+ },
+ asnOrderItem: {
+ asnId: "asnId",
+ asnCode: "asnCode",
+ poDetlId: "poDetlId",
+ poDetlCode: "poDetlCode",
+ matnrId: "matnrId",
+ matnk: "matnk",
+ anfme: "anfme",
+ stockUnit: "stockUnit",
+ purQty: "purQty",
+ purUnit: "purUnit",
+ qty: "qty",
+ splrCode: "splrCode",
+ splrName: "splrName",
+ qrcode: "qrcode",
+ barcode: "barcode",
+ packName: "packName",
+ ntyStatus: "ntyStatus",
+ },
+ purchase: {
+ code: "code",
+ erpId: "erpId",
+ type: "type",
+ wkType: "wkType",
+ source: "source",
+ preArr: "preArr",
+ anfme: "anfme",
+ qty: "qty",
+ workQty: "workQty",
+ channel: "channel",
+ erpCode: "erpCode",
+ project: "project",
+ startTime: "startTime",
+ endTime: "endTime",
+ },
+ purchaseItem: {
+ purchaseId: "purchaseId",
+ platItemId: "erpItemId",
+ matnrCode: "matnrCode",
+ matnrName: "matnrName",
+ unit: "unit",
+ anfme: "anfme",
+ qty: "qty",
+ nromQty: "nromQty",
+ asnQty: "asnQty",
+ printQty: "printQty",
+ splrName: "splrName",
+ splrCode: "splrCode",
+ splrBatch: "splrBatch",
},
}
},
@@ -319,6 +520,24 @@
},
},
},
+ matnr: {
+ title: {
+ basic: 'basic info',
+ control: 'control',
+ batchRole: 'batch role',
+ }
+ },
+ whMat: {
+ title: {
+ add: 'add',
+ }
+ },
+ },
+ form: {
+ matnr: {
+ shipper: 'shipper is required',
+ groupId: 'groupId is required',
+ }
}
};
--
Gitblit v1.9.1