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 |  741 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 733 insertions(+), 8 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 4288984..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: {
@@ -107,8 +115,7 @@
     menu: {
         dashboard: 'Dashboard',
         settings: 'Settings',
-        pakin: 'Pakin',
-        basicSettings: 'Basic Setting',
+        basicInfo: 'BasicInfo',
         system: 'System',
         user: 'User',
         role: 'Role',
@@ -123,6 +130,57 @@
         customer: 'Customer',
         shipper: 'shipper',
         matnr: 'Matnr',
+        matnrGroup: 'MatnrGroup',
+        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',
+        serialRuleItem: 'SerialRuleItem',
+        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: '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: {
@@ -232,29 +290,631 @@
                 name: "name",
             },
             matnr: {
-                uuid: "uuid",
-                shipperId: "shipperId",
                 name: "name",
                 code: "code",
+                shipperId: "shipperId",
                 groupId: "groupId",
-                erpCode: "erpCode",
+                rglarId: "RegularId",
+                platCode: "platCode",
                 spec: "spec",
                 model: "model",
                 weight: "weight",
                 color: "color",
                 size: "size",
-                desc: "desc",
+                describle: "describle",
                 nromNum: "nromNum",
                 unit: "unit",
-                purchaseUnit: "purchaseUnit",
+                purUnit: "purchaseUnit",
                 stockUnit: "stockUnit",
-                stockLeval: "stockLeval",
+                stockLevel: "stockLeval",
                 isLabelMange: "isLabelMange",
+                safeQty: "safetyQty",
+                minQty: "minQty",
+                maxQty: "maxQty",
+                stagn: "stagnate",
+                valid: "validity",
+                validWarn: "validityWarn",
+                flagCheck: "flagCheck",
             },
             matnrGroup: {
                 name: "name",
                 code: "code",
                 parentId: "parentId",
+                parCode: "parCode",
+            },
+            warehouse: {
+                name: "name",
+                code: "code",
+                factory: "factory",
+                address: "address",
+                longitude: "longitude",
+                latgitude: "latgitude",
+                length: "length",
+                width: "width",
+                height: "height",
+            },
+            warehouseAreas: {
+                uuid: "uuid",
+                name: "name",
+                wareId: "ware",
+                code: "code",
+                shipperId: "shipperId",
+                supplierId: "supplierId",
+                flagMinus: "flagMinus",
+                flagLabelMange: "flagLabelMange",
+                flagMix: "flagMix",
+            },
+            warehouseAreasItem: {
+                areaId: "areaId",
+                areaName: "areaName",
+                matnrId: "matnrId",
+                matnrName: "matnrName",
+                matnrCode: "matnrCode",
+                fieldsIndex: "fieldsIndex",
+                barcode: "barcode",
+                anfme: "anfme",
+                workQty: 'Work Qty',
+                qty: 'Available',
+                batch: "batch",
+                unit: "unit",
+                stockUnit: "stockUnit",
+                brand: "brand",
+                shipperId: "shipperId",
+                splrId: "splrId",
+                weight: "weight",
+                prodTime: "prodTime",
+                splrBtch: "splrBtch",
+            },
+            loc: {
+                warehouseId: "Warehouse",
+                areaId: "Area",
+                code: "Code",
+                type: "Type",
+                name: "Name",
+                flagLogic: "FlagLogic",
+                fucAtrrs: "FucAtrrs",
+                barcode: "Barcode",
+                unit: "Unit",
+                size: "Size",
+                length: "length",
+                width: "width",
+                height: "height",
+                row: "Row",
+                col: "Col",
+                lev: "Lev",
+                channel: "Channel",
+                maxParts: "MaxParts",
+                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",
+                name: "Name",
+                typeId: "TypeId",
+                used: "Used",
+                lenght: "Lenght",
+                width: "Width",
+                height: "Height",
+                rstLen: "RstLen",
+                rstWid: "RstWid",
+                rstWei: "RstWei",
+                rstHei: "RstHei",
+                panrentId: "PanrentId",
+                vaildTime: "VaildTime",
+                flagRycle: "FlagRycle",
+                flagLogic: "FlagLogic",
+            },
+            contract: {
+                code: "Code",
+                name: "Name",
+                projectName: "ProjectName",
+            },
+            qlyInspect: {
+                asnId: "asnId",
+                asnCode: "asnCode",
+                code: "code",
+                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",
+                name: "Name",
+                description: "Description",
+            },
+            dictData: {
+                dictTypeId: "dictTypeId",
+                dictTypeCode: "dictTypeCode",
+                value: "value",
+                label: "label",
+                sort: "sort",
+                color: "color",
+            },
+            companys: {
+                code: "Code",
+                name: "Name",
+                nameEn: "NameEn",
+                breifCode: "BreifCode",
+                type: "Type",
+                contact: "Contact",
+                tel: "Tel",
+                email: "Email",
+                pcode: "PCode",
+                province: "Province",
+                city: "City",
+                address: "Address",
+            },
+            serialRuleItem: {
+                ruleId: "ruleId",
+                wkType: "wkType",
+                feildValue: "feildValue",
+                len: "len",
+                lenStr: "lenStr",
+                sort: "sort",
+            },
+            serialRule: {
+                code: "code",
+                name: "name",
+                delimit: "delimit",
+                reset: "reset",
+                resetDep: "resetDep",
+                currValue: "currValue",
+                lastCode: "lastCode",
+            },
+            whMat: {
+                matnrCode: "matnrCode",
+                matnrName: "matnrName",
+                matnrGroupId: "matnrGroupId",
+                spec: "spec",
+                color: "color",
+                size: "size",
+                minWeight: "minWeight",
+                maxWeight: "maxWeight",
+            },
+            asnOrder: {
+                code: "Code",
+                poCode: "poCode",
+                poId: "poId",
+                type: "Type",
+                wkType: "wkType",
+                anfme: "anfme",
+                qty: "qty",
+                logisNo: "logisNo",
+                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",
+                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",
+                platId: "PlatId",
+                type: "type",
+                wkType: "wkType",
+                source: "source",
+                preArr: "preArr",
+                anfme: "anfme",
+                qty: "qty",
+                workQty: "workQty",
+                channel: "channel",
+                platCode: "platCode",
+                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",
+                platItemId: "erpItemId",
+                matnrCode: "matnrCode",
+                matnrName: "matnrName",
+                unit: "unit",
+                anfme: "anfme",
+                qty: "qty",
+                nromQty: "nromQty",
+                asnQty: "asnQty",
+                printQty: "printQty",
+                splrName: "splrName",
+                splrCode: "splrCode",
+                splrBatch: "splrBatch",
+            },
+            fields: {
+                fields: "Fields",
+                fieldsAlise: "FieldsAlise",
+                unique: "Unique",
+                flagEnable: "FlagEnable",
+            },
+            fieldsItem: {
+                uuid: "uuid",
+                fieldsId: "FieldsId",
+                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",
             },
         }
     },
@@ -312,7 +972,72 @@
                 },
             },
         },
+        matnr: {
+            title: {
+                basic: 'basic info',
+                control: 'control',
+                batchRole: 'batch role',
+            }
+        },
+        whMat: {
+            title: {
+                add: 'add',
+            }
+        },
+    },
+    form: {
+        matnr: {
+            shipper: 'shipper is required',
+            groupId: 'groupId is required',
+        }
+    },
+    toolbar: {
+        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