@pksep/zod-shared 0.0.536 → 0.0.538

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

@@ -8,7 +8,21 @@ export declare const GetAssembleByOperationPaginationDtoZod: z.ZodObject<{
     status: z.ZodNativeEnum<typeof AssembleStatus>;
     byOrder: z.ZodOptional<z.ZodNullable<z.ZodType<IFiltersByByOrder, z.ZodTypeDef, IFiltersByByOrder>>>;
     byParents: z.ZodOptional<z.ZodNullable<z.ZodType<IFiltersByParents, z.ZodTypeDef, IFiltersByParents>>>;
+    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: AssembleStatus;
     page: number;
     operationId: number | null;
@@ -19,6 +33,10 @@ export declare const GetAssembleByOperationPaginationDtoZod: z.ZodObject<{
     status: AssembleStatus;
     page: number;
     searchString: string;
+    sort?: {
+        sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
+        sortDesc?: boolean | undefined;
+    }[] | undefined;
     operationId?: number | null | undefined;
     byParents?: IFiltersByParents | null | undefined;
     byOrder?: IFiltersByByOrder | null | undefined;

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

@@ -9,5 +9,6 @@ exports.GetAssembleByOperationPaginationDtoZod = zod_1.z.object({
     searchString: zod_1.z.string(),
     status: zod_1.z.nativeEnum(utils_1.AssembleStatus),
     byOrder: zod_1.z.custom().nullable().optional(),
-    byParents: zod_1.z.custom().nullable().optional()
+    byParents: zod_1.z.custom().nullable().optional(),
+    sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
 });

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(),

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

@@ -24,6 +24,7 @@ var tablesEnumConfig;
     // заказано по ПЗ
     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

@@ -14,6 +14,7 @@ exports.metalloworkingTableConfig = [
     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 +37,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,
@@ -60,6 +62,7 @@ exports.onlineBoardProductionTableConfig = [
     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,
@@ -82,6 +85,7 @@ exports.onlineBoardTableConfig = [
     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,
@@ -102,6 +106,7 @@ exports.assembleTableConfig = [
     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,

package/package.json

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