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

skyouc

2025-03-03 e254ada588f047fc137484343ca03361e55dff6b

 rsf-admin/src/i18n/en.js

@@ -135,7 +135,7 @@
        companys: 'Companys',
        serialRuleItem: 'SerialRuleItem',
        serialRule: 'SerialRule',

        whMat: 'Warehouse Mat',
    },
    table: {
        field: {
@@ -298,40 +298,41 @@
                flagMix: "flagMix",
            },
            loc: {
                areaId: "areaId",
                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",
                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",
                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",
@@ -339,8 +340,8 @@
                projectName: "ProjectName",
            },
            qlyInspect: {
                code: "code",
                name: "name",
                code: "Code",
                name: "Name",
            },
            dictType: {
                code: "Code",
@@ -449,7 +450,11 @@
                batchRole: 'batch role',
            }
        },
        
        whMat: {
            title: {
                add: 'add',
            }
        },
    },
    form: {
        matnr: {