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

skyouc

2025-03-05 b2bd54b277f12d532e5c87e02e3e97d087a52fee

 rsf-admin/src/i18n/en.js

@@ -108,6 +108,7 @@
        dashboard: 'Dashboard',
        basicInfo: 'BasicInfo',
        settings: 'Settings',
        basicInfo: 'BasicInfo',
        system: 'System',
        user: 'User',
        role: 'Role',
@@ -125,7 +126,16 @@
        matnrGroup: 'MatnrGroup',
        warehouse: 'Warehouse',
        warehouseAreas: 'WarehouseAreas',

        loc: 'Loc',
        container: 'Container',
        contract: 'Contract',
        qlyInspect: 'QlyInspect',
        dictType: 'DictType',
        dictData: 'DictData',
        companys: 'Companys',
        serialRuleItem: 'SerialRuleItem',
        serialRule: 'SerialRule',
        whMat: 'Warehouse Mat',
    },
    table: {
        field: {
@@ -287,6 +297,106 @@
                flagLabelMange: "flagLabelMange",
                flagMix: "flagMix",
            },
            loc: {
                warehouseId: "Warehouse",
                areaId: "Area",
                code: "Code",
                type: "Type",
                name: "Name",
                flagLogic: "FlagLogic",
                fucAtrrs: "FucAtrrs",
                barcode: "Barcode",
                unit: "Unit",
                size: "Size",
                row: "Row",
                col: "Col",
                lev: "Lev",
                channel: "Channel",
                maxParts: "MaxParts",
                maxPack: "MaxPack",
                flagLabelMange: "FlagLabelMange",
                locAttrs: "LocAttrs",
            },
            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: {
                code: "Code",
                name: "Name",
            },
            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",
            }
        }
    },
    page: {
@@ -343,6 +453,24 @@
                },
            },
        },
        matnr: {
            title: {
                basic: 'basic info',
                control: 'control',
                batchRole: 'batch role',
            }
        },
        whMat: {
            title: {
                add: 'add',
            }
        },
    },
    form: {
        matnr: {
            shipper: 'shipper is required',
            groupId: 'groupId is required',
        }
    }
};