From eab76cd34bff799686f68e6b70f86c9001e4913f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 23 五月 2025 09:41:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/i18n/en.js | 123 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 119 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 4406d71..1a971d7 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -11,6 +11,8 @@
},
button: {
edit: "Edit",
+ detail: "Details",
+ histories: "Histories",
},
field: {
id: 'ID',
@@ -30,6 +32,9 @@
partners: 'Strategic Partners',
},
list: {
+ titles: {
+ stockInfo: 'Stock Details',
+ },
empty: {
tip: 'No data to display',
}
@@ -79,7 +84,9 @@
inputPlaceholder: 'Use commas to separate',
resend: 'RESEND',
selected: 'selected',
- batch: 'batch'
+ batch: 'batch',
+ batchSafe: 'Bulk Safe',
+ batchDef: 'Bulk Def',
},
msg: {
confirm: {
@@ -88,6 +95,14 @@
},
placeholder: 'Please enter your search content',
},
+ aside: {
+ category: 'Category',
+ material: 'Material锛坉efault锛�',
+ supplier: 'Supplier',
+ warehouse: 'Warehouse',
+ batch: 'Batch',
+ dynamicFields: 'Dynamic Fields'
+ }
},
filters: {
lastCreated: 'Last created',
@@ -174,20 +189,48 @@
stock: 'Stock Manage',
histories: 'Histories',
wareWork: 'Warehouse Working',
- statistics: 'Statistics',
+ statistics: 'Stock Statistics',
logs: 'Logs',
permissions: 'Permissions',
delivery: 'Delivery',
outStock: 'Out Stock',
+ stockManage: 'Stock Manage',
outStockItem: 'Out Stock Item',
inStockPoces: 'In Stock Pocess',
outStockPoces: 'Out Stock Pocess',
+ warehouseStock: 'Instant Inventory',
deviceBind: 'Device Bind',
+ tasks: 'Tasks',
wave: 'Wave Manage',
-
+ basStation: 'BasStation',
+ basContainer: 'BasContainer',
},
table: {
field: {
+ outBound: {
+ stockWithdrawal: 'StockWithdrawal',
+ withdrawal: 'Withdrawal'
+ },
+ basContainer: {
+ containerType: 'containerType',
+ codeType: 'codeType',
+ areas: 'areas',
+ },
+ basStation: {
+ stationName: 'stationName',
+ inAble: 'inAble',
+ outAble: 'outAble',
+ useStatus: 'useStatus',
+ status: 'status',
+ area: 'area',
+ isCrossZone: 'isCrossZone',
+ crossZoneArea: 'crossZoneArea',
+ isWcs: 'isWcs',
+ wcsData: 'wcsData',
+ containerType: 'containerType',
+ barcode: 'barcode',
+ autoTransfer: 'autoTransfer',
+ },
host: {
},
@@ -358,6 +401,7 @@
fieldsIndex: "fieldsIndex",
barcode: "barcode",
anfme: "anfme",
+ isptResult: 'Ispt Result',
workQty: 'Work Qty',
qty: 'Available',
batch: "batch",
@@ -468,6 +512,7 @@
rcptQty: "rcptQty",
dlyQty: "dlyQty",
disQty: "disQty",
+ anfme: 'anfme',
safeQty: "safeQty",
picPath: "picPath",
trackCode: "trackCode",
@@ -483,6 +528,7 @@
value: "value",
label: "label",
sort: "sort",
+ group: "Group",
color: "color",
},
companys: {
@@ -578,9 +624,13 @@
asnId: "asnId",
asnCode: "asnCode",
poDetlId: "poDetlId",
+ platItemId: 'platItemId',
poDetlCode: "poDetlCode",
matnrId: "matnrId",
maktx: "maktx",
+ platOrderCode: 'Customer Order Code',
+ platWorkCode: 'Work Code',
+ projectCode: 'Project Code',
spec: "Spec",
model: "Model",
anfme: "anfme",
@@ -594,11 +644,11 @@
disQty: 'Def Qty',
splrCode: "splrCode",
splrName: "splrName",
+ isptResult: "Ispt Result",
qrcode: "qrcode",
barcode: "barcode",
packName: "packName",
ntyStatus: "ntyStatus",
- platItemId: 'platItemId'
},
asnOrderLog: {
code: "code",
@@ -740,6 +790,7 @@
asnCode: "asnCode",
asnItemId: "asnItemId",
trackCode: "trackCode",
+ isptResult: 'Ispt Result',
anfme: "anfme",
workQty: "workQty",
unit: "unit",
@@ -803,6 +854,7 @@
taskCode: "TaskCode",
taskStatus: "Status",
taskType: "Type",
+ warehType: "Warehouse Type",
orgLoc: "orgLoc",
orgSite: "orgSite",
targLoc: "targLoc",
@@ -843,11 +895,42 @@
matnrId: "matnrId",
maktx: "maktx",
matnrCode: "matnrCode",
+ isptResult: 'Ispt Result',
unit: "unit",
anfme: "anfme",
batch: "batch",
spec: "spec",
model: "model",
+ },
+ stock: {
+ code: "Code",
+ sourceCode: "Resource",
+ sourceId: "Resource ID",
+ type: "Order Type",
+ wkType: "Work Type",
+ anfme: "Qty",
+ },
+ stockItem: {
+ orderId: "Order ID",
+ orderCode: "Order Code",
+ sourceItemId: "Resource Item ID",
+ matnrId: "Mat ID",
+ matnrCode: "Mat Code",
+ maktx: "Maktx",
+ anfme: "Anfme",
+ stockUnit: "Unit",
+ workQty: "Work Qty",
+ purQty: "Purchase Qty",
+ purUnit: "Purchase Unit",
+ qty: "Qty",
+ splrCode: "Supplier Code",
+ batch: "Batch",
+ splrBatch: "Supplier Batch",
+ splrName: "Supplier Name",
+ trackCode: "Track Code",
+ barcode: "Bar Code",
+ prodTime: "Prod Time",
+ packName: "Pakcage",
},
taskItemLog: {
taskItemId: "taskItemId",
@@ -902,17 +985,43 @@
type: "type",
orderItemId: "orderItemId",
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",
model: "model",
fieldsIndex: "fieldsIndex",
+ },
+ warehouseStock: {
+ locId: "Loc ID",
+ locCode: "Code",
+ warehouse: 'Warehouse',
+ orderId: "Order Id",
+ type: "Type",
+ orderItemId: "Order Detail ID",
+ wkType: "Work Type",
+ matnrId: "Matnr Id",
+ maktx: "Mats Name",
+ unit: 'Unit',
+ anfme: 'Stock Qty',
+ matnrCode: "Matnr Code",
+ warehouse: 'Warehouse',
+ workQty: 'Work Qty',
+ qty: 'Non Stock Qty',
+ splrId: 'supplier',
+ batch: "Supplier Batch",
+ spec: "Spec",
+ model: "Model",
+ fieldsIndex: "Fields Index",
},
deviceBind: {
currentRow: "currentRow",
@@ -1011,6 +1120,7 @@
locInit: 'loc init',
siteInit: 'site init',
batch: 'batch',
+ pick: 'Pick',
confirm: 'confirm',
cancel: "cancel",
query: "Query",
@@ -1031,10 +1141,13 @@
batchWarehouseAreas: "batchWarehouseAreas",
batchLocType: "batchLocType",
batchPrint: "batch print",
+ orderPrint: 'Orders Print',
quality: "quality",
complete: "complete",
+ verifyComfirm: 'Verify Comfirm',
close: "close",
asnCreate: "Create By Order",
+ poCreate: "Create By PO",
createTask: "createTask",
recover: "recover",
createWave: "Create Wave",
@@ -1045,6 +1158,8 @@
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