From b2bd54b277f12d532e5c87e02e3e97d087a52fee Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 05 三月 2025 16:47:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev
---
rsf-admin/src/i18n/en.js | 113 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 73 insertions(+), 40 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 63c3dcd..052d395 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -133,9 +133,9 @@
dictType: 'DictType',
dictData: 'DictData',
companys: 'Companys',
-
-
-
+ serialRuleItem: 'SerialRuleItem',
+ serialRule: 'SerialRule',
+ whMat: 'Warehouse Mat',
},
table: {
field: {
@@ -298,40 +298,41 @@
flagMix: "flagMix",
},
loc: {
- areaId: "areaId",
- 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",
+ 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",
+ 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",
@@ -339,12 +340,13 @@
projectName: "ProjectName",
},
qlyInspect: {
- code: "code",
- name: "name",
+ code: "Code",
+ name: "Name",
},
dictType: {
- name: "name",
- description: "description",
+ code: "Code",
+ name: "Name",
+ description: "Description",
},
dictData: {
dictTypeId: "dictTypeId",
@@ -368,6 +370,33 @@
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",
+ }
}
},
page: {
@@ -431,7 +460,11 @@
batchRole: 'batch role',
}
},
-
+ whMat: {
+ title: {
+ add: 'add',
+ }
+ },
},
form: {
matnr: {
--
Gitblit v1.9.1