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

verou

2025-03-26 183d1e50c7b9a040e39eec36de81e5331aa7b31c

 rsf-admin/src/i18n/en.js

@@ -129,6 +129,7 @@
        loc: 'Loc',
        locType: 'LocType',
        locArea: 'locArea',
        LocAreaMat: 'LocAreaMat',
        locAreaMatRela: 'LocAreaMatRela',
        container: 'Container',
        contract: 'Contract',
@@ -291,6 +292,7 @@
                name: "name",
                code: "code",
                parentId: "parentId",
                parCode: "parCode",
            },
            warehouse: {
                name: "name",
@@ -369,6 +371,13 @@
                code: "code",
                areaId: "areaId",
                locId: "locId",
            },
            locAreaMat: {
                code: "code",
                depict: "depict",
                name: "name",
                warehouseId: "warehouseId",
                areaId: "areaId",
            },
            locAreaMatRela: {
                areaId: "areaId",
@@ -639,6 +648,11 @@
        subzone: 'subzone',
        bindmatnr: 'bind matnr',
        bindloc: 'bind loc',
        batchMatnrGropu: 'batchMatnrGropu',
        batchStatus: 'batchStatus',
        batchMix: 'batchFiexed',
        batchWarehouse: 'batchWarehouse',
        batchStockLevel: "batchStockLevel",
    },
};