From 307811368b38882c36b9fa20d533570d39af730e Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 29 四月 2025 13:53:10 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/i18n/en.js | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-) diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js index 0f29dff..596f515 100644 --- a/rsf-admin/src/i18n/en.js +++ b/rsf-admin/src/i18n/en.js @@ -56,6 +56,7 @@ expand: 'Expand', expandAll: 'Expand All', collapse: 'Collapse', + newAddMats: 'New Mats', collapseAll: 'Collapse All', scope: 'Assign', import: { @@ -70,6 +71,8 @@ loadMore: 'Load More Data', complete: 'Complete', deprecate: 'Deprecate', + stockError: 'Empty', + inputPlaceholder: 'Use commas to separate', resend: 'RESEND', selected: 'selected', batch: 'batch' @@ -175,6 +178,9 @@ outStockItem: 'Out Stock Item', inStockPoces: 'In Stock Pocess', outStockPoces: 'Out Stock Pocess', + deviceBind: 'Device Bind', + wave: 'Wave Manage', + }, table: { field: { @@ -616,6 +622,7 @@ }, deliveryItem: { deliveryId: "deliveryId", + deliveryCode: "Delivery Code", platItemId: "platItemId", matnrCode: "matnrCode", matnrName: "matnrName", @@ -667,7 +674,6 @@ deviceCode: "deviceCode", deviceSite: "deviceSite", flagInit: "flagInit", - sites: "sites", }, waitPakin: { code: "code", @@ -717,6 +723,34 @@ fieldsIndex: "fieldsIndex", qty: "qty", batch: "batch", + }, + wave: { + code: "code", + type: "type", + exceStatus: "exceStatus", + anfme: "anfme", + qty: "qty", + orderNum: "orderNum", + }, + waveItem: { + waveId: "waveId", + waveCode: "waveCode", + matnrId: "matnrId", + matnrName: "matnrName", + matnrCode: "matnrCode", + batch: "batch", + splrBatch: "splrBatch", + orderCode: "orderCode", + orderItemId: "orderItemId", + unit: "unit", + trackCode: "trackCode", + fieldsIndex: "fieldsIndex", + anfme: "anfme", + workQty: "workQty", + qty: "Qty", + stockLocs: "Stock Locs", + stockQty: "Stock Qty", + }, task: { taskCode: "TaskCode", @@ -833,6 +867,18 @@ model: "model", fieldsIndex: "fieldsIndex", }, + deviceBind: { + currentRow: "currentRow", + startRow: "startRow", + endRow: "endRow", + deviceQty: "deviceQty", + startDeviceNo: "startDeviceNo", + endDeviceNo: "endDeviceNo", + staList: "staList", + typeId: "typeId", + beSimilar: "beSimilar", + emptySimilar: "emptySimilar", + }, } }, page: { @@ -944,6 +990,7 @@ asnCreate: "Create By Order", createTask: "createTask", recover: "recover", + createWave: "Create Wave", order: 'Orders', }, -- Gitblit v1.9.1