From 2d5ffc17e5d76a468493b21c45df1ca547b10da3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 13:40:17 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/i18n/en.js |   95 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 94 insertions(+), 1 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index eb60a5f..d569c3d 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'
@@ -174,6 +178,9 @@
         outStockItem: 'Out Stock Item',
         inStockPoces: 'In Stock Pocess',
         outStockPoces: 'Out Stock Pocess',
+        deviceBind: 'Device Bind',
+        wave: 'Wave Manage',
+
     },
     table: {
         field: {
@@ -346,6 +353,8 @@
                 fieldsIndex: "fieldsIndex",
                 barcode: "barcode",
                 anfme: "anfme",
+                workQty: 'Work Qty',
+                qty: 'Available',
                 batch: "batch",
                 unit: "unit",
                 stockUnit: "stockUnit",
@@ -526,6 +535,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",
@@ -537,6 +580,7 @@
                 stockUnit: "stockUnit",
                 purQty: "purQty",
                 purUnit: "purUnit",
+                unit: 'Unit',
                 qty: "qty",
                 splrCode: "splrCode",
                 splrName: "splrName",
@@ -615,6 +659,7 @@
             },
             deliveryItem: {
                 deliveryId: "deliveryId",
+                deliveryCode: "Delivery Code",
                 platItemId: "platItemId",
                 matnrCode: "matnrCode",
                 matnrName: "matnrName",
@@ -666,7 +711,6 @@
                 deviceCode: "deviceCode",
                 deviceSite: "deviceSite",
                 flagInit: "flagInit",
-                sites: "sites",
             },
             waitPakin: {
                 code: "code",
@@ -716,6 +760,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",
@@ -832,6 +904,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: {
@@ -919,6 +1003,7 @@
         batch: 'batch',
         confirm: 'confirm',
         cancel: "cancel",
+        query: "Query",
         bulkExport: "Bulk Export",
         continue: 'Continue Receipt',
         confirmSelect: 'Confirm Select',
@@ -942,9 +1027,17 @@
         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