From d97d7346ec794ffa34077160bb13424f2f84bc57 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 30 四月 2025 10:47:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/i18n/en.js | 98 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 95 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 9849d55..199d83f 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -51,10 +51,12 @@
before: 'Time Before'
},
action: {
+ search: 'Search',
reset: 'Reset',
expand: 'Expand',
expandAll: 'Expand All',
collapse: 'Collapse',
+ newAddMats: 'New Mats',
collapseAll: 'Collapse All',
scope: 'Assign',
import: {
@@ -69,6 +71,8 @@
loadMore: 'Load More Data',
complete: 'Complete',
deprecate: 'Deprecate',
+ stockError: 'Empty',
+ inputPlaceholder: 'Use commas to separate',
resend: 'RESEND',
selected: 'selected',
batch: 'batch'
@@ -171,7 +175,12 @@
permissions: 'Permissions',
delivery: 'Delivery',
outStock: 'Out Stock',
- outStockItem: 'Out Stock Item'
+ outStockItem: 'Out Stock Item',
+ inStockPoces: 'In Stock Pocess',
+ outStockPoces: 'Out Stock Pocess',
+ deviceBind: 'Device Bind',
+ wave: 'Wave Manage',
+
},
table: {
field: {
@@ -524,6 +533,40 @@
ntyStatus: "Notify",
exceStatus: 'bill status'
},
+ outStock: {
+ code: "Code",
+ poCode: "poCode",
+ poId: "doId",
+ type: "Type",
+ wkType: "wkType",
+ anfme: "anfme",
+ qty: "qty",
+ logisNo: "logisNo",
+ arrTime: "Arrived",
+ rleStatus: "Release",
+ ntyStatus: "Notify",
+ exceStatus: 'bill status'
+ },
+ outStockItem: {
+ asnId: "ID",
+ asnCode: "DO Code",
+ poDetlId: "poDetlId",
+ poDetlCode: "DO Detl Code",
+ 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'
+ },
asnOrderItem: {
asnId: "asnId",
asnCode: "asnCode",
@@ -613,6 +656,7 @@
},
deliveryItem: {
deliveryId: "deliveryId",
+ deliveryCode: "Delivery Code",
platItemId: "platItemId",
matnrCode: "matnrCode",
matnrName: "matnrName",
@@ -664,7 +708,6 @@
deviceCode: "deviceCode",
deviceSite: "deviceSite",
flagInit: "flagInit",
- sites: "sites",
},
waitPakin: {
code: "code",
@@ -714,6 +757,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",
@@ -830,6 +901,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: {
@@ -917,6 +1000,7 @@
batch: 'batch',
confirm: 'confirm',
cancel: "cancel",
+ query: "Query",
bulkExport: "Bulk Export",
continue: 'Continue Receipt',
confirmSelect: 'Confirm Select',
@@ -937,12 +1021,20 @@
quality: "quality",
complete: "complete",
close: "close",
- asnCreate: "asnCreate",
+ asnCreate: "Create By Order",
createTask: "createTask",
recover: "recover",
+ createWave: "Create Wave",
order: 'Orders',
},
+ request: {
+ error: {
+ stock: "Insufficient inventory to deliver 锛侊紒"
+ }
+
+ }
+
};
export default customEnglishMessages;
--
Gitblit v1.9.1