Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev

skyouc

2025-02-18 ad84e7d81cbd3fd7d9e7fed430d2004c0f43fc0a

 rsf-admin/src/i18n/en.js

@@ -107,8 +107,6 @@
    menu: {
        dashboard: 'Dashboard',
        settings: 'Settings',
        pakin: 'Pakin',
        basicSettings: 'Basic Setting',
        system: 'System',
        user: 'User',
        role: 'Role',
@@ -120,6 +118,11 @@
        config: 'Config',
        tenant: 'Tenant',
        userLogin: 'Token',
        customer: 'Customer',
        shipper: 'shipper',
        matnr: 'Matnr',
        matnrGroup: 'MatnrGroup',

    },
    table: {
        field: {
@@ -220,6 +223,46 @@
                result: "result",
                userId: "user",
            },
            customer: {
                uuid: "uuid",
                name: "name",
            },
            shipper: {
                uuid: "uuid",
                name: "name",
            },
            matnr: {
                name: "name",
                code: "code",
                shipperId: "shipperId",
                groupId: "groupId",
                batchRegularId: "batchRegularId",
                erpCode: "erpCode",
                spec: "spec",
                model: "model",
                weight: "weight",
                color: "color",
                size: "size",
                describle: "describle",
                nromNum: "nromNum",
                unit: "unit",
                purchaseUnit: "purchaseUnit",
                stockUnit: "stockUnit",
                stockLeval: "stockLeval",
                isLabelMange: "isLabelMange",
                safetyQty: "safetyQty",
                minQty: "minQty",
                maxQty: "maxQty",
                stagnate: "stagnate",
                validity: "validity",
                validityWarr: "validityWarr",
                flagCheck: "flagCheck",
            },
            matnrGroup: {
                name: "name",
                code: "code",
                parentId: "parentId",
            },
        }
    },
    page: {