From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 17 七月 2025 16:35:23 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/i18n/en.js | 86 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 78 insertions(+), 8 deletions(-) diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js index 53ea47c..3e2edf7 100644 --- a/rsf-admin/src/i18n/en.js +++ b/rsf-admin/src/i18n/en.js @@ -44,6 +44,7 @@ main: 'Main', common: 'Common', changePwd: 'Change Password', + insuffInventory: 'Insufficient inventory' }, side: { title: 'More Info' @@ -78,6 +79,8 @@ result: 'Contacts import complete. Imported %{success} success, with %{error} errors', }, loadMore: 'Load More Data', + updateSucc: 'Update Success', + updateFaild: 'Update Failed', complete: 'Complete', deprecate: 'Deprecate', stockError: 'Empty', @@ -204,15 +207,17 @@ wave: 'Wave Manage', basStation: 'BasStation', basContainer: 'BasContainer', + waveRule: 'Wave Rules', + }, table: { field: { outBound: { stockWithdrawal: 'StockWithdrawal', - withdrawal:'Withdrawal' + withdrawal: 'Withdrawal' }, basContainer: { - containerType:'containerType', + containerType: 'containerType', codeType: 'codeType', areas: 'areas', }, @@ -228,8 +233,8 @@ isWcs: 'isWcs', wcsData: 'wcsData', containerType: 'containerType', - barcode: 'barcode', - autoTransfer: 'autoTransfer', + barcode: 'barcode', + autoTransfer: 'autoTransfer', }, host: { @@ -327,6 +332,7 @@ err: "error", result: "result", userId: "user", + detail: "detail" }, customer: { uuid: "uuid", @@ -432,6 +438,7 @@ col: "Col", lev: "Lev", channel: "Channel", + startChannel: "startChannel", maxParts: "MaxParts", maxPack: "MaxPack", flagLabelMange: "FlagLabelMange", @@ -600,14 +607,52 @@ ntyStatus: "Notify", exceStatus: 'bill status' }, + checkOrder: { + code: "Check Code", + poCode: "Po Code", + poId: "Po Id", + type: "Type", + wkType: "Work Type", + anfme: "Anfme", + workQty: 'Work Qty', + qty: "Qty", + logisNo: "Logis No", + arrTime: "arrived Time", + rleStatus: "閲婃斁鐘舵��", + ntyStatus: "涓婃姤鐘舵��", + exceStatus: '鍗曟嵁鐘舵��' + }, + checkOrderItem: { + orderId: "ID", + orderCode: "Out Code", + matnrId: "matnrId", + maktx: "maktx", + workQty: 'Work Qty', + anfme: "Anfme", + platOrderCode: 'Customer Code', + stockUnit: "stockUnit", + purQty: "purQty", + purUnit: "purUnit", + qty: "qty", + splrCode: "splrCode", + splrName: "splrName", + qrcode: "qrcode", + barcode: "barcode", + packName: "packName", + ntyStatus: "ntyStatus", + platItemId: 'platItemId' + }, outStockItem: { asnId: "ID", - asnCode: "DO Code", + asnCode: "Out Code", + poCode: 'DO Code', poDetlId: "poDetlId", poDetlCode: "DO Detl Code", matnrId: "matnrId", maktx: "maktx", + workQty: 'Work Qty', anfme: "anfme", + platOrderCode: 'Customer Code', stockUnit: "stockUnit", purQty: "purQty", purUnit: "purUnit", @@ -644,7 +689,7 @@ disQty: 'Def Qty', splrCode: "splrCode", splrName: "splrName", - isptResult: "Ispt Result", + isptStatus: "Ispt Status", qrcode: "qrcode", barcode: "barcode", packName: "packName", @@ -726,7 +771,8 @@ fieldsIndex: "fieldsIndex", unit: "unit", anfme: "anfme", - qty: "qty", + workQty: 'Work Qty', + qty: "Qty", nromQty: "nromQty", printQty: "printQty", splrName: "splrName", @@ -771,6 +817,7 @@ deviceCode: "deviceCode", deviceSite: "deviceSite", flagInit: "flagInit", + channel: "channel", }, waitPakin: { code: "code", @@ -827,8 +874,10 @@ type: "type", exceStatus: "exceStatus", anfme: "anfme", + groupQty: 'Group Qty', qty: "qty", orderNum: "orderNum", + progress:"progress" }, waveItem: { waveId: "waveId", @@ -837,6 +886,7 @@ matnrName: "matnrName", matnrCode: "matnrCode", batch: "batch", + exceStatus: 'Exce Status', splrBatch: "splrBatch", orderCode: "orderCode", orderItemId: "orderItemId", @@ -889,6 +939,7 @@ taskItem: { taskId: "taskId", orderId: "orderId", + wkType: 'Work Type', orderType: "orderType", orderItemId: "orderItemId", sourceCode: "sourceCode", @@ -987,11 +1038,14 @@ wkType: "wkType", aggType: "Agg Type", matnrId: "matnrId", + wareArea: 'Warehouse Areas', maktx: "maktx", matnrCode: "matnrCode", trackCode: "trackCode", unit: "unit", anfme: "anfme", + qty: 'Qty', + workQty: 'Work Qty', batch: "batch", splrBatch: "splrBatch", spec: "spec", @@ -1001,7 +1055,6 @@ warehouseStock: { locId: "Loc ID", locCode: "Code", - warehouse: 'Warehouse', orderId: "Order Id", type: "Type", orderItemId: "Order Detail ID", @@ -1031,6 +1084,11 @@ typeId: "typeId", beSimilar: "beSimilar", emptySimilar: "emptySimilar", + }, + waveRule: { + code: "code", + type: "type", + name: "name", }, } }, @@ -1117,6 +1175,8 @@ locInit: 'loc init', siteInit: 'site init', batch: 'batch', + pick: 'Pick', + check: 'Check', confirm: 'confirm', cancel: "cancel", query: "Query", @@ -1126,6 +1186,9 @@ selectSite: 'Select Site', top: "top", resort: "sort", + start: 'Start', + stopPub: 'Stop Pub', + pause: 'Pause', subzone: 'subzone', bindmatnr: 'bind matnr', bindloc: 'bind loc', @@ -1140,20 +1203,27 @@ orderPrint: 'Orders Print', quality: "quality", complete: "complete", + allComfirm: 'All Comfirm', verifyComfirm: 'Verify Comfirm', close: "close", asnCreate: "Create By Order", poCreate: "Create By PO", createTask: "createTask", + publicWorking: 'Public Working', + continuePub: 'Continue Public', recover: "recover", createWave: "Create Wave", order: 'Orders', + modiftySite: 'Modify SiteNo', + selectWave: 'Select Wave Rule', }, request: { error: { stock: "Insufficient inventory to deliver 锛侊紒", select_error_order: "Please Select Asn Orders", + out_stock_qty: "The outbound quantity cannot be greater than the inventory quantity", + } } -- Gitblit v1.9.1