From ea2904d7ca03b42f5783cd659fe71c0fbedd2277 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 11 八月 2025 17:05:21 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/en.js | 434 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 421 insertions(+), 13 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 625d37a..33a5693 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',
@@ -24,8 +26,15 @@
memoWrap: 'memo wrap',
memo: 'memo',
opt: 'operate',
+ supplier: 'Supplier',
+ customer: 'Customer',
+ shipper: 'Shipper',
+ partners: 'Strategic Partners',
},
list: {
+ titles: {
+ stockInfo: 'Stock Details',
+ },
empty: {
tip: 'No data to display',
}
@@ -35,6 +44,7 @@
main: 'Main',
common: 'Common',
changePwd: 'Change Password',
+ insuffInventory: 'Insufficient inventory'
},
side: {
title: 'More Info'
@@ -51,10 +61,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: {
@@ -67,11 +79,17 @@
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',
+ inputPlaceholder: 'Use commas to separate',
resend: 'RESEND',
selected: 'selected',
- batch: 'batch'
+ batch: 'batch',
+ batchSafe: 'Bulk Safe',
+ batchDef: 'Bulk Def',
},
msg: {
confirm: {
@@ -79,7 +97,16 @@
desc: 'Are you sure you want to proceed?',
},
placeholder: 'Please enter your search content',
+ locEmpty: 'Check Locs can not NULL',
},
+ aside: {
+ category: 'Category',
+ material: 'Material锛坉efault锛�',
+ supplier: 'Supplier',
+ warehouse: 'Warehouse',
+ batch: 'Batch',
+ dynamicFields: 'Dynamic Fields'
+ }
},
filters: {
lastCreated: 'Last created',
@@ -162,18 +189,61 @@
taskLog: 'TaskLog',
orderItem: 'OrderItem',
order: 'Order',
- locItem: 'LocItem',
+ locPreview: 'LocItem',
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',
+ waveRule: 'Wave Rules',
+ checkDiff: 'Check Diff',
+ transfer: 'Transfer',
+ locRevise: 'Loc Revise',
+ statisticReport: 'Statistical Report',
+ locDeadReport: 'Locs Dead Report',
+ stockStatistic: 'Stock Statistic',
+ statisticCount: 'Statistic Count',
+
},
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: {
},
@@ -270,6 +340,7 @@
err: "error",
result: "result",
userId: "user",
+ detail: "detail"
},
customer: {
uuid: "uuid",
@@ -335,6 +406,7 @@
flagMix: "flagMix",
},
warehouseAreasItem: {
+ asnCode: 'Order NO.',
areaId: "areaId",
areaName: "areaName",
matnrId: "matnrId",
@@ -343,6 +415,9 @@
fieldsIndex: "fieldsIndex",
barcode: "barcode",
anfme: "anfme",
+ isptResult: 'Ispt Result',
+ workQty: 'Work Qty',
+ qty: 'Available',
batch: "batch",
unit: "unit",
stockUnit: "stockUnit",
@@ -371,6 +446,7 @@
col: "Col",
lev: "Lev",
channel: "Channel",
+ startChannel: "startChannel",
maxParts: "MaxParts",
maxPack: "MaxPack",
flagLabelMange: "FlagLabelMange",
@@ -451,6 +527,7 @@
rcptQty: "rcptQty",
dlyQty: "dlyQty",
disQty: "disQty",
+ anfme: 'anfme',
safeQty: "safeQty",
picPath: "picPath",
trackCode: "trackCode",
@@ -466,6 +543,7 @@
value: "value",
label: "label",
sort: "sort",
+ group: "Group",
color: "color",
},
companys: {
@@ -523,14 +601,43 @@
ntyStatus: "Notify",
exceStatus: 'bill status'
},
- asnOrderItem: {
- asnId: "asnId",
- asnCode: "asnCode",
- poDetlId: "poDetlId",
- poDetlCode: "poDetlCode",
+ 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'
+ },
+ 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",
- anfme: "anfme",
+ workQty: 'Work Qty',
+ anfme: "Anfme",
+ platOrderCode: 'Customer Code',
stockUnit: "stockUnit",
purQty: "purQty",
purUnit: "purUnit",
@@ -542,6 +649,130 @@
packName: "packName",
ntyStatus: "ntyStatus",
platItemId: 'platItemId'
+ },
+
+ checkDiff: {
+ orderCode: "Check Code",
+ checkType: "Check Type",
+ areaId: "Warehouse Area ID",
+ areaName: "Warehouse Area Name",
+ anfme: "Stock Qty",
+ checkQty: "Check Qty",
+ exceStatus: "Exce Status",
+ },
+ transfer: {
+ code: "code",
+ type: "type",
+ source: "source",
+ exceStatus: "exceStatus",
+ orgWareId: "orgWareId",
+ orgWareName: "orgWareName",
+ tarWareId: "tarWareId",
+ tarWareName: "tarWareName",
+ orgAreaId: "orgAreaId",
+ orgAreaName: "orgAreaName",
+ tarAreaId: "tarAreaId",
+ tarAreaName: "tarAreaName",
+ },
+
+ transferItem: {
+ transferId: "transferId",
+ transferCode: "transferCode",
+ matnrId: "matnrId",
+ maktx: "maktx",
+ matnrCode: "matnrCode",
+ unit: "unit",
+ anfme: "anfme",
+ qty: "qty",
+ workQty: "workQty",
+ batch: "batch",
+ splrId: "splrId",
+ spec: "spec",
+ model: "model",
+ fieldsIndex: "fieldsIndex",
+ platItemId: "platItemId",
+ platOrderCode: "platOrderCode",
+ platWorkCode: "platWorkCode",
+ projectCode: "projectCode",
+ },
+
+ transferOrder: {
+ code: 'Order No',
+ poCode: 'transfer No',
+ type: 'Type',
+ wkType: 'Work Type',
+ anfme: 'Anfme',
+ workQty: 'Work Qty',
+ qty: 'Qty',
+ },
+
+ checkDiffItem: {
+ checkId: "checkId",
+ orderCode: "orderCode",
+ maktx: "maktx",
+ matnrCode: "matnrCode",
+ spec: "spec",
+ model: "model",
+ barcode: "barcode",
+ batch: "batch",
+ anfme: "anfme",
+ checkQty: "checkQty",
+ diffQty: 'Diff Qty',
+ exceStatus: "exceStatus",
+ reason: "reason",
+ },
+ outStockItem: {
+ asnId: "ID",
+ 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",
+ qty: "qty",
+ splrCode: "splrCode",
+ splrName: "splrName",
+ qrcode: "qrcode",
+ barcode: "barcode",
+ packName: "packName",
+ ntyStatus: "ntyStatus",
+ platItemId: 'platItemId'
+ },
+ asnOrderItem: {
+ 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",
+ stockUnit: "stockUnit",
+ purQty: "purQty",
+ isptResult: "Ispt Result",
+ purUnit: "purUnit",
+ unit: 'Unit',
+ qty: "qty",
+ safeQty: 'Safe Qty',
+ disQty: 'Def Qty',
+ splrCode: "splrCode",
+ splrName: "splrName",
+ isptStatus: "Ispt Status",
+ qrcode: "qrcode",
+ barcode: "barcode",
+ packName: "packName",
+ ntyStatus: "ntyStatus",
},
asnOrderLog: {
code: "code",
@@ -597,6 +828,24 @@
startTime: "startTime",
endTime: "endTime",
},
+ stockStatistic: {
+ id: "id",
+ dayTime: "dayTime",
+ taskType: "taskType",
+ taskStatus: "taskStatus",
+ maktx: "maktx",
+ matnrCode: "matnrCode",
+ count: "count",
+ inAnfmeCount: 'In Anfme Count',
+ outAnfmeCount: 'Count Anfme Count',
+ inAnfme: 'In Anfme',
+ outAnfme: 'Out Anfme',
+ locCode: 'Loc Code',
+ barcode: 'Barcode',
+ batch: "batch",
+ anfme: "anfme",
+ unit: "unit",
+ },
delivery: {
code: "code",
platId: "platId",
@@ -612,13 +861,15 @@
},
deliveryItem: {
deliveryId: "deliveryId",
+ deliveryCode: "Delivery Code",
platItemId: "platItemId",
matnrCode: "matnrCode",
matnrName: "matnrName",
fieldsIndex: "fieldsIndex",
unit: "unit",
anfme: "anfme",
- qty: "qty",
+ workQty: 'Work Qty',
+ qty: "Qty",
nromQty: "nromQty",
printQty: "printQty",
splrName: "splrName",
@@ -663,7 +914,7 @@
deviceCode: "deviceCode",
deviceSite: "deviceSite",
flagInit: "flagInit",
- sites: "sites",
+ channel: "channel",
},
waitPakin: {
code: "code",
@@ -674,6 +925,20 @@
anfme: "anfme",
ioStatus: "ioStatus",
},
+ locRevise: {
+ code: "code",
+ type: "type",
+ anfme: "anfme",
+ reviseQty: "Revise Qty",
+ exceStatus: "Exce Status",
+ orgAreaId: "Area Id",
+ orgAreaName: "Area Name",
+ exceTime: "Exce Time"
+ },
+ reviseLog: {
+ reviseId: 'Revise Id',
+ reviseCode: 'Revise Code',
+ },
waitPakinItem: {
pakinId: "pakinId",
maktx: "maktx",
@@ -683,6 +948,7 @@
asnCode: "asnCode",
asnItemId: "asnItemId",
trackCode: "trackCode",
+ isptResult: 'Ispt Result',
anfme: "anfme",
workQty: "workQty",
unit: "unit",
@@ -714,10 +980,42 @@
qty: "qty",
batch: "batch",
},
+ wave: {
+ code: "code",
+ type: "type",
+ exceStatus: "exceStatus",
+ anfme: "anfme",
+ groupQty: 'Group Qty',
+ qty: "qty",
+ orderNum: "orderNum",
+ progress: "progress"
+ },
+ waveItem: {
+ waveId: "waveId",
+ waveCode: "waveCode",
+ matnrId: "matnrId",
+ matnrName: "matnrName",
+ matnrCode: "matnrCode",
+ batch: "batch",
+ exceStatus: 'Exce Status',
+ 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",
taskStatus: "Status",
taskType: "Type",
+ warehType: "Warehouse Type",
orgLoc: "orgLoc",
orgSite: "orgSite",
targLoc: "targLoc",
@@ -752,17 +1050,49 @@
taskItem: {
taskId: "taskId",
orderId: "orderId",
+ wkType: 'Work Type',
orderType: "orderType",
orderItemId: "orderItemId",
- sourceCode: "sourceCode",
matnrId: "matnrId",
maktx: "maktx",
matnrCode: "matnrCode",
+ isptResult: 'Ispt Result',
unit: "unit",
anfme: "anfme",
batch: "batch",
spec: "spec",
model: "model",
+ sourceCode: "sourceCode",
+ },
+ 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",
@@ -817,21 +1147,71 @@
type: "type",
orderItemId: "orderItemId",
wkType: "wkType",
+ aggType: "Agg Type",
matnrId: "matnrId",
+ wareArea: 'Warehouse Areas',
maktx: "maktx",
matnrCode: "matnrCode",
trackCode: "trackCode",
unit: "unit",
anfme: "anfme",
+ outQty: 'Revise Qty',
+ qty: 'Qty',
+ deadTime: 'Dead (Days锛�',
+ workQty: 'Work Qty',
+ reviseQty: 'Revise Qty',
batch: "batch",
splrBatch: "splrBatch",
spec: "spec",
model: "model",
fieldsIndex: "fieldsIndex",
},
+ warehouseStock: {
+ locId: "Loc ID",
+ locCode: "Code",
+ 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",
+ startRow: "startRow",
+ endRow: "endRow",
+ deviceQty: "deviceQty",
+ startDeviceNo: "startDeviceNo",
+ endDeviceNo: "endDeviceNo",
+ staList: "staList",
+ typeId: "typeId",
+ beSimilar: "beSimilar",
+ emptySimilar: "emptySimilar",
+ },
+ waveRule: {
+ code: "code",
+ type: "type",
+ name: "name",
+ },
}
},
page: {
+ dashboard: {
+ welcome: {
+ title: 'Welcome to the WMS website',
+ },
+ },
welcome: {
index: ' Welcome to the RSF Management System.',
tech: ' Technology stack: Java 17, SpringBoot2.5.3, Mybatis-plus_3.4.1, Spring Security, Druid 1.2.6, Redis, Mysql5.7, Node18, ReactJs, Material UI5.16, Axios, React-Admin5.1'
@@ -914,14 +1294,21 @@
locInit: 'loc init',
siteInit: 'site init',
batch: 'batch',
+ pick: 'Pick',
+ check: 'Check',
confirm: 'confirm',
cancel: "cancel",
+ delete: 'Delete',
+ query: "Query",
bulkExport: "Bulk Export",
continue: 'Continue Receipt',
confirmSelect: 'Confirm Select',
selectSite: 'Select Site',
top: "top",
resort: "sort",
+ start: 'Start',
+ stopPub: 'Stop Pub',
+ pause: 'Pause',
subzone: 'subzone',
bindmatnr: 'bind matnr',
bindloc: 'bind loc',
@@ -933,15 +1320,36 @@
batchWarehouseAreas: "batchWarehouseAreas",
batchLocType: "batchLocType",
batchPrint: "batch print",
+ orderPrint: 'Orders Print',
quality: "quality",
complete: "complete",
+ allComfirm: 'All Comfirm',
+ createTransfer: 'Create Transfer Order',
+ createLocRevise: 'Create Stock Revise Order',
+ verifyComfirm: 'Verify Comfirm',
close: "close",
- asnCreate: "asnCreate",
+ 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",
+
+ }
+
+ }
+
};
export default customEnglishMessages;
--
Gitblit v1.9.1