@pksep/zod-shared 0.0.533 → 0.0.535

package/dist/material/schemas/material-shipments-response.schema.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MaterialShipmentsResponseSchema = exports.MaterialShipmentsDeliverySchema = exports.MaterialShipmentDeliveryStatsSchema = void 0;
+const zod_1 = require("zod");
+const material_schema_1 = require("./material.schema");
+const deliveries_1 = require("../../deliveries");
+exports.MaterialShipmentDeliveryStatsSchema = zod_1.z.object({
+    totalQty: zod_1.z.number().int().nonnegative(),
+    remainingQty: zod_1.z.number().int().nonnegative()
+});
+exports.MaterialShipmentsDeliverySchema = deliveries_1.DeliveriesSchema.extend({
+    totalQty: zod_1.z.number().int().nonnegative(),
+    remainingQty: zod_1.z.number().int().nonnegative(),
+    company: zod_1.z.custom().optional()
+});
+exports.MaterialShipmentsResponseSchema = material_schema_1.MaterialSchema.extend({
+    documents: zod_1.z.array(zod_1.z.custom()).optional(),
+    actual_shipment: zod_1.z.custom().optional(),
+    shipments: zod_1.z.array(zod_1.z.custom()).optional(),
+    deliveries: zod_1.z.array(exports.MaterialShipmentsDeliverySchema).optional()
+});

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/product/schemas/product-deficit.schema.d.ts

@@ -145,6 +145,7 @@ export declare const ProductDeficitSchema: z.ZodObject<{
         parent_id?: number | null | undefined;
     }>;
     myQuantity: z.ZodNumber;
+    isOrderedByStockOrder: z.ZodBoolean;
 }, "strip", z.ZodTypeAny, {
     ban: boolean;
     shipment: {
@@ -202,6 +203,7 @@ export declare const ProductDeficitSchema: z.ZodObject<{
     articl: string | null;
     is_custom: boolean;
     myQuantity: number;
+    isOrderedByStockOrder: boolean;
     id?: number | null | undefined;
     discontinued?: boolean | undefined;
     production_time_assemble?: import("../..").ProductionTimeType | null | undefined;
@@ -250,6 +252,7 @@ export declare const ProductDeficitSchema: z.ZodObject<{
     responsibleId: number | null;
     articl: string | null;
     myQuantity: number;
+    isOrderedByStockOrder: boolean;
     ban?: boolean | undefined;
     id?: number | null | undefined;
     calculate_needs_time?: Date | null | undefined;

package/dist/product/schemas/product-deficit.schema.js

@@ -6,5 +6,6 @@ const shipments_1 = require("../../shipments");
 const product_schema_1 = require("./product.schema");
 exports.ProductDeficitSchema = product_schema_1.ProductSchema.extend({
     shipment: shipments_1.ShipmentsSchema,
-    myQuantity: zod_1.z.number().int()
+    myQuantity: zod_1.z.number().int(),
+    isOrderedByStockOrder: zod_1.z.boolean()
 });

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/get-production-task-by-equipment.dto.d.ts

@@ -15,7 +15,7 @@ export declare const GetProductionTaskByEquipmentDtoZod: z.ZodObject<{
         end?: any;
     }>>>;
     onlyTOperation: z.ZodOptional<z.ZodNumber>;
-    workStartCalcTypeFilter: z.ZodOptional<z.ZodNativeEnum<typeof WorkStartCalcTypeFilter>>;
+    workStartCalcTypeFilter: z.ZodOptional<z.ZodArray<z.ZodNativeEnum<typeof WorkStartCalcTypeFilter>, "many">>;
 }, "strip", z.ZodTypeAny, {
     equipmentId: number;
     searchString?: string | undefined;
@@ -25,7 +25,7 @@ export declare const GetProductionTaskByEquipmentDtoZod: z.ZodObject<{
     } | null | undefined;
     taskId?: number | null | undefined;
     onlyTOperation?: number | undefined;
-    workStartCalcTypeFilter?: WorkStartCalcTypeFilter | undefined;
+    workStartCalcTypeFilter?: WorkStartCalcTypeFilter[] | undefined;
 }, {
     equipmentId: number;
     searchString?: string | undefined;
@@ -35,6 +35,6 @@ export declare const GetProductionTaskByEquipmentDtoZod: z.ZodObject<{
     } | null | undefined;
     taskId?: number | null | undefined;
     onlyTOperation?: number | undefined;
-    workStartCalcTypeFilter?: WorkStartCalcTypeFilter | undefined;
+    workStartCalcTypeFilter?: WorkStartCalcTypeFilter[] | undefined;
 }>;
 export type GetProductionTaskByEquipmentDtoZodType = z.infer<typeof GetProductionTaskByEquipmentDtoZod>;

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

@@ -15,5 +15,7 @@ exports.GetProductionTaskByEquipmentDtoZod = zod_1.z.object({
         .nullable()
         .optional(),
     onlyTOperation: zod_1.z.number().int().optional(),
-    workStartCalcTypeFilter: zod_1.z.nativeEnum(enums_1.WorkStartCalcTypeFilter).optional()
+    workStartCalcTypeFilter: zod_1.z
+        .array(zod_1.z.nativeEnum(enums_1.WorkStartCalcTypeFilter))
+        .optional()
 });

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

@@ -6,7 +6,7 @@ export declare const GetProductionTaskByUserDtoZod: z.ZodObject<{
     page: z.ZodDefault<z.ZodNumber>;
     taskId: z.ZodOptional<z.ZodDefault<z.ZodNullable<z.ZodNumber>>>;
     onlyTOperation: z.ZodOptional<z.ZodNumber>;
-    workStartCalcTypeFilter: z.ZodOptional<z.ZodNativeEnum<typeof WorkStartCalcTypeFilter>>;
+    workStartCalcTypeFilter: z.ZodOptional<z.ZodArray<z.ZodNativeEnum<typeof WorkStartCalcTypeFilter>, "many">>;
     range: z.ZodOptional<z.ZodNullable<z.ZodObject<{
         start: z.ZodAny;
         end: z.ZodAny;
@@ -27,7 +27,7 @@ export declare const GetProductionTaskByUserDtoZod: z.ZodObject<{
     } | null | undefined;
     taskId?: number | null | undefined;
     onlyTOperation?: number | undefined;
-    workStartCalcTypeFilter?: WorkStartCalcTypeFilter | undefined;
+    workStartCalcTypeFilter?: WorkStartCalcTypeFilter[] | undefined;
 }, {
     userId: number;
     page?: number | undefined;
@@ -38,6 +38,6 @@ export declare const GetProductionTaskByUserDtoZod: z.ZodObject<{
     } | null | undefined;
     taskId?: number | null | undefined;
     onlyTOperation?: number | undefined;
-    workStartCalcTypeFilter?: WorkStartCalcTypeFilter | undefined;
+    workStartCalcTypeFilter?: WorkStartCalcTypeFilter[] | undefined;
 }>;
 export type GetProductionTaskByUserDtoZodType = z.infer<typeof GetProductionTaskByUserDtoZod>;

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

@@ -9,7 +9,9 @@ exports.GetProductionTaskByUserDtoZod = zod_1.z.object({
     page: zod_1.z.number().int().min(0).default(0),
     taskId: zod_1.z.number().int().nullable().default(null).optional(),
     onlyTOperation: zod_1.z.number().int().optional(),
-    workStartCalcTypeFilter: zod_1.z.nativeEnum(enums_1.WorkStartCalcTypeFilter).optional(),
+    workStartCalcTypeFilter: zod_1.z
+        .array(zod_1.z.nativeEnum(enums_1.WorkStartCalcTypeFilter))
+        .optional(),
     range: zod_1.z
         .object({
         start: zod_1.z.any(),

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/production-tasks/interfaces/production-tasks.d.ts

@@ -168,6 +168,7 @@ export interface IGetDeficitsDetalByProductionTask {
         preTime: number;
     };
     isHasMaterial: boolean;
+    isOrderedByStockOrder: boolean;
     productionOperation: ModelProductionOperationPos;
     calculateNeedsTime: Date | null;
     productionTaskDueDate: Date;

package/dist/role/default-value/index.js

@@ -411,6 +411,12 @@ exports.accessRoleDefaultValue = {
                 changeYour: true,
                 changeEverything: true,
                 title: 'Действия'
+            },
+            notifications: {
+                read: true,
+                changeYour: false,
+                changeEverything: true,
+                title: 'Настройки уведомлений'
             }
         }
     },

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/stock-order/schemas/stock-order.schema.d.ts

@@ -1,12 +1,13 @@
 import { z } from 'zod';
 import { ModelStockOrderItem } from './stock-order-item.schema';
-import { StockOrderType } from '../../utils';
+import { EnumStatusOrder, StockOrderType } from '../../utils';
 declare const StockOrderSchema: z.ZodObject<{
     id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
     number_order: z.ZodString;
     date_order: z.ZodDate;
     type: z.ZodNativeEnum<typeof StockOrderType>;
     ban: z.ZodDefault<z.ZodBoolean>;
+    status: z.ZodOptional<z.ZodNativeEnum<typeof EnumStatusOrder>>;
     description: z.ZodOptional<z.ZodString>;
     createdAt: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
@@ -14,6 +15,7 @@ declare const StockOrderSchema: z.ZodObject<{
     ban: boolean;
     number_order: string;
     date_order: Date;
+    status?: EnumStatusOrder | undefined;
     description?: string | undefined;
     id?: number | null | undefined;
     createdAt?: string | undefined;
@@ -21,6 +23,7 @@ declare const StockOrderSchema: z.ZodObject<{
     type: StockOrderType;
     number_order: string;
     date_order: Date;
+    status?: EnumStatusOrder | undefined;
     ban?: boolean | undefined;
     description?: string | undefined;
     id?: number | null | undefined;

package/dist/stock-order/schemas/stock-order.schema.js

@@ -8,6 +8,7 @@ const StockOrderSchema = zod_1.z.object({
     date_order: zod_1.z.coerce.date(),
     type: zod_1.z.nativeEnum(utils_1.StockOrderType),
     ban: zod_1.z.boolean().default(false),
+    status: zod_1.z.nativeEnum(utils_1.EnumStatusOrder).optional(),
     description: zod_1.z.string().optional(),
     createdAt: zod_1.z.string().optional()
 });

package/dist/utils/enums.d.ts

@@ -56,6 +56,7 @@ export declare enum statusShipment {
 export declare enum EnumStatusDelivery {
     order = "\u0417\u0430\u043A\u0430\u0437\u0430\u043D\u043E",
     delivery = "\u0414\u043E\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u043E",
+    ban = "\u0423\u0434\u0430\u043B\u0435\u043D\u043E",
     done = "\u041E\u0442\u0433\u0440\u0443\u0436\u0435\u043D\u043E"
 }
 /**
@@ -331,3 +332,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";
@@ -69,6 +69,7 @@ var EnumStatusDelivery;
 (function (EnumStatusDelivery) {
     EnumStatusDelivery["order"] = "\u0417\u0430\u043A\u0430\u0437\u0430\u043D\u043E";
     EnumStatusDelivery["delivery"] = "\u0414\u043E\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u043E";
+    EnumStatusDelivery["ban"] = "\u0423\u0434\u0430\u043B\u0435\u043D\u043E";
     EnumStatusDelivery["done"] = "\u041E\u0442\u0433\u0440\u0443\u0436\u0435\u043D\u043E";
 })(EnumStatusDelivery || (exports.EnumStatusDelivery = EnumStatusDelivery = {}));
 /**
@@ -395,3 +396,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}`;