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 |  476 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 465 insertions(+), 11 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index c0a1107..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,8 +71,11 @@
             loadMore: 'Load More Data',
             complete: 'Complete',
             deprecate: 'Deprecate',
+            stockError: 'Empty',
+            inputPlaceholder: 'Use commas to separate',
             resend: 'RESEND',
             selected: 'selected',
+            batch: 'batch'
         },
         msg: {
             confirm: {
@@ -106,7 +114,6 @@
     },
     menu: {
         dashboard: 'Dashboard',
-        basicInfo: 'BasicInfo',
         settings: 'Settings',
         basicInfo: 'BasicInfo',
         system: 'System',
@@ -127,9 +134,14 @@
         warehouse: 'Warehouse',
         warehouseAreas: 'WarehouseAreas',
         loc: 'Loc',
+        locType: 'LocType',
+        locArea: 'locArea',
+        locAreaMat: 'Logic Areas',
+        locAreaMatRela: 'LocAreaMatRela',
         container: 'Container',
         contract: 'Contract',
         qlyInspect: 'QlyInspect',
+        qlyIsptItem: 'qlyIsptItem',
         dictType: 'DictType',
         dictData: 'DictData',
         companys: 'Companys',
@@ -137,12 +149,38 @@
         serialRule: 'SerialRule',
         asnOrder: 'AsnOrder',
         asnOrderItem: 'AsnOrderItem',
+        asnOrderLog: 'asnOrderLog',
+        asnOrderItemLog: 'asnOrderItemLog',
         purchase: 'Purchase',
         purchaseItem: 'PurchaseItem',
         whMat: 'Warehouse Mat',
         fields: 'Extend Fields',
         fieldsItem: 'Extend Fields Items',
-        warehouseAreasItem: 'WarehouseAreasItem',
+        warehouseAreasItem: 'Temp Warehouse Areas Stock',
+        deviceSite: 'deviceSite',
+        waitPakin: 'WaitPakin',
+        waitPakinItem: 'WaitPakinItem',
+        task: 'Task',
+        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: {
@@ -282,6 +320,7 @@
                 name: "name",
                 code: "code",
                 parentId: "parentId",
+                parCode: "parCode",
             },
             warehouse: {
                 name: "name",
@@ -297,6 +336,7 @@
             warehouseAreas: {
                 uuid: "uuid",
                 name: "name",
+                wareId: "ware",
                 code: "code",
                 shipperId: "shipperId",
                 supplierId: "supplierId",
@@ -313,6 +353,8 @@
                 fieldsIndex: "fieldsIndex",
                 barcode: "barcode",
                 anfme: "anfme",
+                workQty: 'Work Qty',
+                qty: 'Available',
                 batch: "batch",
                 unit: "unit",
                 stockUnit: "stockUnit",
@@ -334,6 +376,9 @@
                 barcode: "Barcode",
                 unit: "Unit",
                 size: "Size",
+                length: "length",
+                width: "width",
+                height: "height",
                 row: "Row",
                 col: "Col",
                 lev: "Lev",
@@ -342,6 +387,35 @@
                 maxPack: "MaxPack",
                 flagLabelMange: "FlagLabelMange",
                 locAttrs: "LocAttrs",
+                useStatus: 'useStatus',
+                locAreaId: 'locAreaId'
+            },
+            locType: {
+                uuid: "uuid",
+                code: "code",
+                name: "name",
+                regex: "regex",
+            },
+            locArea: {
+                name: "name",
+                code: "code",
+                areaId: "areaId",
+                locId: "locId",
+            },
+            locAreaMat: {
+                code: "code",
+                depict: "depict",
+                name: "name",
+                warehouseId: "warehouseId",
+                areaId: "areaId",
+            },
+            locAreaMatRela: {
+                areaId: "areaId",
+                code: "code",
+                matnrId: "matnrId",
+                groupId: "groupId",
+                locTypeId: "locTypeId",
+                locId: "locId",
             },
             container: {
                 code: "Code",
@@ -366,13 +440,32 @@
                 projectName: "ProjectName",
             },
             qlyInspect: {
+                asnId: "asnId",
+                asnCode: "asnCode",
                 code: "code",
-                name: "name",
-                barcode: "barcode",
-                asnItemId: "asnItemId",
-                poItemId: "poItemId",
+                wkType: "wkType",
                 safeQty: "safeQty",
+                dlyQty: "dlyQty",
+                rcptQty: "rcptQty",
+                isptQty: "isptQty",
+                isptResult: "isptResult",
+                isptStatus: "isptStatus",
+            },
+            qlyIsptItem: {
+                ispectId: "ispectId",
+                matnrCode: "matnrCode",
+                maktx: "maktx",
+                label: "label",
+                splrName: "splrName",
+                splrBatch: "splrBatch",
+                stockBatch: "stockBatch",
+                isptResult: 'isptResult',
+                rcptQty: "rcptQty",
+                dlyQty: "dlyQty",
                 disQty: "disQty",
+                safeQty: "safeQty",
+                picPath: "picPath",
+                trackCode: "trackCode",
             },
             dictType: {
                 code: "Code",
@@ -440,14 +533,29 @@
                 arrTime: "Arrived",
                 rleStatus: "Release",
                 ntyStatus: "Notify",
+                exceStatus: 'bill status'
             },
-            asnOrderItem: {
-                asnId: "asnId",
-                asnCode: "asnCode",
+            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: "poDetlCode",
+                poDetlCode: "DO Detl Code",
                 matnrId: "matnrId",
-                matnk: "matnk",
+                maktx: "maktx",
                 anfme: "anfme",
                 stockUnit: "stockUnit",
                 purQty: "purQty",
@@ -459,6 +567,66 @@
                 barcode: "barcode",
                 packName: "packName",
                 ntyStatus: "ntyStatus",
+                platItemId: 'platItemId'
+            },
+            asnOrderItem: {
+                asnId: "asnId",
+                asnCode: "asnCode",
+                poDetlId: "poDetlId",
+                poDetlCode: "poDetlCode",
+                matnrId: "matnrId",
+                maktx: "maktx",
+                anfme: "anfme",
+                stockUnit: "stockUnit",
+                purQty: "purQty",
+                purUnit: "purUnit",
+                unit: 'Unit',
+                qty: "qty",
+                splrCode: "splrCode",
+                splrName: "splrName",
+                qrcode: "qrcode",
+                barcode: "barcode",
+                packName: "packName",
+                ntyStatus: "ntyStatus",
+                platItemId: 'platItemId'
+            },
+            asnOrderLog: {
+                code: "code",
+                poCode: "poCode",
+                poId: "poId",
+                type: "type",
+                wkType: "wkType",
+                anfme: "anfme",
+                qty: "qty",
+                logisNo: "logisNo",
+                arrTime: "arrTime",
+                rleStatus: "rleStatus",
+                ntyStatus: "ntyStatus",
+            },
+            asnOrderItemLog: {
+                asnId: "asnId",
+                asnCode: "asnCode",
+                platItemId: "platItemId",
+                poDetlId: "poDetlId",
+                poCode: "poCode",
+                fieldsIndex: "fieldsIndex",
+                matnrId: "matnrId",
+                matnrCode: "matnrCode",
+                maktx: "maktx",
+                anfme: "anfme",
+                stockUnit: "stockUnit",
+                purQty: "purQty",
+                purUnit: "purUnit",
+                qty: "qty",
+                splrCode: "splrCode",
+                splrBatch: "splrBatch",
+                splrName: "splrName",
+                qrcode: "qrcode",
+                trackCode: "trackCode",
+                barcode: "barcode",
+                packName: "packName",
+                ntyStatus: "ntyStatus",
+                prodTime: "prodTime",
             },
             purchase: {
                 code: "code",
@@ -475,6 +643,35 @@
                 project: "project",
                 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",
@@ -503,6 +700,221 @@
                 value: "Value",
                 matnrId: "MatnrId",
                 shiperId: "Shipper",
+            },
+            deviceSite: {
+                type: "type",
+                site: "site",
+                name: "name",
+                wcsCode: "wcsCode",
+                label: "label",
+                device: "device",
+                deviceCode: "deviceCode",
+                deviceSite: "deviceSite",
+                flagInit: "flagInit",
+            },
+            waitPakin: {
+                code: "code",
+                ansId: "ansId",
+                asnCode: "asnCode",
+                barcode: "barcode",
+                flagDefect: "Defective",
+                anfme: "anfme",
+                ioStatus: "ioStatus",
+            },
+            waitPakinItem: {
+                pakinId: "pakinId",
+                maktx: "maktx",
+                matnrId: "matnrId",
+                matnrCode: "matnrCode",
+                asnId: "asnId",
+                asnCode: "asnCode",
+                asnItemId: "asnItemId",
+                trackCode: "trackCode",
+                anfme: "anfme",
+                workQty: "workQty",
+                unit: "unit",
+                fieldsIndex: "fieldsIndex",
+                qty: "qty",
+                batch: "batch",
+            },
+            waitPakinLog: {
+                pakinId: "pakinId",
+                code: "code",
+                barcode: "barcode",
+                anfme: "anfme",
+                ioStatus: "ioStatus",
+            },
+            waitPakinItemLog: {
+                pakinId: "pakinId",
+                pakinItemId: "pakinItemId",
+                asnId: "asnId",
+                asnCode: "asnCode",
+                asnItemId: "asnItemId",
+                trackCode: "trackCode",
+                maktx: "maktx",
+                matnrId: "matnrId",
+                matnrCode: "matnrCode",
+                anfme: "anfme",
+                workQty: "workQty",
+                unit: "unit",
+                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",
+                taskStatus: "Status",
+                taskType: "Type",
+                orgLoc: "orgLoc",
+                orgSite: "orgSite",
+                targLoc: "targLoc",
+                targSite: "targSite",
+                barcode: "barcode",
+                robotCode: "robotCode",
+                exceStatus: "exceStatus",
+                expDesc: "expDesc",
+                sort: "sort",
+                expCode: "expCode",
+                startTime: "startTime",
+                endTime: "endTime",
+            },
+            taskLog: {
+                taskId: "taskId",
+                taskCode: "taskCode",
+                taskStatus: "taskStatus",
+                taskType: "taskType",
+                orgLoc: "orgLoc",
+                orgSite: "orgSite",
+                targLoc: "targLoc",
+                targSite: "targSite",
+                barcode: "barcode",
+                robotCode: "robotCode",
+                exceStatus: "exceStatus",
+                expDesc: "expDesc",
+                sort: "sort",
+                expCode: "expCode",
+                startTime: "startTime",
+                endTime: "endTime",
+            },
+            taskItem: {
+                taskId: "taskId",
+                orderId: "orderId",
+                orderType: "orderType",
+                orderItemId: "orderItemId",
+                sourceCode: "sourceCode",
+                matnrId: "matnrId",
+                maktx: "maktx",
+                matnrCode: "matnrCode",
+                unit: "unit",
+                anfme: "anfme",
+                batch: "batch",
+                spec: "spec",
+                model: "model",
+            },
+            taskItemLog: {
+                taskItemId: "taskItemId",
+                taskId: "taskId",
+                orderId: "orderId",
+                orderType: "orderType",
+                orderItemId: "orderItemId",
+                source: "source",
+                matnrId: "matnrId",
+                maktx: "maktx",
+                matnrCode: "matnrCode",
+                trackCode: "trackCode",
+                unit: "unit",
+                anfme: "anfme",
+                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",
             },
         }
     },
@@ -583,7 +995,49 @@
         inspection: "Inspection",
         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',
+        bindmatnr: 'bind matnr',
+        bindloc: 'bind loc',
+        batchMatnrGropu: 'batchMatnrGropu',
+        batchStatus: 'batchStatus',
+        batchMix: 'batchFiexed',
+        batchWarehouse: 'batchWarehouse',
+        batchStockLevel: "batchStockLevel",
+        batchWarehouseAreas: "batchWarehouseAreas",
+        batchLocType: "batchLocType",
+        batchPrint: "batch print",
+        quality: "quality",
+        complete: "complete",
+        close: "close",
+        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