@pksep/zod-shared 0.0.533 → 0.0.534

package/dist/action/enums/enums.d.ts

@@ -37,7 +37,8 @@ export declare enum ActionEntityTypes {
     revision = "revision",
     thread_entity = "thread_entity",
     user_table_config = "user_table_config",
-    tasks = "tasks"
+    tasks = "tasks",
+    exclusion = "exclusion"
 }
 /**
  * enum для обращения к моделям в бд
@@ -187,4 +188,8 @@ export declare const ActionEntityTypesDB: {
         readonly name: "user_table_configs";
         readonly attributes: readonly ["id"];
     };
+    readonly exclusion: {
+        readonly name: "exclusion";
+        readonly attributes: readonly ["id"];
+    };
 };

package/dist/action/enums/enums.js

@@ -42,6 +42,7 @@ var ActionEntityTypes;
     ActionEntityTypes["thread_entity"] = "thread_entity";
     ActionEntityTypes["user_table_config"] = "user_table_config";
     ActionEntityTypes["tasks"] = "tasks";
+    ActionEntityTypes["exclusion"] = "exclusion";
 })(ActionEntityTypes || (exports.ActionEntityTypes = ActionEntityTypes = {}));
 /**
  * enum для обращения к моделям в бд
@@ -133,5 +134,9 @@ exports.ActionEntityTypesDB = {
     [ActionEntityTypes.user_table_config]: {
         name: 'user_table_configs',
         attributes: ['id']
+    },
+    [ActionEntityTypes.exclusion]: {
+        name: 'exclusion',
+        attributes: ['id']
     }
 };

package/dist/assemble/dto/assembly-paginate.dto.d.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { IzdType, ProductionPlanSortField } from '../../utils';
+import { IzdType } from '../../utils';
 import { IFiltersByByOrder, IFiltersByParents } from '../../production-tasks';
 export declare const AssemblyPaginateDtoZod: z.ZodObject<{
     type: z.ZodEnum<[IzdType.product, IzdType.cbed]>;
@@ -8,24 +8,36 @@ export declare const AssemblyPaginateDtoZod: z.ZodObject<{
     byParents: z.ZodOptional<z.ZodNullable<z.ZodType<IFiltersByParents, z.ZodTypeDef, IFiltersByParents>>>;
     byOrder: z.ZodOptional<z.ZodNullable<z.ZodType<IFiltersByByOrder, z.ZodTypeDef, IFiltersByByOrder>>>;
     isShowDeactivate: z.ZodBoolean;
-    sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof ProductionPlanSortField>>>;
-    sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    sort: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
+        sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof import("../../utils").ProductionPlanSortField>>>;
+        sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    }, "strip", z.ZodTypeAny, {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }, {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }>, "many">>>;
 }, "strip", z.ZodTypeAny, {
     type: IzdType.product | IzdType.cbed;
+    sort: {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }[];
     searchString: string;
-    sortDesc: boolean;
     isShowDeactivate: boolean;
     page?: number | undefined;
-    sortField?: ProductionPlanSortField | null | undefined;
     byParents?: IFiltersByParents | null | undefined;
     byOrder?: IFiltersByByOrder | null | undefined;
 }, {
     type: IzdType.product | IzdType.cbed;
     isShowDeactivate: boolean;
+    sort?: {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }[] | undefined;
     page?: number | undefined;
     searchString?: string | undefined;
-    sortField?: ProductionPlanSortField | null | undefined;
-    sortDesc?: boolean | undefined;
     byParents?: IFiltersByParents | null | undefined;
     byOrder?: IFiltersByByOrder | null | undefined;
 }>;

package/dist/assemble/dto/assembly-paginate.dto.js

@@ -11,6 +11,5 @@ exports.AssemblyPaginateDtoZod = zod_1.z.object({
     byParents: zod_1.z.custom().nullable().optional(),
     byOrder: zod_1.z.custom().nullable().optional(),
     isShowDeactivate: zod_1.z.boolean(),
-    sortField: zod_1.z.nativeEnum(utils_1.ProductionPlanSortField).nullable().optional(),
-    sortDesc: zod_1.z.boolean().optional().default(false)
+    sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
 });

package/dist/assemble/dto/get-assemble-pagination-sclad.dto.d.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { IFiltersByByOrder, IFiltersByParents } from '../../production-tasks';
-import { AssembleIzdEnum, ProductionPlanSortField } from '../../utils';
+import { AssembleIzdEnum } from '../../utils';
 export declare const GetAssembleScladPaginationDtoZod: z.ZodObject<{
     page: z.ZodNumber;
     searchString: z.ZodString;
@@ -8,24 +8,36 @@ export declare const GetAssembleScladPaginationDtoZod: z.ZodObject<{
     byParents: z.ZodOptional<z.ZodNullable<z.ZodType<IFiltersByParents, z.ZodTypeDef, IFiltersByParents>>>;
     type: z.ZodDefault<z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof AssembleIzdEnum>>>>;
     byOrder: z.ZodOptional<z.ZodNullable<z.ZodType<IFiltersByByOrder, z.ZodTypeDef, IFiltersByByOrder>>>;
-    sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof ProductionPlanSortField>>>;
-    sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    sort: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
+        sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof import("../../utils").ProductionPlanSortField>>>;
+        sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    }, "strip", z.ZodTypeAny, {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }, {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }>, "many">>>;
 }, "strip", z.ZodTypeAny, {
     type: AssembleIzdEnum | null;
+    sort: {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }[];
     page: number;
     searchString: string;
-    sortDesc: boolean;
     responsibleUserId?: number | null | undefined;
-    sortField?: ProductionPlanSortField | null | undefined;
     byParents?: IFiltersByParents | null | undefined;
     byOrder?: IFiltersByByOrder | null | undefined;
 }, {
     page: number;
     searchString: string;
     type?: AssembleIzdEnum | null | undefined;
+    sort?: {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }[] | undefined;
     responsibleUserId?: number | null | undefined;
-    sortField?: ProductionPlanSortField | null | undefined;
-    sortDesc?: boolean | undefined;
     byParents?: IFiltersByParents | null | undefined;
     byOrder?: IFiltersByByOrder | null | undefined;
 }>;

package/dist/assemble/dto/get-assemble-pagination-sclad.dto.js

@@ -10,6 +10,5 @@ exports.GetAssembleScladPaginationDtoZod = zod_1.z.object({
     byParents: zod_1.z.custom().nullable().optional(),
     type: zod_1.z.nativeEnum(utils_1.AssembleIzdEnum).nullish().default(utils_1.AssembleIzdEnum.all),
     byOrder: zod_1.z.custom().nullable().optional(),
-    sortField: zod_1.z.nativeEnum(utils_1.ProductionPlanSortField).nullable().optional(),
-    sortDesc: zod_1.z.boolean().optional().default(false)
+    sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
 });

package/dist/assemble/dto/get-assemble-pagination.dto.d.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { AssembleIzdEnum, ProductionPlanSortField, SortReadinesEnum } from '../../utils';
+import { AssembleIzdEnum, SortReadinesEnum } from '../../utils';
 import { IFiltersByByOrder, IFiltersByParents } from '../../production-tasks';
 export declare const GetAssemblePaginationDtoZod: z.ZodObject<{
     page: z.ZodNumber;
@@ -12,18 +12,28 @@ export declare const GetAssemblePaginationDtoZod: z.ZodObject<{
     sortReadines: z.ZodDefault<z.ZodNativeEnum<typeof SortReadinesEnum>>;
     byOrder: z.ZodOptional<z.ZodNullable<z.ZodType<IFiltersByByOrder, z.ZodTypeDef, IFiltersByByOrder>>>;
     onlyCanComplect: z.ZodBoolean;
-    sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof ProductionPlanSortField>>>;
-    sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    sort: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
+        sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof import("../../utils").ProductionPlanSortField>>>;
+        sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    }, "strip", z.ZodTypeAny, {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }, {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }>, "many">>>;
 }, "strip", z.ZodTypeAny, {
     type: AssembleIzdEnum;
+    sort: {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }[];
     page: number;
     searchString: string;
     responsibleUserId: number | null;
     isBan: boolean;
-    sortDesc: boolean;
     sortReadines: SortReadinesEnum;
     onlyCanComplect: boolean;
-    sortField?: ProductionPlanSortField | null | undefined;
     byParents?: IFiltersByParents | null | undefined;
     byOrder?: IFiltersByByOrder | null | undefined;
     notOrderedByProductionTask?: boolean | null | undefined;
@@ -34,8 +44,10 @@ export declare const GetAssemblePaginationDtoZod: z.ZodObject<{
     isBan: boolean;
     onlyCanComplect: boolean;
     type?: AssembleIzdEnum | undefined;
-    sortField?: ProductionPlanSortField | null | undefined;
-    sortDesc?: boolean | undefined;
+    sort?: {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }[] | undefined;
     byParents?: IFiltersByParents | null | undefined;
     byOrder?: IFiltersByByOrder | null | undefined;
     notOrderedByProductionTask?: boolean | null | undefined;

package/dist/assemble/dto/get-assemble-pagination.dto.js

@@ -14,6 +14,5 @@ exports.GetAssemblePaginationDtoZod = zod_1.z.object({
     sortReadines: zod_1.z.nativeEnum(utils_1.SortReadinesEnum).default(utils_1.SortReadinesEnum.any),
     byOrder: zod_1.z.custom().nullable().optional(),
     onlyCanComplect: zod_1.z.boolean(),
-    sortField: zod_1.z.nativeEnum(utils_1.ProductionPlanSortField).nullable().optional(),
-    sortDesc: zod_1.z.boolean().optional().default(false)
+    sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
 });

package/dist/cbed/dto/get-deficit.dto.d.ts

@@ -1,28 +1,40 @@
 import { z } from 'zod';
-import { ProductionPlanSortField, statusWorkingsDeficit } from '../../utils';
+import { statusWorkingsDeficit } from '../../utils';
 export declare const GetDeficitDtoZod: z.ZodObject<{
     cbedIds: z.ZodArray<z.ZodNumber, "many">;
     page: z.ZodNullable<z.ZodOptional<z.ZodNumber>>;
     statusWorking: z.ZodNativeEnum<typeof statusWorkingsDeficit>;
     searchString: z.ZodString;
     shipmentIds: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodNumber, "many">>>;
-    sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof ProductionPlanSortField>>>;
-    sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    sort: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
+        sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof import("../../utils").ProductionPlanSortField>>>;
+        sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    }, "strip", z.ZodTypeAny, {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }, {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }>, "many">>>;
 }, "strip", z.ZodTypeAny, {
+    sort: {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }[];
     searchString: string;
     statusWorking: statusWorkingsDeficit;
-    sortDesc: boolean;
     cbedIds: number[];
     page?: number | null | undefined;
     shipmentIds?: number[] | null | undefined;
-    sortField?: ProductionPlanSortField | null | undefined;
 }, {
     searchString: string;
     statusWorking: statusWorkingsDeficit;
     cbedIds: number[];
+    sort?: {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }[] | undefined;
     page?: number | null | undefined;
     shipmentIds?: number[] | null | undefined;
-    sortField?: ProductionPlanSortField | null | undefined;
-    sortDesc?: boolean | undefined;
 }>;
 export type GetDeficitDtoZodType = z.infer<typeof GetDeficitDtoZod>;

package/dist/cbed/dto/get-deficit.dto.js

@@ -9,6 +9,5 @@ exports.GetDeficitDtoZod = zod_1.z.object({
     statusWorking: zod_1.z.nativeEnum(utils_1.statusWorkingsDeficit),
     searchString: zod_1.z.string(),
     shipmentIds: zod_1.z.array(zod_1.z.number()).nullable().optional(),
-    sortField: zod_1.z.nativeEnum(utils_1.ProductionPlanSortField).nullable().optional(),
-    sortDesc: zod_1.z.boolean().optional().default(false)
+    sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
 });

package/dist/detal/dto/get-deficit.dto.d.ts

@@ -1,28 +1,40 @@
 import { z } from 'zod';
-import { ProductionPlanSortField, statusWorkingsDeficit } from '../../utils';
+import { statusWorkingsDeficit } from '../../utils';
 export declare const GetDetalDeficitDtoZod: z.ZodObject<{
     detalIds: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>>;
     statusWorking: z.ZodDefault<z.ZodOptional<z.ZodNativeEnum<typeof statusWorkingsDeficit>>>;
     searchString: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     shipmentIds: z.ZodDefault<z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>>>;
     page: z.ZodNumber;
-    sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof ProductionPlanSortField>>>;
-    sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    sort: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
+        sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof import("../../utils").ProductionPlanSortField>>>;
+        sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    }, "strip", z.ZodTypeAny, {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }, {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }>, "many">>>;
 }, "strip", z.ZodTypeAny, {
+    sort: {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }[];
     page: number;
     searchString: string;
     detalIds: number[];
     statusWorking: statusWorkingsDeficit;
     shipmentIds: number[] | null;
-    sortDesc: boolean;
-    sortField?: ProductionPlanSortField | null | undefined;
 }, {
     page: number;
+    sort?: {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }[] | undefined;
     searchString?: string | undefined;
     detalIds?: number[] | undefined;
     statusWorking?: statusWorkingsDeficit | undefined;
     shipmentIds?: number[] | null | undefined;
-    sortField?: ProductionPlanSortField | null | undefined;
-    sortDesc?: boolean | undefined;
 }>;
 export type GetDetalDeficitDtoType = z.infer<typeof GetDetalDeficitDtoZod>;

package/dist/detal/dto/get-deficit.dto.js

@@ -12,6 +12,5 @@ exports.GetDetalDeficitDtoZod = zod_1.z.object({
     searchString: zod_1.z.string().optional().default(''),
     shipmentIds: zod_1.z.number().int().array().optional().nullable().default(null),
     page: zod_1.z.number().int(),
-    sortField: zod_1.z.nativeEnum(utils_1.ProductionPlanSortField).nullable().optional(),
-    sortDesc: zod_1.z.boolean().optional().default(false)
+    sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
 });

package/dist/index.d.ts

@@ -38,3 +38,4 @@ export * from './expenditure';
 export * from './supply';
 export * from './thread';
 export * from './movement-error';
+export * from './exclusion';

package/dist/index.js

@@ -54,3 +54,4 @@ __exportStar(require("./expenditure"), exports);
 __exportStar(require("./supply"), exports);
 __exportStar(require("./thread"), exports);
 __exportStar(require("./movement-error"), exports);
+__exportStar(require("./exclusion"), exports);

package/dist/material/dto/get-deficit.dto.d.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { ProductionPlanSortField, statusWorkingsDeficit } from '../../utils';
+import { statusWorkingsDeficit } from '../../utils';
 export declare const GetMaterialDeficitDtoZod: z.ZodObject<{
     materialIds: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>>;
     typeMaterialIds: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>>;
@@ -8,25 +8,37 @@ export declare const GetMaterialDeficitDtoZod: z.ZodObject<{
     searchString: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     shipmentIds: z.ZodDefault<z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>>>;
     page: z.ZodNumber;
-    sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof ProductionPlanSortField>>>;
-    sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    sort: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
+        sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof import("../../utils").ProductionPlanSortField>>>;
+        sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    }, "strip", z.ZodTypeAny, {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }, {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }>, "many">>>;
 }, "strip", z.ZodTypeAny, {
+    sort: {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }[];
     page: number;
     searchString: string;
     statusWorking: statusWorkingsDeficit;
     shipmentIds: number[] | null;
-    sortDesc: boolean;
     materialIds: number[];
     typeMaterialIds: number[];
     subTypeMaterialIds: number[];
-    sortField?: ProductionPlanSortField | null | undefined;
 }, {
     page: number;
+    sort?: {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }[] | undefined;
     searchString?: string | undefined;
     statusWorking?: statusWorkingsDeficit | undefined;
     shipmentIds?: number[] | null | undefined;
-    sortField?: ProductionPlanSortField | null | undefined;
-    sortDesc?: boolean | undefined;
     materialIds?: number[] | undefined;
     typeMaterialIds?: number[] | undefined;
     subTypeMaterialIds?: number[] | undefined;

package/dist/material/dto/get-deficit.dto.js

@@ -14,6 +14,5 @@ exports.GetMaterialDeficitDtoZod = zod_1.z.object({
     searchString: zod_1.z.string().optional().default(''),
     shipmentIds: zod_1.z.number().int().array().optional().nullable().default(null),
     page: zod_1.z.number().int(),
-    sortField: zod_1.z.nativeEnum(utils_1.ProductionPlanSortField).nullable().optional(),
-    sortDesc: zod_1.z.boolean().optional().default(false)
+    sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
 });

package/dist/metaloworking/dto/get-metallworking-pagination.dto.d.ts

@@ -1,5 +1,4 @@
 import { z } from 'zod';
-import { ProductionPlanSortField } from '../../utils';
 import { IFiltersByByOrder, IFiltersByParents } from '../../production-tasks';
 export declare const GetMetaloworkingPaginationDtoZod: z.ZodObject<{
     page: z.ZodNumber;
@@ -9,15 +8,25 @@ export declare const GetMetaloworkingPaginationDtoZod: z.ZodObject<{
     byParents: z.ZodOptional<z.ZodNullable<z.ZodType<IFiltersByParents, z.ZodTypeDef, IFiltersByParents>>>;
     byOrder: z.ZodOptional<z.ZodNullable<z.ZodType<IFiltersByByOrder, z.ZodTypeDef, IFiltersByByOrder>>>;
     childrenByProductionTaskIds: z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>>;
-    sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof ProductionPlanSortField>>>;
-    sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    sort: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
+        sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof import("../../utils").ProductionPlanSortField>>>;
+        sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    }, "strip", z.ZodTypeAny, {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }, {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }>, "many">>>;
 }, "strip", z.ZodTypeAny, {
+    sort: {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }[];
     page: number;
     searchString: string;
     isBan: boolean;
-    sortDesc: boolean;
     responsibleUserId?: number | null | undefined;
-    sortField?: ProductionPlanSortField | null | undefined;
     byParents?: IFiltersByParents | null | undefined;
     byOrder?: IFiltersByByOrder | null | undefined;
     childrenByProductionTaskIds?: number[] | null | undefined;
@@ -25,9 +34,11 @@ export declare const GetMetaloworkingPaginationDtoZod: z.ZodObject<{
     page: number;
     searchString: string;
     isBan: boolean;
+    sort?: {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }[] | undefined;
     responsibleUserId?: number | null | undefined;
-    sortField?: ProductionPlanSortField | null | undefined;
-    sortDesc?: boolean | undefined;
     byParents?: IFiltersByParents | null | undefined;
     byOrder?: IFiltersByByOrder | null | undefined;
     childrenByProductionTaskIds?: number[] | null | undefined;

package/dist/metaloworking/dto/get-metallworking-pagination.dto.js

@@ -11,6 +11,5 @@ exports.GetMetaloworkingPaginationDtoZod = zod_1.z.object({
     byParents: zod_1.z.custom().nullable().optional(),
     byOrder: zod_1.z.custom().nullable().optional(),
     childrenByProductionTaskIds: zod_1.z.array(zod_1.z.number()).optional().nullable(),
-    sortField: zod_1.z.nativeEnum(utils_1.ProductionPlanSortField).nullable().optional(),
-    sortDesc: zod_1.z.boolean().optional().default(false)
+    sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
 });

package/dist/product/dto/get-deficit.dto.d.ts

@@ -1,28 +1,40 @@
 import { z } from 'zod';
-import { ProductionPlanSortField, statusWorkingsDeficit } from '../../utils';
+import { statusWorkingsDeficit } from '../../utils';
 export declare const GetDeficitProductSchema: z.ZodObject<{
     productIds: z.ZodArray<z.ZodNumber, "many">;
     statusWorking: z.ZodNativeEnum<typeof statusWorkingsDeficit>;
     searchString: z.ZodString;
     shipmentIds: z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>>;
     page: z.ZodOptional<z.ZodNumber>;
-    sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof ProductionPlanSortField>>>;
-    sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    sort: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
+        sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof import("../../utils").ProductionPlanSortField>>>;
+        sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    }, "strip", z.ZodTypeAny, {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }, {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }>, "many">>>;
 }, "strip", z.ZodTypeAny, {
+    sort: {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }[];
     searchString: string;
     statusWorking: statusWorkingsDeficit;
-    sortDesc: boolean;
     productIds: number[];
     page?: number | undefined;
     shipmentIds?: number[] | null | undefined;
-    sortField?: ProductionPlanSortField | null | undefined;
 }, {
     searchString: string;
     statusWorking: statusWorkingsDeficit;
     productIds: number[];
+    sort?: {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }[] | undefined;
     page?: number | undefined;
     shipmentIds?: number[] | null | undefined;
-    sortField?: ProductionPlanSortField | null | undefined;
-    sortDesc?: boolean | undefined;
 }>;
 export type GetDeficitProductDtoType = z.infer<typeof GetDeficitProductSchema>;

package/dist/product/dto/get-deficit.dto.js

@@ -9,6 +9,5 @@ exports.GetDeficitProductSchema = zod_1.z.object({
     searchString: zod_1.z.string(),
     shipmentIds: zod_1.z.number().int().array().optional().nullable(),
     page: zod_1.z.number().int().optional(),
-    sortField: zod_1.z.nativeEnum(utils_1.ProductionPlanSortField).nullable().optional(),
-    sortDesc: zod_1.z.boolean().optional().default(false)
+    sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
 });

package/dist/production-tasks/dto/get-deficits-detal-by-production-task.dto.d.ts

@@ -1,5 +1,4 @@
 import { z } from 'zod';
-import { ProductionPlanSortField } from '../../utils';
 import { IFiltersByByOrder, IFiltersByParents } from '../interfaces/online-board';
 export declare const GetDeficitsDetalByProductionTaskDtoZod: z.ZodObject<{
     page: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
@@ -21,17 +20,27 @@ export declare const GetDeficitsDetalByProductionTaskDtoZod: z.ZodObject<{
     byParents: z.ZodOptional<z.ZodNullable<z.ZodType<IFiltersByParents, z.ZodTypeDef, IFiltersByParents>>>;
     byOrder: z.ZodOptional<z.ZodNullable<z.ZodType<IFiltersByByOrder, z.ZodTypeDef, IFiltersByByOrder>>>;
     childrenByProductionTaskIds: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodNumber, "many">>>;
-    sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof ProductionPlanSortField>>>;
-    sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    sort: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
+        sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof import("../../utils").ProductionPlanSortField>>>;
+        sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    }, "strip", z.ZodTypeAny, {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }, {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }>, "many">>>;
 }, "strip", z.ZodTypeAny, {
-    sortDesc: boolean;
+    sort: {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }[];
     typeOperationIds: number[] | null;
     employeIds: number[] | null;
     assembleIds: number[] | null;
     isOnlyDetalId: boolean | null;
     page?: number | null | undefined;
     searchString?: string | undefined;
-    sortField?: ProductionPlanSortField | null | undefined;
     range?: {
         start?: any;
         end?: any;
@@ -40,10 +49,12 @@ export declare const GetDeficitsDetalByProductionTaskDtoZod: z.ZodObject<{
     byOrder?: IFiltersByByOrder | null | undefined;
     childrenByProductionTaskIds?: number[] | null | undefined;
 }, {
+    sort?: {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }[] | undefined;
     page?: number | null | undefined;
     searchString?: string | undefined;
-    sortField?: ProductionPlanSortField | null | undefined;
-    sortDesc?: boolean | undefined;
     range?: {
         start?: any;
         end?: any;

package/dist/production-tasks/dto/get-deficits-detal-by-production-task.dto.js

@@ -20,6 +20,5 @@ exports.GetDeficitsDetalByProductionTaskDtoZod = zod_1.z.object({
     byParents: zod_1.z.custom().nullable().optional(),
     byOrder: zod_1.z.custom().nullable().optional(),
     childrenByProductionTaskIds: zod_1.z.array(zod_1.z.number()).nullable().optional(),
-    sortField: zod_1.z.nativeEnum(utils_1.ProductionPlanSortField).nullable().optional(),
-    sortDesc: zod_1.z.boolean().optional().default(false)
+    sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
 });

package/dist/production-tasks/dto/online-board-working.dto.d.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { ProductionPlanSortField, StockOrderType } from '../../utils';
+import { StockOrderType } from '../../utils';
 import { IFiltersByByOrder, IFiltersByParents, IFiltersByUserProductionTask } from '../interfaces/online-board';
 export declare const OnlineBoardWorkingDtoZod: z.ZodObject<{
     page: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
@@ -23,16 +23,26 @@ export declare const OnlineBoardWorkingDtoZod: z.ZodObject<{
     childrenByProductionTaskIds: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodNumber, "many">>>;
     isComplect: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     productionIds: z.ZodDefault<z.ZodOptional<z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>>>>;
-    sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof ProductionPlanSortField>>>;
-    sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    sort: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
+        sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof import("../../utils").ProductionPlanSortField>>>;
+        sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    }, "strip", z.ZodTypeAny, {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }, {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }>, "many">>>;
 }, "strip", z.ZodTypeAny, {
-    sortDesc: boolean;
+    sort: {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }[];
     workingType: StockOrderType;
     employeIds: number[] | null;
     isComplect: boolean;
     productionIds: number[] | null;
     page?: number | null | undefined;
-    sortField?: ProductionPlanSortField | null | undefined;
     range?: {
         start?: any;
         end?: any;
@@ -45,9 +55,11 @@ export declare const OnlineBoardWorkingDtoZod: z.ZodObject<{
     childrenByProductionTaskIds?: number[] | null | undefined;
 }, {
     workingType: StockOrderType;
+    sort?: {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }[] | undefined;
     page?: number | null | undefined;
-    sortField?: ProductionPlanSortField | null | undefined;
-    sortDesc?: boolean | undefined;
     range?: {
         start?: any;
         end?: any;

package/dist/production-tasks/dto/online-board-working.dto.js

@@ -25,6 +25,5 @@ exports.OnlineBoardWorkingDtoZod = zod_1.z.object({
     childrenByProductionTaskIds: zod_1.z.array(zod_1.z.number()).nullable().optional(),
     isComplect: zod_1.z.boolean().optional().default(false),
     productionIds: zod_1.z.array(zod_1.z.number()).optional().nullish().default([]),
-    sortField: zod_1.z.nativeEnum(utils_1.ProductionPlanSortField).nullable().optional(),
-    sortDesc: zod_1.z.boolean().optional().default(false)
+    sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
 });

package/dist/shipments/dto/shipments-paginate.dto.d.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { ProductionPlanSortField, statusShipment } from '../../utils';
+import { statusShipment } from '../../utils';
 export declare const ShipmentsPaginateSchema: z.ZodObject<{
     offset: z.ZodNumber;
     parentId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
@@ -17,19 +17,29 @@ export declare const ShipmentsPaginateSchema: z.ZodObject<{
     companyId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
     searchStr: z.ZodOptional<z.ZodString>;
     attributes: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-    sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof ProductionPlanSortField>>>;
-    sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    sort: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
+        sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof import("../../utils").ProductionPlanSortField>>>;
+        sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    }, "strip", z.ZodTypeAny, {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }, {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }>, "many">>>;
 }, "strip", z.ZodTypeAny, {
+    sort: {
+        sortDesc: boolean;
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+    }[];
     status: statusShipment[];
     dateRange: {
         start: string;
         end: string;
     } | null;
-    sortDesc: boolean;
     offset: number;
     attributes?: string[] | undefined;
     parentId?: number | null | undefined;
-    sortField?: ProductionPlanSortField | null | undefined;
     searchStr?: string | undefined;
     companyId?: number | null | undefined;
 }, {
@@ -39,10 +49,12 @@ export declare const ShipmentsPaginateSchema: z.ZodObject<{
         end: string;
     } | null;
     offset: number;
+    sort?: {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }[] | undefined;
     attributes?: string[] | undefined;
     parentId?: number | null | undefined;
-    sortField?: ProductionPlanSortField | null | undefined;
-    sortDesc?: boolean | undefined;
     searchStr?: string | undefined;
     companyId?: number | null | undefined;
 }>;

package/dist/shipments/dto/shipments-paginate.dto.js

@@ -17,6 +17,5 @@ exports.ShipmentsPaginateSchema = zod_1.z.object({
     companyId: zod_1.z.number().int().nullish(),
     searchStr: zod_1.z.string().optional(),
     attributes: zod_1.z.array(zod_1.z.string()).optional(),
-    sortField: zod_1.z.nativeEnum(utils_1.ProductionPlanSortField).nullable().optional(),
-    sortDesc: zod_1.z.boolean().optional().default(false)
+    sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
 });

package/dist/utils/enums.d.ts

@@ -331,3 +331,10 @@ export declare enum EnumStatusOrder {
     archive = "archive",
     overdue = "overdue"
 }
+/**
+ * Enum используется для определения типа исключения
+ */
+export declare enum EnumExclusionType {
+    disignation = "designation",
+    article = "article"
+}

package/dist/utils/enums.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EnumStatusOrder = exports.EnumRequisitesUserType = exports.EnumRequisitesType = exports.FileCategory = exports.SpetificationEntityKeys = exports.MetalloworkingStatus = exports.InstansMaterial = exports.InstansTypeInstrument = exports.ParentTypeEnum = exports.IMG_TYPES = exports.UnitsEnum = exports.FileType = exports.WorkSpaceObject = exports.enumDeficit = exports.statusWorkingsDeficit = exports.MovementObjectBase = exports.ActionType = exports.ModuleIncludeForAvatarEnum = exports.ModuleIncludeForDocumentEnum = exports.ModuleInclude = exports.MovementObjectType = exports.WaybilTypeComingEnums = exports.WorkingItemType = exports.AssembleStatus = exports.ProductionOperationType = exports.SortReadinesEnum = exports.AssembleIzdEnum = exports.StockOrderType = exports.RevisionEntityTypes = exports.Neo4jEntityTypes = exports.EntityTypes = exports.EnumEntityDeliveryItem = exports.EnumStatusDelivery = exports.statusShipment = exports.StatusScladWorking = exports.IzdType = exports.bullJobStatusEnum = exports.TypeSubTypeEntities = exports.StatusIssue = exports.EnumFilePrefix = exports.QueueStatusEnum = exports.StatusAssembleKit = void 0;
+exports.EnumExclusionType = exports.EnumStatusOrder = exports.EnumRequisitesUserType = exports.EnumRequisitesType = exports.FileCategory = exports.SpetificationEntityKeys = exports.MetalloworkingStatus = exports.InstansMaterial = exports.InstansTypeInstrument = exports.ParentTypeEnum = exports.IMG_TYPES = exports.UnitsEnum = exports.FileType = exports.WorkSpaceObject = exports.enumDeficit = exports.statusWorkingsDeficit = exports.MovementObjectBase = exports.ActionType = exports.ModuleIncludeForAvatarEnum = exports.ModuleIncludeForDocumentEnum = exports.ModuleInclude = exports.MovementObjectType = exports.WaybilTypeComingEnums = exports.WorkingItemType = exports.AssembleStatus = exports.ProductionOperationType = exports.SortReadinesEnum = exports.AssembleIzdEnum = exports.StockOrderType = exports.RevisionEntityTypes = exports.Neo4jEntityTypes = exports.EntityTypes = exports.EnumEntityDeliveryItem = exports.EnumStatusDelivery = exports.statusShipment = exports.StatusScladWorking = exports.IzdType = exports.bullJobStatusEnum = exports.TypeSubTypeEntities = exports.StatusIssue = exports.EnumFilePrefix = exports.QueueStatusEnum = exports.StatusAssembleKit = void 0;
 var StatusAssembleKit;
 (function (StatusAssembleKit) {
     StatusAssembleKit["collected"] = "\u0421\u043E\u0431\u0440\u0430\u043D\u043E";
@@ -395,3 +395,11 @@ var EnumStatusOrder;
     // Просрочено
     EnumStatusOrder["overdue"] = "overdue";
 })(EnumStatusOrder || (exports.EnumStatusOrder = EnumStatusOrder = {}));
+/**
+ * Enum используется для определения типа исключения
+ */
+var EnumExclusionType;
+(function (EnumExclusionType) {
+    EnumExclusionType["disignation"] = "designation";
+    EnumExclusionType["article"] = "article";
+})(EnumExclusionType || (exports.EnumExclusionType = EnumExclusionType = {}));

package/dist/utils/methods.d.ts

@@ -22,10 +22,6 @@ export declare function moreMinusNum(num: number): number;
  */
 export declare function getFieldsSpetification(list: EntityCommonSpecification[], subKey: keyof EntityCommonSpecification): (string | number | boolean | undefined)[] | null;
 export declare const calculateByMeasurementRate: (units_measurement: IUnitsMeasurement[], ezId: number) => number;
-/**
- * Функция проверяет, является ли введенное обозначение исключением
- */
-export declare function isThisExclusionDesignation(designation: string, isProduct?: boolean): boolean;
 /**
  *
  * @param marks

package/dist/utils/methods.js

@@ -23,7 +23,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.intersect = exports.shipmentsNullOne = exports.differencesShipments = exports.dateDifference = exports.toFormatString = exports.comparison = exports.comparisonTimestamp = exports.parseDate = exports.dataFormat = exports.dateToTimestampFormat = exports.convertStringValuesToNumbers = exports.dateToFormat = exports.photoPreloadUrl = exports.isImage = exports.getReversDate = exports.isValidNumber = exports.returnTypePosition = exports.checkMissingEntity = exports.countChildrensRelative = exports.concatedLists = exports.countUniqueValueChildren = exports.removeArrDublicateByAttr = exports.getOnCommonListChildrens = exports.sleep = exports.parseBoolean = exports.strIsBoolean = exports.useWorkpieceCharacterizationItems = exports.getFileType = exports.calculateStartDate = exports.calculateEndDate = exports.WORK_DAY_END_MINUTE = exports.WORK_DAY_END_HOUR = exports.WORK_DAY_START_HOUR = exports.leftToDoByProductionTask = exports.calculateByMeasurementRate = void 0;
 exports.moreMinusNum = moreMinusNum;
 exports.getFieldsSpetification = getFieldsSpetification;
-exports.isThisExclusionDesignation = isThisExclusionDesignation;
 exports.organiseListCbedDetal = organiseListCbedDetal;
 exports.getFieldBySpetificationList = getFieldBySpetificationList;
 exports.lessPlusNum = lessPlusNum;
@@ -80,24 +79,6 @@ const calculateByMeasurementRate = (units_measurement, ezId) => {
     return convertRate;
 };
 exports.calculateByMeasurementRate = calculateByMeasurementRate;
-/**
- * Функция проверяет, является ли введенное обозначение исключением
- */
-function isThisExclusionDesignation(designation, isProduct = false) {
-    let exclusions = ['-', '', '?', '- архив'];
-    const productExclusions = [
-        'покупной',
-        '',
-        'ремонт',
-        'документ',
-        'оснастка',
-        'опция'
-    ];
-    if (isProduct)
-        exclusions = exclusions.concat(productExclusions);
-    const lowerDesignation = `${designation}`.toLowerCase();
-    return exclusions.includes(lowerDesignation);
-}
 /**
  *
  * @param marks
@@ -784,7 +765,7 @@ const countChildrensRelative = (data) => {
                     const foundedCbed = cbeds.find(cbed => listCbedItem.id === cbed.id);
                     return Object.assign(Object.assign(Object.assign({}, foundedCbed), (0, sequelize_1.addFieldByCondition)(data.isNeedsTypes, {
                         entity_type: enums_1.IzdType.cbed
-                    })), { count_to_obj: listCbedItem.quantity, count_to_needs: relativeNeeds * listCbedItem.quantity, needs: relativeNeeds * listCbedItem.quantity, parent_id: relative.id, parent_type: relativeType, parent_designation: (relative === null || relative === void 0 ? void 0 : relative.designation) || '-', parent_name: (relative === null || relative === void 0 ? void 0 : relative.name) || '-' });
+                    })), { count_to_obj: listCbedItem.quantity, count_to_needs: relativeNeeds * listCbedItem.quantity, needs: relativeNeeds * listCbedItem.quantity, parent_id: relative.id, parent_type: relativeType, parent_ava: relative === null || relative === void 0 ? void 0 : relative.ava_path, parent_designation: (relative === null || relative === void 0 ? void 0 : relative.designation) || '-', parent_name: (relative === null || relative === void 0 ? void 0 : relative.name) || '-' });
                 })) || [];
             relative.cbedGraph = [...relative.cbeds];
         }
@@ -794,7 +775,7 @@ const countChildrensRelative = (data) => {
                     const foundedDetal = detals.find(detal => listDetalItem.id === detal.id);
                     return Object.assign(Object.assign(Object.assign({}, foundedDetal), (0, sequelize_1.addFieldByCondition)(data.isNeedsTypes, {
                         entity_type: enums_1.IzdType.detal
-                    })), { count_to_obj: listDetalItem.quantity, count_to_needs: relativeNeeds * listDetalItem.quantity, needs: relativeNeeds * listDetalItem.quantity, parent_id: relative.id, parent_type: relativeType, parent_designation: (relative === null || relative === void 0 ? void 0 : relative.designation) || '-', parent_name: (relative === null || relative === void 0 ? void 0 : relative.name) || '-' });
+                    })), { count_to_obj: listDetalItem.quantity, count_to_needs: relativeNeeds * listDetalItem.quantity, needs: relativeNeeds * listDetalItem.quantity, parent_id: relative.id, parent_type: relativeType, parent_ava: relative === null || relative === void 0 ? void 0 : relative.ava_path, parent_designation: (relative === null || relative === void 0 ? void 0 : relative.designation) || '-', parent_name: (relative === null || relative === void 0 ? void 0 : relative.name) || '-' });
                 })) || [];
             relative.detalsGraph = [...relative.detals];
         }
@@ -837,7 +818,7 @@ const countChildrensRelative = (data) => {
                         : 0;
                 return Object.assign(Object.assign(Object.assign({}, foundedMaterials), (0, sequelize_1.addFieldByCondition)(data.isNeedsTypes, {
                     entity_type: enums_1.IzdType.material
-                })), { measure_id: listMaterialItem.measureId, count_to_obj_not_converted: listMaterialItem.quantity, count_to_needs_not_converted: relativeNeeds * listMaterialItem.quantity, count_to_obj: specificationConvertedQuantity, count_to_needs: relativeNeeds * specificationConvertedQuantity, needs: relativeNeeds * specificationConvertedQuantity, parent_id: relative.id, parent_type: relativeType, parent_designation: (relative === null || relative === void 0 ? void 0 : relative.designation) || '-', parent_name: (relative === null || relative === void 0 ? void 0 : relative.name) || '-' });
+                })), { measure_id: listMaterialItem.measureId, count_to_obj_not_converted: listMaterialItem.quantity, count_to_needs_not_converted: relativeNeeds * listMaterialItem.quantity, count_to_obj: specificationConvertedQuantity, count_to_needs: relativeNeeds * specificationConvertedQuantity, needs: relativeNeeds * specificationConvertedQuantity, parent_id: relative.id, parent_type: relativeType, parent_ava: relative === null || relative === void 0 ? void 0 : relative.ava_path, parent_designation: (relative === null || relative === void 0 ? void 0 : relative.designation) || '-', parent_name: (relative === null || relative === void 0 ? void 0 : relative.name) || '-' });
             });
             materialsArray.forEach((currentMaterial) => {
                 const materialKey = `${currentMaterial.parent_id}_${currentMaterial.parent_type}_${currentMaterial.id}`;

package/dist/utils/sorting.d.ts

@@ -1,3 +1,4 @@
+import { z } from 'zod';
 type SortValue = Date | number | string | boolean | null | undefined;
 type SortSelector<T> = (item: T) => SortValue;
 export declare enum ProductionPlanSortField {
@@ -6,5 +7,19 @@ export declare enum ProductionPlanSortField {
     warehouseReadinessDate = "warehouseReadinessDate",
     orderedByProduction = "orderedByProduction"
 }
-export declare const sortByDirection: <T>(items: T[], selector: SortSelector<T>, desc?: boolean) => T[];
+export type ProductionPlanSortRule = {
+    sortField?: ProductionPlanSortField | null;
+    sortDesc?: boolean;
+};
+export declare const ProductionPlanSortRuleSchema: z.ZodObject<{
+    sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof ProductionPlanSortField>>>;
+    sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+}, "strip", z.ZodTypeAny, {
+    sortDesc: boolean;
+    sortField?: ProductionPlanSortField | null | undefined;
+}, {
+    sortField?: ProductionPlanSortField | null | undefined;
+    sortDesc?: boolean | undefined;
+}>;
+export declare const sortByRules: <T>(items: T[], rules: ProductionPlanSortRule[] | null | undefined, selectors: Partial<Record<ProductionPlanSortField, SortSelector<T>>>) => T[];
 export {};

package/dist/utils/sorting.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortByDirection = exports.ProductionPlanSortField = void 0;
+exports.sortByRules = exports.ProductionPlanSortRuleSchema = exports.ProductionPlanSortField = void 0;
+const zod_1 = require("zod");
 var ProductionPlanSortField;
 (function (ProductionPlanSortField) {
     ProductionPlanSortField["calculateNeedsTime"] = "calculateNeedsTime";
@@ -8,6 +9,10 @@ var ProductionPlanSortField;
     ProductionPlanSortField["warehouseReadinessDate"] = "warehouseReadinessDate";
     ProductionPlanSortField["orderedByProduction"] = "orderedByProduction";
 })(ProductionPlanSortField || (exports.ProductionPlanSortField = ProductionPlanSortField = {}));
+exports.ProductionPlanSortRuleSchema = zod_1.z.object({
+    sortField: zod_1.z.nativeEnum(ProductionPlanSortField).nullable().optional(),
+    sortDesc: zod_1.z.boolean().optional().default(false)
+});
 const normalizeSortValue = (value) => {
     if (value instanceof Date)
         return value.getTime();
@@ -17,24 +22,35 @@ const normalizeSortValue = (value) => {
     }
     return value;
 };
-const sortByDirection = (items, selector, desc = false) => {
+const compareValues = (firstValue, secondValue, desc = false) => {
+    const isFirstNull = firstValue === null || firstValue === undefined;
+    const isSecondNull = secondValue === null || secondValue === undefined;
+    if (isFirstNull || isSecondNull) {
+        if (isFirstNull && isSecondNull)
+            return 0;
+        return isFirstNull ? (desc ? -1 : 1) : desc ? 1 : -1;
+    }
+    const normalizedFirstValue = normalizeSortValue(firstValue);
+    const normalizedSecondValue = normalizeSortValue(secondValue);
+    if (normalizedFirstValue < normalizedSecondValue)
+        return desc ? 1 : -1;
+    if (normalizedFirstValue > normalizedSecondValue)
+        return desc ? -1 : 1;
+    return 0;
+};
+const sortByRules = (items, rules, selectors) => {
+    const activeRules = (rules !== null && rules !== void 0 ? rules : []).filter(rule => rule.sortField && selectors[rule.sortField]);
+    if (!activeRules.length)
+        return items;
     return [...items].sort((firstItem, secondItem) => {
-        const firstValue = selector(firstItem);
-        const secondValue = selector(secondItem);
-        const isFirstNull = firstValue === null || firstValue === undefined;
-        const isSecondNull = secondValue === null || secondValue === undefined;
-        if (isFirstNull || isSecondNull) {
-            if (isFirstNull && isSecondNull)
-                return 0;
-            return isFirstNull ? (desc ? -1 : 1) : desc ? 1 : -1;
+        var _a;
+        for (const rule of activeRules) {
+            const selector = selectors[rule.sortField];
+            const result = compareValues(selector(firstItem), selector(secondItem), (_a = rule.sortDesc) !== null && _a !== void 0 ? _a : false);
+            if (result !== 0)
+                return result;
         }
-        const normalizedFirstValue = normalizeSortValue(firstValue);
-        const normalizedSecondValue = normalizeSortValue(secondValue);
-        if (normalizedFirstValue < normalizedSecondValue)
-            return desc ? 1 : -1;
-        if (normalizedFirstValue > normalizedSecondValue)
-            return desc ? -1 : 1;
         return 0;
     });
 };
-exports.sortByDirection = sortByDirection;
+exports.sortByRules = sortByRules;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pksep/zod-shared",
-  "version": "0.0.533",
+  "version": "0.0.534",
   "description": "Zod package for erp project. Contains dto, interfaces, schems, types, enum",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",