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 | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 109 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index c0a1107..955d2bc 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',
@@ -143,6 +147,9 @@
fields: 'Extend Fields',
fieldsItem: 'Extend Fields Items',
warehouseAreasItem: 'WarehouseAreasItem',
+ deviceSite: 'deviceSite',
+ waitPakin: 'WaitPakin',
+ waitPakinItem: 'WaitPakinItem',
},
table: {
field: {
@@ -282,6 +289,7 @@
name: "name",
code: "code",
parentId: "parentId",
+ parCode: "parCode",
},
warehouse: {
name: "name",
@@ -297,6 +305,7 @@
warehouseAreas: {
uuid: "uuid",
name: "name",
+ wareId: "ware",
code: "code",
shipperId: "shipperId",
supplierId: "supplierId",
@@ -334,6 +343,9 @@
barcode: "Barcode",
unit: "Unit",
size: "Size",
+ length: "length",
+ width: "width",
+ height: "height",
row: "Row",
col: "Col",
lev: "Lev",
@@ -342,6 +354,35 @@
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",
@@ -367,12 +408,25 @@
},
qlyInspect: {
code: "code",
- name: "name",
- barcode: "barcode",
- asnItemId: "asnItemId",
- poItemId: "poItemId",
+ 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",
@@ -447,7 +501,7 @@
poDetlId: "poDetlId",
poDetlCode: "poDetlCode",
matnrId: "matnrId",
- matnk: "matnk",
+ maktx: "maktx",
anfme: "anfme",
stockUnit: "stockUnit",
purQty: "purQty",
@@ -503,6 +557,38 @@
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",
+ anfme: "anfme",
+ workQty: "workQty",
+ unit: "unit",
+ fieldsIndex: "fieldsIndex",
+ qty: "qty",
+ batch: "batch",
},
}
},
@@ -583,6 +669,23 @@
inspection: "Inspection",
creatcode: "creatcode",
print: "print",
+ 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