@pksep/zod-shared 0.0.530 → 0.0.532

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/interface/mat.interface.d.ts

@@ -0,0 +1,10 @@
+export interface IUnitsMeasurementStructure {
+    units_type: number;
+    shipments: number;
+    delivery: number;
+    quantity: number;
+    price: number;
+    used: boolean;
+    min_remaining: number;
+    working_quantity: number;
+}

package/dist/utils/interface/mat.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,12 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCorrectColumnConfig = exports.checkMissingColumns = exports.generateDefaultConfigArray = void 0;
-const generateDefaultConfigArray = (configArray) => configArray.map(currentConfigitem => {
+/**
+ * Нормализует порядок колонок и всегда пересчитывает позицию колонки
+ * по фактической позиции элемента в массиве.
+ */
+const addPositionForColumns = (columns) => columns.map((currentColumn, index) => (Object.assign(Object.assign({}, currentColumn), { position: index })));
+const generateDefaultConfigArray = (configArray) => addPositionForColumns(configArray.map(currentConfigitem => {
     return {
         columnName: currentConfigitem,
         isShow: true
     };
-});
+}));
 exports.generateDefaultConfigArray = generateDefaultConfigArray;
 /**
  * Возвращает список колонок из `arrayToCheck`, которые отсутствуют в текущей конфигурации `columns`.
@@ -20,16 +25,28 @@ const checkMissingColumns = (columns, arrayToCheck) => {
 };
 exports.checkMissingColumns = checkMissingColumns;
 const createCorrectColumnConfig = (columns, arrayToCheck) => {
-    const columnMap = new Map();
-    columns.forEach(currentColumn => {
-        columnMap.set(currentColumn.columnName, currentColumn);
+    const availableColumns = new Set(arrayToCheck);
+    const uniqueColumns = new Map();
+    columns
+        .filter(currentColumn => availableColumns.has(currentColumn.columnName))
+        .sort((leftColumn, rightColumn) => leftColumn.position - rightColumn.position)
+        .forEach(currentColumn => {
+        uniqueColumns.set(currentColumn.columnName, currentColumn);
+    });
+    const normalizedColumns = Array.from(uniqueColumns.values()).map(currentColumn => {
+        return {
+            columnName: currentColumn.columnName,
+            isShow: currentColumn.isShow
+        };
     });
-    const newColumnArray = arrayToCheck.map(currentItem => {
-        const currentItemFromMap = columnMap.get(currentItem);
-        return currentItemFromMap
-            ? currentItemFromMap
-            : { columnName: currentItem, isShow: true };
+    arrayToCheck.forEach(currentItem => {
+        if (uniqueColumns.has(currentItem))
+            return;
+        normalizedColumns.push({
+            columnName: currentItem,
+            isShow: true
+        });
     });
-    return newColumnArray;
+    return addPositionForColumns(normalizedColumns);
 };
 exports.createCorrectColumnConfig = createCorrectColumnConfig;

package/package.json

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

package/dist/production-tasks/interfaces/workload-by-entity.d.ts

@@ -1,19 +0,0 @@
-export interface IWorkloadByEntityResponse {
-    operationName: string;
-    workloadData: IWorkloadData[];
-}
-export interface IWorkloadData {
-    responsibleInfo: any;
-    positions: IWorkloadPositionByDate[];
-}
-export interface IWorkloadPositionByDate {
-    workDate: string;
-    positions: {
-        normHours: number;
-        deltaTime: number;
-        datesToCheck: {
-            calculateDate: Date | string;
-            planReadyDate: Date | string;
-        }[];
-    };
-}