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

skyouc

2025-03-10 8eaee61fbbdea1eaa294b0f1a7d9f2a10da9ade9

 rsf-admin/src/i18n/en.js

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

        asnOrder: 'AsnOrder',
        asnOrderItem: 'AsnOrderItem',
        purchase: 'Purchase',
        purchaseItem: 'PurchaseItem',
        whMat: 'Warehouse Mat',
    },
    table: {
        field: {
@@ -298,40 +302,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 +344,8 @@
                projectName: "ProjectName",
            },
            qlyInspect: {
                code: "code",
                name: "name",
                code: "Code",
                name: "Name",
            },
            dictType: {
                code: "Code",
@@ -385,6 +390,79 @@
                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",
            },
            asnOrderItem: {
                asnId: "asnId",
                asnCode: "asnCode",
                poDetlId: "poDetlId",
                poDetlCode: "poDetlCode",
                matnrId: "matnrId",
                matnk: "matnk",
                anfme: "anfme",
                stockUnit: "stockUnit",
                purQty: "purQty",
                purUnit: "purUnit",
                qty: "qty",
                splrCode: "splrCode",
                splrName: "splrName",
                qrcode: "qrcode",
                barcode: "barcode",
                packName: "packName",
                ntyStatus: "ntyStatus",
            },
            purchase: {
                code: "code",
                erpId: "erpId",
                type: "type",
                wkType: "wkType",
                source: "source",
                preArr: "preArr",
                anfme: "anfme",
                qty: "qty",
                workQty: "workQty",
                channel: "channel",
                erpCode: "erpCode",
                project: "project",
                startTime: "startTime",
                endTime: "endTime",
            },
            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",
            },
        }
    },
@@ -449,7 +527,11 @@
                batchRole: 'batch role',
            }
        },
        
        whMat: {
            title: {
                add: 'add',
            }
        },
    },
    form: {
        matnr: {