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 |  207 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 202 insertions(+), 5 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 2e67cf6..d569c3d 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -9,6 +9,9 @@
             fail: "Fail",
             dataError: "Submit data was error, Please check",
         },
+        button: {
+            edit: "Edit",
+        },
         field: {
             id: 'ID',
             uuid: 'uuid',
@@ -48,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: {
@@ -66,6 +71,8 @@
             loadMore: 'Load More Data',
             complete: 'Complete',
             deprecate: 'Deprecate',
+            stockError: 'Empty',
+            inputPlaceholder: 'Use commas to separate',
             resend: 'RESEND',
             selected: 'selected',
             batch: 'batch'
@@ -129,12 +136,12 @@
         loc: 'Loc',
         locType: 'LocType',
         locArea: 'locArea',
-        LocAreaMat: 'LocAreaMat',
+        locAreaMat: 'Logic Areas',
         locAreaMatRela: 'LocAreaMatRela',
         container: 'Container',
         contract: 'Contract',
         qlyInspect: 'QlyInspect',
-        qlyIsptItem: '璐ㄦ淇℃伅鏄庣粏',
+        qlyIsptItem: 'qlyIsptItem',
         dictType: 'DictType',
         dictData: 'DictData',
         companys: 'Companys',
@@ -149,7 +156,7 @@
         whMat: 'Warehouse Mat',
         fields: 'Extend Fields',
         fieldsItem: 'Extend Fields Items',
-        warehouseAreasItem: 'WarehouseAreasItem',
+        warehouseAreasItem: 'Temp Warehouse Areas Stock',
         deviceSite: 'deviceSite',
         waitPakin: 'WaitPakin',
         waitPakinItem: 'WaitPakinItem',
@@ -157,6 +164,23 @@
         taskItem: 'TaskItem',
         taskItemLog: 'TaskItemLog',
         taskLog: 'TaskLog',
+        orderItem: 'OrderItem',
+        order: 'Order',
+        locItem: 'LocItem',
+        stock: 'Stock Manage',
+        histories: 'Histories',
+        wareWork: 'Warehouse Working',
+        statistics: 'Statistics',
+        logs: 'Logs',
+        permissions: 'Permissions',
+        delivery: 'Delivery',
+        outStock: 'Out Stock',
+        outStockItem: 'Out Stock Item',
+        inStockPoces: 'In Stock Pocess',
+        outStockPoces: 'Out Stock Pocess',
+        deviceBind: 'Device Bind',
+        wave: 'Wave Manage',
+
     },
     table: {
         field: {
@@ -329,6 +353,8 @@
                 fieldsIndex: "fieldsIndex",
                 barcode: "barcode",
                 anfme: "anfme",
+                workQty: 'Work Qty',
+                qty: 'Available',
                 batch: "batch",
                 unit: "unit",
                 stockUnit: "stockUnit",
@@ -422,6 +448,7 @@
                 dlyQty: "dlyQty",
                 rcptQty: "rcptQty",
                 isptQty: "isptQty",
+                isptResult: "isptResult",
                 isptStatus: "isptStatus",
             },
             qlyIsptItem: {
@@ -506,6 +533,41 @@
                 arrTime: "Arrived",
                 rleStatus: "Release",
                 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",
@@ -518,6 +580,7 @@
                 stockUnit: "stockUnit",
                 purQty: "purQty",
                 purUnit: "purUnit",
+                unit: 'Unit',
                 qty: "qty",
                 splrCode: "splrCode",
                 splrName: "splrName",
@@ -581,6 +644,35 @@
                 startTime: "startTime",
                 endTime: "endTime",
             },
+            delivery: {
+                code: "code",
+                platId: "platId",
+                type: "type",
+                wkType: "wkType",
+                source: "source",
+                anfme: "anfme",
+                qty: "qty",
+                workQty: "workQty",
+                platCode: "platCode",
+                startTime: "startTime",
+                endTime: "endTime",
+            },
+            deliveryItem: {
+                deliveryId: "deliveryId",
+                deliveryCode: "Delivery Code",
+                platItemId: "platItemId",
+                matnrCode: "matnrCode",
+                matnrName: "matnrName",
+                fieldsIndex: "fieldsIndex",
+                unit: "unit",
+                anfme: "anfme",
+                qty: "qty",
+                nromQty: "nromQty",
+                printQty: "printQty",
+                splrName: "splrName",
+                splrCode: "splrCode",
+                splrBatch: "splrBatch",
+            },
             purchaseItem: {
                 purchaseId: "purchaseId",
                 platItemId: "erpItemId",
@@ -619,13 +711,13 @@
                 deviceCode: "deviceCode",
                 deviceSite: "deviceSite",
                 flagInit: "flagInit",
-                sites: "sites",
             },
             waitPakin: {
                 code: "code",
                 ansId: "ansId",
                 asnCode: "asnCode",
                 barcode: "barcode",
+                flagDefect: "Defective",
                 anfme: "anfme",
                 ioStatus: "ioStatus",
             },
@@ -668,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",
@@ -735,6 +855,66 @@
                 batch: "batch",
                 spec: "spec",
                 model: "model",
+            },
+            order: {
+                code: "code",
+                sourceCode: "sourceCode",
+                sourceId: "sourceId",
+                type: "type",
+                wkType: "wkType",
+                anfme: "anfme",
+            },
+            orderItem: {
+                orderId: "orderId",
+                orderCode: "orderCode",
+                sourceItemId: "sourceItemId",
+                matnrId: "matnrId",
+                matnrCode: "matnrCode",
+                maktx: "maktx",
+                anfme: "anfme",
+                stockUnit: "stockUnit",
+                workQty: "workQty",
+                purQty: "purQty",
+                purUnit: "purUnit",
+                qty: "qty",
+                splrCode: "splrCode",
+                batch: "batch",
+                splrBatch: "splrBatch",
+                splrName: "splrName",
+                trackCode: "trackCode",
+                barcode: "barcode",
+                prodTime: "prodTime",
+                packName: "packName",
+            },
+            locItem: {
+                locId: "locId",
+                orderId: "orderId",
+                type: "type",
+                orderItemId: "orderItemId",
+                wkType: "wkType",
+                matnrId: "matnrId",
+                maktx: "maktx",
+                matnrCode: "matnrCode",
+                trackCode: "trackCode",
+                unit: "unit",
+                anfme: "anfme",
+                batch: "batch",
+                splrBatch: "splrBatch",
+                spec: "spec",
+                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",
             },
         }
     },
@@ -816,12 +996,18 @@
         creatcode: "creatcode",
         print: "print",
         enable: 'enable',
+        detail: "Detail",
         unenable: 'unenable',
         locInit: 'loc init',
         siteInit: 'site init',
         batch: 'batch',
         confirm: 'confirm',
         cancel: "cancel",
+        query: "Query",
+        bulkExport: "Bulk Export",
+        continue: 'Continue Receipt',
+        confirmSelect: 'Confirm Select',
+        selectSite: 'Select Site',
         top: "top",
         resort: "sort",
         subzone: 'subzone',
@@ -838,9 +1024,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