@pksep/zod-shared 0.0.537 → 0.0.539

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

@@ -8,6 +8,7 @@ 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>>>;
+    isDiscontinued: z.ZodDefault<z.ZodOptional<z.ZodNullable<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>>;
@@ -26,6 +27,7 @@ export declare const GetAssembleScladPaginationDtoZod: z.ZodObject<{
     }[];
     page: number;
     searchString: string;
+    isDiscontinued: boolean | null;
     responsibleUserId?: number | null | undefined;
     byParents?: IFiltersByParents | null | undefined;
     byOrder?: IFiltersByByOrder | null | undefined;
@@ -38,6 +40,7 @@ export declare const GetAssembleScladPaginationDtoZod: z.ZodObject<{
         sortDesc?: boolean | undefined;
     }[] | undefined;
     responsibleUserId?: number | null | undefined;
+    isDiscontinued?: boolean | null | undefined;
     byParents?: IFiltersByParents | null | undefined;
     byOrder?: IFiltersByByOrder | null | undefined;
 }>;

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

@@ -10,5 +10,6 @@ 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(),
+    isDiscontinued: zod_1.z.boolean().nullable().optional().default(false),
     sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
 });

package/dist/assemble/interfaces/interfaces.d.ts

@@ -57,6 +57,7 @@ export interface IChangeInKitQuantity {
 export interface IChangeCreateMarksComplect {
     kitsSelected: IKitSelected[];
     marks: any[];
+    userId?: number;
     relativeActionId?: number;
     isWaybill: boolean;
     transaction?: any;
@@ -83,6 +84,7 @@ export interface ICreateMovementObject {
     waybill_id?: number;
     revision_id?: number;
     sh_complit_id?: number;
+    user_id?: number;
     detal_id?: number;
     cbed_id?: number;
     product_id?: number;
@@ -94,6 +96,7 @@ type KitsSelected = {
 export interface IChangeShipmentsAssemblyKits {
     kitsSelected: KitsSelected[];
     userId?: number;
+    relativeActionId?: number;
     transaction: any;
 }
 export interface IGetKitsByParents {

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

@@ -6,6 +6,7 @@ export declare const GetDeficitDtoZod: z.ZodObject<{
     statusWorking: z.ZodNativeEnum<typeof statusWorkingsDeficit>;
     searchString: z.ZodString;
     shipmentIds: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodNumber, "many">>>;
+    isDiscontinued: z.ZodDefault<z.ZodOptional<z.ZodNullable<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>>;
@@ -22,6 +23,7 @@ export declare const GetDeficitDtoZod: z.ZodObject<{
         sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
     }[];
     searchString: string;
+    isDiscontinued: boolean | null;
     statusWorking: statusWorkingsDeficit;
     cbedIds: number[];
     page?: number | null | undefined;
@@ -35,6 +37,7 @@ export declare const GetDeficitDtoZod: z.ZodObject<{
         sortDesc?: boolean | undefined;
     }[] | undefined;
     page?: number | null | undefined;
+    isDiscontinued?: boolean | null | undefined;
     shipmentIds?: number[] | null | undefined;
 }>;
 export type GetDeficitDtoZodType = z.infer<typeof GetDeficitDtoZod>;

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

@@ -9,5 +9,6 @@ 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(),
+    isDiscontinued: zod_1.z.boolean().nullable().optional().default(false),
     sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
 });

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

@@ -6,6 +6,7 @@ export declare const GetDetalDeficitDtoZod: z.ZodObject<{
     searchString: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     shipmentIds: z.ZodDefault<z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>>>;
     page: z.ZodNumber;
+    isDiscontinued: 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>>;
@@ -23,6 +24,7 @@ export declare const GetDetalDeficitDtoZod: z.ZodObject<{
     }[];
     page: number;
     searchString: string;
+    isDiscontinued: boolean;
     detalIds: number[];
     statusWorking: statusWorkingsDeficit;
     shipmentIds: number[] | null;
@@ -33,6 +35,7 @@ export declare const GetDetalDeficitDtoZod: z.ZodObject<{
         sortDesc?: boolean | undefined;
     }[] | undefined;
     searchString?: string | undefined;
+    isDiscontinued?: boolean | undefined;
     detalIds?: number[] | undefined;
     statusWorking?: statusWorkingsDeficit | undefined;
     shipmentIds?: number[] | null | undefined;

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

@@ -12,5 +12,6 @@ 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(),
+    isDiscontinued: 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

@@ -8,6 +8,7 @@ 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">>>;
+    isDiscontinued: z.ZodDefault<z.ZodOptional<z.ZodNullable<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>>;
@@ -26,6 +27,7 @@ export declare const GetMetaloworkingPaginationDtoZod: z.ZodObject<{
     page: number;
     searchString: string;
     isBan: boolean;
+    isDiscontinued: boolean | null;
     responsibleUserId?: number | null | undefined;
     byParents?: IFiltersByParents | null | undefined;
     byOrder?: IFiltersByByOrder | null | undefined;
@@ -39,6 +41,7 @@ export declare const GetMetaloworkingPaginationDtoZod: z.ZodObject<{
         sortDesc?: boolean | undefined;
     }[] | undefined;
     responsibleUserId?: number | null | undefined;
+    isDiscontinued?: boolean | null | undefined;
     byParents?: IFiltersByParents | null | undefined;
     byOrder?: IFiltersByByOrder | null | undefined;
     childrenByProductionTaskIds?: number[] | null | undefined;

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

@@ -11,5 +11,6 @@ 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(),
+    isDiscontinued: zod_1.z.boolean().nullable().optional().default(false),
     sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
 });

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

@@ -6,6 +6,7 @@ export declare const GetDeficitProductSchema: z.ZodObject<{
     searchString: z.ZodString;
     shipmentIds: z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>>;
     page: z.ZodOptional<z.ZodNumber>;
+    isDiscontinued: z.ZodDefault<z.ZodOptional<z.ZodNullable<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>>;
@@ -22,6 +23,7 @@ export declare const GetDeficitProductSchema: z.ZodObject<{
         sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
     }[];
     searchString: string;
+    isDiscontinued: boolean | null;
     statusWorking: statusWorkingsDeficit;
     productIds: number[];
     page?: number | undefined;
@@ -35,6 +37,7 @@ export declare const GetDeficitProductSchema: z.ZodObject<{
         sortDesc?: boolean | undefined;
     }[] | undefined;
     page?: number | undefined;
+    isDiscontinued?: boolean | null | undefined;
     shipmentIds?: number[] | null | undefined;
 }>;
 export type GetDeficitProductDtoType = z.infer<typeof GetDeficitProductSchema>;

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

@@ -9,5 +9,6 @@ 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(),
+    isDiscontinued: zod_1.z.boolean().nullable().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

@@ -3,6 +3,7 @@ import { WorkStartCalcTypeFilter } from '../../operations/enums/enums';
 export declare const GetProductionTaskByEquipmentDtoZod: z.ZodObject<{
     equipmentId: z.ZodNumber;
     searchString: z.ZodOptional<z.ZodString>;
+    page: z.ZodDefault<z.ZodNumber>;
     taskId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
     range: z.ZodOptional<z.ZodNullable<z.ZodObject<{
         start: z.ZodAny;
@@ -15,9 +16,12 @@ export declare const GetProductionTaskByEquipmentDtoZod: z.ZodObject<{
         end?: any;
     }>>>;
     onlyTOperation: z.ZodOptional<z.ZodNumber>;
+    isShowCbed: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     workStartCalcTypeFilter: z.ZodOptional<z.ZodArray<z.ZodNativeEnum<typeof WorkStartCalcTypeFilter>, "many">>;
 }, "strip", z.ZodTypeAny, {
+    page: number;
     equipmentId: number;
+    isShowCbed: boolean;
     searchString?: string | undefined;
     range?: {
         start?: any;
@@ -28,6 +32,7 @@ export declare const GetProductionTaskByEquipmentDtoZod: z.ZodObject<{
     workStartCalcTypeFilter?: WorkStartCalcTypeFilter[] | undefined;
 }, {
     equipmentId: number;
+    page?: number | undefined;
     searchString?: string | undefined;
     range?: {
         start?: any;
@@ -36,5 +41,6 @@ export declare const GetProductionTaskByEquipmentDtoZod: z.ZodObject<{
     taskId?: number | null | undefined;
     onlyTOperation?: number | undefined;
     workStartCalcTypeFilter?: WorkStartCalcTypeFilter[] | undefined;
+    isShowCbed?: boolean | undefined;
 }>;
 export type GetProductionTaskByEquipmentDtoZodType = z.infer<typeof GetProductionTaskByEquipmentDtoZod>;

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

@@ -6,6 +6,7 @@ const enums_1 = require("../../operations/enums/enums");
 exports.GetProductionTaskByEquipmentDtoZod = zod_1.z.object({
     equipmentId: zod_1.z.number().int(),
     searchString: zod_1.z.string().optional(),
+    page: zod_1.z.number().default(0),
     taskId: zod_1.z.number().int().nullish(),
     range: zod_1.z
         .object({
@@ -15,6 +16,7 @@ exports.GetProductionTaskByEquipmentDtoZod = zod_1.z.object({
         .nullable()
         .optional(),
     onlyTOperation: zod_1.z.number().int().optional(),
+    isShowCbed: zod_1.z.boolean().optional().default(false),
     workStartCalcTypeFilter: zod_1.z
         .array(zod_1.z.nativeEnum(enums_1.WorkStartCalcTypeFilter))
         .optional()

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

@@ -2,6 +2,7 @@ import { z } from 'zod';
 import { StockOrderType } from '../../utils';
 export declare const GetProductionTaskByOperationDtoZod: z.ZodObject<{
     operationTypeId: z.ZodNumber;
+    page: z.ZodDefault<z.ZodNumber>;
     searchString: z.ZodOptional<z.ZodString>;
     taskId: z.ZodOptional<z.ZodDefault<z.ZodNullable<z.ZodNumber>>>;
     onlyTOperation: z.ZodOptional<z.ZodNumber>;
@@ -18,6 +19,7 @@ export declare const GetProductionTaskByOperationDtoZod: z.ZodObject<{
     equipmentIds: z.ZodDefault<z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodNumber, "many">>>>;
     productionOperationType: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof StockOrderType>>>;
 }, "strip", z.ZodTypeAny, {
+    page: number;
     equipmentIds: number[] | null;
     operationTypeId: number;
     searchString?: string | undefined;
@@ -30,6 +32,7 @@ export declare const GetProductionTaskByOperationDtoZod: z.ZodObject<{
     productionOperationType?: StockOrderType | null | undefined;
 }, {
     operationTypeId: number;
+    page?: number | undefined;
     equipmentIds?: number[] | null | undefined;
     searchString?: string | undefined;
     range?: {

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

@@ -5,6 +5,7 @@ const zod_1 = require("zod");
 const utils_1 = require("../../utils");
 exports.GetProductionTaskByOperationDtoZod = zod_1.z.object({
     operationTypeId: zod_1.z.number().int(),
+    page: zod_1.z.number().int().min(0).default(0),
     searchString: zod_1.z.string().optional(),
     taskId: zod_1.z.number().int().nullable().default(null).optional(),
     onlyTOperation: zod_1.z.number().int().optional(),

package/dist/production-tasks/interfaces/production-tasks.d.ts

@@ -13,6 +13,7 @@ import { ModelDetal } from '../../detal';
 import { ModelCbed } from '../../cbed';
 import { ModelProduct } from '../../product/schemas/product.schema';
 import { ModelProductionOperationPos } from '../schemas/production-operation-pos.schema';
+import { ModelMaterial } from '../../material';
 export interface IMarkExecute {
     quantity: number;
     executionTime: number;
@@ -255,6 +256,7 @@ export interface IGetByEquipment {
         attention: boolean;
         discontinued: boolean;
         id: number;
+        material?: ModelMaterial | null;
     };
     detalIdx: number;
     calculatedCreateTime: Date;

package/dist/utils/date.methods.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DateMethods = void 0;
+const methods_1 = require("./methods");
 /**
  * @returns date: DD.MM.YYYY
  * @returns time: H:M.S
@@ -64,9 +65,6 @@ class DateMethods {
             const end = calculatedCreateTimeDate <= planReadyTimeDate
                 ? planReadyTimeDate
                 : calculatedCreateTimeDate;
-            const workDayStartHour = 5;
-            const workDayHours = 8;
-            const workDayEndHour = workDayStartHour + workDayHours;
             const isWorkDay = (date) => {
                 var _a, _b;
                 const dayOfWeek = date.getUTCDay();
@@ -93,9 +91,9 @@ class DateMethods {
                     continue;
                 }
                 const workStart = new Date(current);
-                workStart.setUTCHours(workDayStartHour, 0, 0, 0);
+                workStart.setUTCHours(methods_1.WORK_DAY_START_HOUR, 0, 0, 0);
                 const workEnd = new Date(current);
-                workEnd.setUTCHours(workDayEndHour, 0, 0, 0);
+                workEnd.setUTCHours(methods_1.WORK_DAY_END_HOUR, methods_1.WORK_DAY_END_MINUTE, 0, 0);
                 const actualStart = current > workStart ? current : workStart;
                 const actualEnd = end < workEnd ? end : workEnd;
                 if (actualStart < actualEnd) {

package/dist/utils/enums.d.ts

@@ -154,6 +154,7 @@ export declare enum ModuleInclude {
     document = "document",
     material = "material",
     shipments = "shipments",
+    stock_order = "stock_order",
     techProcess = "techProcess",
     mat_za_obj = "mat_za_obj",
     user = "user",

package/dist/utils/enums.js

@@ -180,6 +180,7 @@ var ModuleInclude;
     ModuleInclude["document"] = "document";
     ModuleInclude["material"] = "material";
     ModuleInclude["shipments"] = "shipments";
+    ModuleInclude["stock_order"] = "stock_order";
     ModuleInclude["techProcess"] = "techProcess";
     ModuleInclude["mat_za_obj"] = "mat_za_obj";
     ModuleInclude["user"] = "user";

package/dist/utils/sorting.d.ts

@@ -6,7 +6,8 @@ export declare enum ProductionPlanSortField {
     calculatedCreateTime = "calculatedCreateTime",
     warehouseReadinessDate = "warehouseReadinessDate",
     orderedByProduction = "orderedByProduction",
-    productionDelay = "productionDelay"
+    productionDelay = "productionDelay",
+    startTimeDelay = "startTimeDelay"
 }
 export type ProductionPlanSortRule = {
     sortField?: ProductionPlanSortField | null;

package/dist/utils/sorting.js

@@ -10,6 +10,7 @@ var ProductionPlanSortField;
     ProductionPlanSortField["warehouseReadinessDate"] = "warehouseReadinessDate";
     ProductionPlanSortField["orderedByProduction"] = "orderedByProduction";
     ProductionPlanSortField["productionDelay"] = "productionDelay";
+    ProductionPlanSortField["startTimeDelay"] = "startTimeDelay";
 })(ProductionPlanSortField || (exports.ProductionPlanSortField = ProductionPlanSortField = {}));
 exports.ProductionPlanSortRuleSchema = zod_1.z.object({
     sortField: zod_1.z.nativeEnum(ProductionPlanSortField).nullable().optional(),
@@ -40,7 +41,7 @@ const compareValues = (firstValue, secondValue, desc = false) => {
     if (isFirstNull || isSecondNull) {
         if (isFirstNull && isSecondNull)
             return 0;
-        return isFirstNull ? (desc ? 1 : -1) : desc ? -1 : 1;
+        return isFirstNull ? (desc ? -1 : 1) : desc ? 1 : -1;
     }
     const normalizedFirstValue = normalizeSortValue(firstValue);
     const normalizedSecondValue = normalizeSortValue(secondValue);

package/dist/utils/tables-config/enum.d.ts

@@ -11,6 +11,7 @@ export declare enum tablesEnumConfig {
     calculateAssembleTime = "calculateAssembleTime",
     orderedByProduction = "orderedByProduction",
     productionDelay = "productionDelay",
+    startTimeDelay = "startTimeDelay",
     ordered = "ordered",
     deficitChildCreateTime = "deficitChildCreateTime",
     remainingByProductionTask = "remainingByProductionTask",

package/dist/utils/tables-config/enum.js

@@ -23,7 +23,10 @@ var tablesEnumConfig;
     tablesEnumConfig["calculateAssembleTime"] = "calculateAssembleTime";
     // заказано по ПЗ
     tablesEnumConfig["orderedByProduction"] = "orderedByProduction";
+    // просрочка изготовления
     tablesEnumConfig["productionDelay"] = "productionDelay";
+    // просрочка начала работ
+    tablesEnumConfig["startTimeDelay"] = "startTimeDelay";
     // заказано
     tablesEnumConfig["ordered"] = "ordered";
     // Время изг. дефицитных Д/СБ

package/dist/utils/tables-config/methods.js

@@ -29,24 +29,52 @@ const createCorrectColumnConfig = (columns, arrayToCheck) => {
     const uniqueColumns = new Map();
     columns
         .filter(currentColumn => availableColumns.has(currentColumn.columnName))
-        .sort((leftColumn, rightColumn) => leftColumn.position - rightColumn.position)
+        .sort((leftColumn, rightColumn) => {
+        var _a, _b;
+        const leftPosition = (_a = leftColumn.position) !== null && _a !== void 0 ? _a : 0;
+        const rightPosition = (_b = rightColumn.position) !== null && _b !== void 0 ? _b : 0;
+        return leftPosition - rightPosition;
+    })
         .forEach(currentColumn => {
+        if (uniqueColumns.has(currentColumn.columnName))
+            return;
         uniqueColumns.set(currentColumn.columnName, currentColumn);
     });
-    const normalizedColumns = Array.from(uniqueColumns.values()).map(currentColumn => {
-        return {
-            columnName: currentColumn.columnName,
-            isShow: currentColumn.isShow
-        };
-    });
+    const normalizedOrder = Array.from(uniqueColumns.keys());
+    /**
+     * Вычисляет индекс колонки по эталонному порядку
+     */
+    const getActualInsertIndex = (currentColumn) => {
+        const currentIndex = arrayToCheck.indexOf(currentColumn);
+        for (let leftIndex = currentIndex - 1; leftIndex >= 0; leftIndex -= 1) {
+            const existedIndex = normalizedOrder.indexOf(arrayToCheck[leftIndex]);
+            if (existedIndex !== -1)
+                return existedIndex + 1;
+        }
+        for (let rightIndex = currentIndex + 1; rightIndex < arrayToCheck.length; rightIndex += 1) {
+            const existedIndex = normalizedOrder.indexOf(arrayToCheck[rightIndex]);
+            if (existedIndex !== -1)
+                return existedIndex;
+        }
+        return normalizedOrder.length;
+    };
     arrayToCheck.forEach(currentItem => {
         if (uniqueColumns.has(currentItem))
             return;
-        normalizedColumns.push({
-            columnName: currentItem,
-            isShow: true
-        });
+        normalizedOrder.splice(getActualInsertIndex(currentItem), 0, currentItem);
     });
-    return addPositionForColumns(normalizedColumns);
+    return addPositionForColumns(normalizedOrder.map(currentColumn => {
+        const savedColumn = uniqueColumns.get(currentColumn);
+        if (savedColumn) {
+            return {
+                columnName: savedColumn.columnName,
+                isShow: savedColumn.isShow
+            };
+        }
+        return {
+            columnName: currentColumn,
+            isShow: true
+        };
+    }));
 };
 exports.createCorrectColumnConfig = createCorrectColumnConfig;

package/dist/utils/tables-config/tables-array.js

@@ -13,7 +13,7 @@ exports.metalloworkingTableConfig = [
     enum_1.tablesEnumConfig.orderedByProduction,
     enum_1.tablesEnumConfig.ordered,
     enum_1.tablesEnumConfig.dateByUrgency,
-    enum_1.tablesEnumConfig.dateShipment,
+    enum_1.tablesEnumConfig.productionDelay,
     enum_1.tablesEnumConfig.workpieceParameters,
     enum_1.tablesEnumConfig.material,
     enum_1.tablesEnumConfig.operationsLength,
@@ -36,6 +36,7 @@ exports.metalDeficitByAssembleTableConfig = [
     enum_1.tablesEnumConfig.deficitByProductionTask,
     enum_1.tablesEnumConfig.orderedByProduction,
     enum_1.tablesEnumConfig.ordered,
+    enum_1.tablesEnumConfig.productionDelay,
     enum_1.tablesEnumConfig.operationsLength,
     enum_1.tablesEnumConfig.operationList,
     enum_1.tablesEnumConfig.totalTimePerItem,
@@ -56,10 +57,10 @@ exports.onlineBoardProductionTableConfig = [
     enum_1.tablesEnumConfig.calculatedCreateTime,
     enum_1.tablesEnumConfig.warehouseReadinessDate,
     enum_1.tablesEnumConfig.calculateNeedsTime,
-    enum_1.tablesEnumConfig.dateShipment,
     enum_1.tablesEnumConfig.deficitByCurrentProductionTask,
     enum_1.tablesEnumConfig.deficitByProductionTask,
     enum_1.tablesEnumConfig.ordered,
+    enum_1.tablesEnumConfig.productionDelay,
     enum_1.tablesEnumConfig.readyToComplect,
     enum_1.tablesEnumConfig.operationsLength,
     enum_1.tablesEnumConfig.operationList,
@@ -79,9 +80,9 @@ exports.onlineBoardTableConfig = [
     enum_1.tablesEnumConfig.startTime,
     enum_1.tablesEnumConfig.calculatedCreateTime,
     enum_1.tablesEnumConfig.calculateNeedsTime,
-    enum_1.tablesEnumConfig.dateShipment,
     enum_1.tablesEnumConfig.deficitByProductionTask,
     enum_1.tablesEnumConfig.ordered,
+    enum_1.tablesEnumConfig.productionDelay,
     enum_1.tablesEnumConfig.readyToComplect,
     enum_1.tablesEnumConfig.operationsLength,
     enum_1.tablesEnumConfig.operationList,
@@ -101,7 +102,7 @@ exports.assembleTableConfig = [
     enum_1.tablesEnumConfig.calculatedCreateTime,
     enum_1.tablesEnumConfig.calculateNeedsTime,
     enum_1.tablesEnumConfig.dateByUrgency,
-    enum_1.tablesEnumConfig.dateShipment,
+    enum_1.tablesEnumConfig.productionDelay,
     enum_1.tablesEnumConfig.operationsLength,
     enum_1.tablesEnumConfig.readyInProcent,
     enum_1.tablesEnumConfig.readyToComplect,
@@ -148,6 +149,8 @@ exports.productionTaskByOperationTableConfig = [
     enum_1.tablesEnumConfig.image,
     enum_1.tablesEnumConfig.designation,
     enum_1.tablesEnumConfig.name,
+    enum_1.tablesEnumConfig.workpieceParameters,
+    enum_1.tablesEnumConfig.material,
     enum_1.tablesEnumConfig.startTime,
     enum_1.tablesEnumConfig.calculatedCreateTime,
     enum_1.tablesEnumConfig.calculateNeedsTime,
@@ -176,6 +179,8 @@ exports.productionTaskByEquipmentTableConfig = [
     enum_1.tablesEnumConfig.image,
     enum_1.tablesEnumConfig.designation,
     enum_1.tablesEnumConfig.name,
+    enum_1.tablesEnumConfig.workpieceParameters,
+    enum_1.tablesEnumConfig.material,
     enum_1.tablesEnumConfig.startTime,
     enum_1.tablesEnumConfig.calculatedCreateTime,
     enum_1.tablesEnumConfig.calculateNeedsTime,

package/package.json

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