From 20b61979b0709ea86752332c04b46add0f8f48f7 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 13 八月 2025 12:06:54 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/i18n/en.js | 198 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 193 insertions(+), 5 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 8ff186a..4312ccf 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',
@@ -94,6 +97,7 @@
desc: 'Are you sure you want to proceed?',
},
placeholder: 'Please enter your search content',
+ locEmpty: 'Check Locs can not NULL',
},
aside: {
category: 'Category',
@@ -185,7 +189,7 @@
taskLog: 'TaskLog',
orderItem: 'OrderItem',
order: 'Order',
- locItem: 'LocItem',
+ locPreview: 'LocItem',
stock: 'Stock Manage',
histories: 'Histories',
wareWork: 'Warehouse Working',
@@ -204,6 +208,15 @@
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: {
@@ -327,6 +340,7 @@
err: "error",
result: "result",
userId: "user",
+ detail: "detail"
},
customer: {
uuid: "uuid",
@@ -432,6 +446,7 @@
col: "Col",
lev: "Lev",
channel: "Channel",
+ startChannel: "startChannel",
maxParts: "MaxParts",
maxPack: "MaxPack",
flagLabelMange: "FlagLabelMange",
@@ -600,6 +615,112 @@
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'
+ },
+
+ 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",
@@ -647,7 +768,7 @@
disQty: 'Def Qty',
splrCode: "splrCode",
splrName: "splrName",
- isptResult: "Ispt Result",
+ isptStatus: "Ispt Status",
qrcode: "qrcode",
barcode: "barcode",
packName: "packName",
@@ -706,6 +827,24 @@
project: "project",
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",
@@ -775,7 +914,6 @@
deviceCode: "deviceCode",
deviceSite: "deviceSite",
flagInit: "flagInit",
- wcsCode: "wcsCode",
channel: "channel",
},
waitPakin: {
@@ -786,6 +924,20 @@
flagDefect: "Defective",
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",
@@ -833,8 +985,10 @@
type: "type",
exceStatus: "exceStatus",
anfme: "anfme",
+ groupQty: 'Group Qty',
qty: "qty",
orderNum: "orderNum",
+ progress: "progress"
},
waveItem: {
waveId: "waveId",
@@ -843,6 +997,7 @@
matnrName: "matnrName",
matnrCode: "matnrCode",
batch: "batch",
+ exceStatus: 'Exce Status',
splrBatch: "splrBatch",
orderCode: "orderCode",
orderItemId: "orderItemId",
@@ -898,7 +1053,6 @@
wkType: 'Work Type',
orderType: "orderType",
orderItemId: "orderItemId",
- sourceCode: "sourceCode",
matnrId: "matnrId",
maktx: "maktx",
matnrCode: "matnrCode",
@@ -908,6 +1062,7 @@
batch: "batch",
spec: "spec",
model: "model",
+ sourceCode: "sourceCode",
},
stock: {
code: "Code",
@@ -1000,8 +1155,11 @@
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",
@@ -1011,7 +1169,6 @@
warehouseStock: {
locId: "Loc ID",
locCode: "Code",
- warehouse: 'Warehouse',
orderId: "Order Id",
type: "Type",
orderItemId: "Order Detail ID",
@@ -1042,9 +1199,30 @@
beSimilar: "beSimilar",
emptySimilar: "emptySimilar",
},
+ waveRule: {
+ code: "code",
+ type: "type",
+ name: "name",
+ },
}
},
page: {
+ dashboard: {
+ welcome: {
+ title: 'Welcome to the WMS website',
+ },
+ header: {
+ inStockQty: '',
+ outStockQty: '',
+ taskWorkQty: '',
+ },
+ chart: {
+ histories: 'Orders Echart',
+ },
+ list: {
+ stock: 'Stock Pie',
+ }
+ },
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'
@@ -1131,6 +1309,7 @@
check: 'Check',
confirm: 'confirm',
cancel: "cancel",
+ delete: 'Delete',
query: "Query",
bulkExport: "Bulk Export",
continue: 'Continue Receipt',
@@ -1138,6 +1317,9 @@
selectSite: 'Select Site',
top: "top",
resort: "sort",
+ start: 'Start',
+ stopPub: 'Stop Pub',
+ pause: 'Pause',
subzone: 'subzone',
bindmatnr: 'bind matnr',
bindloc: 'bind loc',
@@ -1152,15 +1334,21 @@
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: "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: {
--
Gitblit v1.9.1