From e0b42ac6d0f0361233bf2190b149c6c63c4e2323 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期一, 31 三月 2025 15:50:25 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/en.js | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 164 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index cda7790..ce79b97 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -129,10 +129,12 @@
loc: 'Loc',
locType: 'LocType',
locArea: 'locArea',
+ LocAreaMat: 'LocAreaMat',
locAreaMatRela: 'LocAreaMatRela',
container: 'Container',
contract: 'Contract',
qlyInspect: 'QlyInspect',
+ qlyIsptItem: '璐ㄦ淇℃伅鏄庣粏',
dictType: 'DictType',
dictData: 'DictData',
companys: 'Companys',
@@ -140,18 +142,19 @@
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',
- endBay: "endBay",
- endLev: "endLev",
- endRow: "endRow",
- startBay: "startBay",
- startLev: "startLev",
- startRow: "startRow",
+ deviceSite: 'deviceSite',
+ waitPakin: 'WaitPakin',
+ waitPakinItem: 'WaitPakinItem',
+ task: 'Task',
+ taskItem: 'TaskItem',
},
table: {
field: {
@@ -291,6 +294,7 @@
name: "name",
code: "code",
parentId: "parentId",
+ parCode: "parCode",
},
warehouse: {
name: "name",
@@ -370,6 +374,13 @@
areaId: "areaId",
locId: "locId",
},
+ locAreaMat: {
+ code: "code",
+ depict: "depict",
+ name: "name",
+ warehouseId: "warehouseId",
+ areaId: "areaId",
+ },
locAreaMatRela: {
areaId: "areaId",
code: "code",
@@ -401,12 +412,15 @@
projectName: "ProjectName",
},
qlyInspect: {
+ asnId: "asnId",
+ asnCode: "asnCode",
code: "code",
wkType: "wkType",
safeQty: "safeQty",
dlyQty: "dlyQty",
rcptQty: "rcptQty",
isptQty: "isptQty",
+ isptStatus: "isptStatus",
},
qlyIsptItem: {
ispectId: "ispectId",
@@ -416,6 +430,7 @@
splrName: "splrName",
splrBatch: "splrBatch",
stockBatch: "stockBatch",
+ isptResult: 'isptResult',
rcptQty: "rcptQty",
dlyQty: "dlyQty",
disQty: "disQty",
@@ -508,6 +523,44 @@
packName: "packName",
ntyStatus: "ntyStatus",
},
+ 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",
@@ -551,6 +604,98 @@
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",
},
}
},
@@ -634,11 +779,24 @@
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",
+ quality: "quality",
+ complete: "complete",
+ close: "close",
+ asnCreate: "asnCreate",
},
};
--
Gitblit v1.9.1