From 2b35183407eb7b1b1524f7b101f1098d9caea042 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 02 四月 2025 15:13:24 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/en.js | 416 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 381 insertions(+), 35 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index ab3b631..3f3392d 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,15 +127,34 @@
warehouse: 'Warehouse',
warehouseAreas: 'WarehouseAreas',
loc: 'Loc',
+ locType: 'LocType',
+ locArea: 'locArea',
+ LocAreaMat: 'LocAreaMat',
+ locAreaMatRela: 'LocAreaMatRela',
container: 'Container',
contract: 'Contract',
qlyInspect: 'QlyInspect',
+ qlyIsptItem: '璐ㄦ淇℃伅鏄庣粏',
dictType: 'DictType',
dictData: 'DictData',
companys: 'Companys',
serialRuleItem: 'SerialRuleItem',
serialRule: 'SerialRule',
-
+ asnOrder: 'AsnOrder',
+ asnOrderItem: 'AsnOrderItem',
+ asnOrderLog: 'asnOrderLog',
+ asnOrderItemLog: 'asnOrderItemLog',
+ purchase: 'Purchase',
+ purchaseItem: 'PurchaseItem',
+ whMat: 'Warehouse Mat',
+ fields: 'Extend Fields',
+ fieldsItem: 'Extend Fields Items',
+ warehouseAreasItem: 'WarehouseAreasItem',
+ deviceSite: 'deviceSite',
+ waitPakin: 'WaitPakin',
+ waitPakinItem: 'WaitPakinItem',
+ task: 'Task',
+ taskItem: 'TaskItem',
},
table: {
field: {
@@ -250,7 +269,7 @@
shipperId: "shipperId",
groupId: "groupId",
rglarId: "RegularId",
- erpCode: "erpCode",
+ platCode: "platCode",
spec: "spec",
model: "model",
weight: "weight",
@@ -275,6 +294,7 @@
name: "name",
code: "code",
parentId: "parentId",
+ parCode: "parCode",
},
warehouse: {
name: "name",
@@ -290,6 +310,7 @@
warehouseAreas: {
uuid: "uuid",
name: "name",
+ wareId: "ware",
code: "code",
shipperId: "shipperId",
supplierId: "supplierId",
@@ -297,41 +318,93 @@
flagLabelMange: "flagLabelMange",
flagMix: "flagMix",
},
- loc: {
+ warehouseAreasItem: {
areaId: "areaId",
- code: "code",
- type: "type",
- name: "name",
- flagLogic: "flagLogic",
- fucAtrrs: "fucAtrrs",
+ areaName: "areaName",
+ matnrId: "matnrId",
+ matnrName: "matnrName",
+ matnrCode: "matnrCode",
+ fieldsIndex: "fieldsIndex",
barcode: "barcode",
+ anfme: "anfme",
+ batch: "batch",
unit: "unit",
- size: "size",
- row: "row",
- col: "col",
- lev: "lev",
- channel: "channel",
- maxParts: "maxParts",
- maxPack: "maxPack",
- flagLabelMange: "flagLabelMange",
- locAttrs: "locAttrs",
+ stockUnit: "stockUnit",
+ brand: "brand",
+ shipperId: "shipperId",
+ splrId: "splrId",
+ weight: "weight",
+ prodTime: "prodTime",
+ splrBtch: "splrBtch",
},
- container: {
- code: "code",
- name: "name",
- typeId: "typeId",
- used: "used",
- lenght: "lenght",
+ loc: {
+ warehouseId: "Warehouse",
+ areaId: "Area",
+ code: "Code",
+ type: "Type",
+ name: "Name",
+ flagLogic: "FlagLogic",
+ fucAtrrs: "FucAtrrs",
+ barcode: "Barcode",
+ unit: "Unit",
+ size: "Size",
+ length: "length",
width: "width",
height: "height",
- rstLen: "rstLen",
- rstWid: "rstWid",
- rstWei: "rstWei",
- rstHei: "rstHei",
- panrentId: "panrentId",
- vaildTime: "vaildTime",
- flagRycle: "flagRycle",
- flagLogic: "flagLogic",
+ row: "Row",
+ col: "Col",
+ lev: "Lev",
+ channel: "Channel",
+ maxParts: "MaxParts",
+ 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",
+ name: "name",
+ warehouseId: "warehouseId",
+ areaId: "areaId",
+ },
+ locAreaMatRela: {
+ areaId: "areaId",
+ code: "code",
+ matnrId: "matnrId",
+ groupId: "groupId",
+ locTypeId: "locTypeId",
+ locId: "locId",
+ },
+ 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",
@@ -339,8 +412,31 @@
projectName: "ProjectName",
},
qlyInspect: {
+ asnId: "asnId",
+ asnCode: "asnCode",
code: "code",
- name: "name",
+ wkType: "wkType",
+ safeQty: "safeQty",
+ dlyQty: "dlyQty",
+ rcptQty: "rcptQty",
+ isptQty: "isptQty",
+ isptStatus: "isptStatus",
+ },
+ qlyIsptItem: {
+ ispectId: "ispectId",
+ matnrCode: "matnrCode",
+ maktx: "maktx",
+ label: "label",
+ splrName: "splrName",
+ splrBatch: "splrBatch",
+ stockBatch: "stockBatch",
+ isptResult: 'isptResult',
+ rcptQty: "rcptQty",
+ dlyQty: "dlyQty",
+ disQty: "disQty",
+ safeQty: "safeQty",
+ picPath: "picPath",
+ trackCode: "trackCode",
},
dictType: {
code: "Code",
@@ -385,6 +481,223 @@
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",
+ maktx: "maktx",
+ anfme: "anfme",
+ stockUnit: "stockUnit",
+ purQty: "purQty",
+ purUnit: "purUnit",
+ qty: "qty",
+ splrCode: "splrCode",
+ splrName: "splrName",
+ qrcode: "qrcode",
+ barcode: "barcode",
+ packName: "packName",
+ ntyStatus: "ntyStatus",
+ platItemId: 'platItemId'
+ },
+ asnOrderLog: {
+ code: "code",
+ poCode: "poCode",
+ poId: "poId",
+ type: "type",
+ wkType: "wkType",
+ anfme: "anfme",
+ qty: "qty",
+ logisNo: "logisNo",
+ arrTime: "arrTime",
+ rleStatus: "rleStatus",
+ ntyStatus: "ntyStatus",
+ },
+ asnOrderItemLog: {
+ asnId: "asnId",
+ asnCode: "asnCode",
+ platItemId: "platItemId",
+ poDetlId: "poDetlId",
+ poCode: "poCode",
+ fieldsIndex: "fieldsIndex",
+ matnrId: "matnrId",
+ matnrCode: "matnrCode",
+ maktx: "maktx",
+ anfme: "anfme",
+ stockUnit: "stockUnit",
+ purQty: "purQty",
+ purUnit: "purUnit",
+ qty: "qty",
+ splrCode: "splrCode",
+ splrBatch: "splrBatch",
+ splrName: "splrName",
+ qrcode: "qrcode",
+ trackCode: "trackCode",
+ barcode: "barcode",
+ packName: "packName",
+ ntyStatus: "ntyStatus",
+ prodTime: "prodTime",
+ },
+ purchase: {
+ code: "code",
+ platId: "PlatId",
+ type: "type",
+ wkType: "wkType",
+ source: "source",
+ preArr: "preArr",
+ anfme: "anfme",
+ qty: "qty",
+ workQty: "workQty",
+ channel: "channel",
+ platCode: "platCode",
+ 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",
+ },
+ fields: {
+ fields: "Fields",
+ fieldsAlise: "FieldsAlise",
+ unique: "Unique",
+ flagEnable: "FlagEnable",
+ },
+ fieldsItem: {
+ uuid: "uuid",
+ fieldsId: "FieldsId",
+ value: "Value",
+ 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",
+ asnId: "asnId",
+ asnCode: "asnCode",
+ asnItemId: "asnItemId",
+ trackCode: "trackCode",
+ anfme: "anfme",
+ workQty: "workQty",
+ unit: "unit",
+ fieldsIndex: "fieldsIndex",
+ qty: "qty",
+ batch: "batch",
+ },
+ waitPakinLog: {
+ pakinId: "pakinId",
+ code: "code",
+ barcode: "barcode",
+ anfme: "anfme",
+ ioStatus: "ioStatus",
+ },
+ waitPakinItemLog: {
+ pakinId: "pakinId",
+ pakinItemId: "pakinItemId",
+ asnId: "asnId",
+ asnCode: "asnCode",
+ asnItemId: "asnItemId",
+ trackCode: "trackCode",
+ maktx: "maktx",
+ matnrId: "matnrId",
+ matnrCode: "matnrCode",
+ anfme: "anfme",
+ workQty: "workQty",
+ unit: "unit",
+ fieldsIndex: "fieldsIndex",
+ qty: "qty",
+ batch: "batch",
+ },
+ task: {
+ taskCode: "TaskCode",
+ taskStatus: "Status",
+ taskType: "Type",
+ orgLoc: "orgLoc",
+ orgSite: "orgSite",
+ targLoc: "targLoc",
+ targSite: "targSite",
+ barcode: "barcode",
+ robotCode: "robotCode",
+ exceStatus: "exceStatus",
+ expDesc: "expDesc",
+ sort: "sort",
+ expCode: "expCode",
+ startTime: "startTime",
+ endTime: "endTime",
+ },
+ taskItem: {
+ taskId: "taskId",
+ orderId: "orderId",
+ orderType: "orderType",
+ orderItemId: "orderItemId",
+ sourceCode: "sourceCode",
+ matnrId: "matnrId",
+ maktx: "maktx",
+ matnrCode: "matnrCode",
+ unit: "unit",
+ anfme: "anfme",
+ batch: "batch",
+ spec: "spec",
+ model: "model",
},
}
},
@@ -449,14 +762,47 @@
batchRole: 'batch role',
}
},
-
+ whMat: {
+ title: {
+ add: 'add',
+ }
+ },
},
form: {
matnr: {
shipper: 'shipper is required',
groupId: 'groupId is required',
}
- }
+ },
+ toolbar: {
+ inspection: "Inspection",
+ creatcode: "creatcode",
+ print: "print",
+ enable: 'enable',
+ unenable: 'unenable',
+ locInit: 'loc init',
+ siteInit: 'site init',
+ batch: 'batch',
+ confirm: 'confirm',
+ cancel: "cancel",
+ top: "top",
+ resort: "sort",
+ 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",
+ quality: "quality",
+ complete: "complete",
+ close: "close",
+ asnCreate: "asnCreate",
+ },
};
export default customEnglishMessages;
--
Gitblit v1.9.1