@pksep/zod-shared 0.0.560 → 0.0.562

package/dist/production-tasks/schemas/production-task-subtask.schema.d.ts

@@ -0,0 +1,81 @@
+import type { ModelAssemble } from '../../assemble';
+import type { ModelCbed } from '../../cbed';
+import type { ModelDetal } from '../../detal';
+import type { ModelEquipment } from '../../equipment';
+import type { ModelMetaloworking } from '../../metaloworking';
+import type { ModelProduct } from '../../product';
+import type { ModelUser } from '../../user';
+import type { SplitProductionTaskDtoZodType } from '../dto/split-production-task.dto';
+import type { ModelProductionOperationPos } from './production-operation-pos.schema';
+import type { ModelProductionTask } from './production-task.schema';
+export type ProductionTaskWorkingEntityZodType = (ModelCbed | ModelDetal | ModelProduct) & {
+    actual_shipment_id?: number | null;
+    isOrderedByStockOrder?: boolean;
+};
+export type ProductionTaskWorkingPositionSourceZodType = (Omit<ModelAssemble, 'cbed' | 'product'> & {
+    cbed?: ProductionTaskWorkingEntityZodType;
+    detal?: never;
+    product?: ProductionTaskWorkingEntityZodType;
+}) | (Omit<ModelMetaloworking, 'detal' | 'id'> & {
+    cbed?: never;
+    id: number;
+    detal?: ProductionTaskWorkingEntityZodType;
+    product?: never;
+});
+export type ProductionTaskWorkingPositionZodType = ProductionTaskWorkingPositionSourceZodType & {
+    idx: number;
+    myQuantity: number;
+    entity?: ProductionTaskWorkingEntityZodType;
+    isOrderedByStockOrder?: boolean;
+    operationExecutionTime?: number;
+};
+export type ProductionTaskOperationPositionZodType = ModelProductionOperationPos & {
+    maxAvailable?: number;
+    countByProductionTask?: number;
+};
+export type ProductionTaskWithSubtasksZodType = Omit<ModelProductionTask, 'children' | 'id' | 'production_operation_pos'> & {
+    id: number;
+    workingPosition: ProductionTaskWorkingPositionZodType[];
+    production_operation_pos: ProductionTaskOperationPositionZodType[];
+    children: ProductionTaskWithSubtasksZodType[];
+};
+export type ProductionTaskHydratedSourceZodType = Omit<ModelProductionTask, 'id'> & {
+    id: number;
+    ass?: ProductionTaskWorkingPositionSourceZodType[];
+    metall?: ProductionTaskWorkingPositionSourceZodType[];
+};
+export type ProductionTaskListItemZodType = Omit<ModelProductionTask, 'id'> & {
+    id: number;
+    createdAt?: Date | string;
+};
+export type ProductionTaskByEntityZodType = Omit<ModelProductionTask, 'due_data' | 'id'> & {
+    id: number;
+    due_data: Date | string;
+    quantity: number;
+    plan_ready_time: Date | string | null;
+    entityPositionId: number | null;
+    productionOperationPosId: number | null;
+    transferableQuantity: number;
+};
+export type ProductionTaskDecompositionAssignmentZodType = {
+    operationPositionId: number;
+    userId: number | null;
+    equipmentId: number | null;
+};
+export type ProductionTaskDecompositionPositionZodType = ProductionTaskWorkingPositionZodType & {
+    productionOperationPosId: number;
+    decompositionOperationAssignments: Record<number, ProductionTaskDecompositionAssignmentZodType>;
+    maxAvailable: number;
+    isSelected?: boolean;
+    selectedUsers?: number[];
+    selectedEquipments?: number[];
+    responsibleUsers?: ModelUser[];
+    availableEquipment?: ModelEquipment[];
+    typeIzd?: string;
+    type_izd?: string;
+    countByProductionTask: number;
+    shipmentNeedsTotal: number;
+    shipmentDeficit: number;
+    freeQuantity: number;
+};
+export type ProductionTaskDecompositionResultZodType = SplitProductionTaskDtoZodType;

package/dist/production-tasks/schemas/production-task.schema.d.ts

@@ -7,6 +7,10 @@ import { ModelMarks } from '../../marks';
 import { ModelProductionOperationPos } from './production-operation-pos.schema';
 export declare const ProductionTaskSchema: z.ZodObject<{
     id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    parent_production_task_id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    subtask_number: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    subtask_order: z.ZodDefault<z.ZodNumber>;
+    global_order_index: z.ZodNumber;
     due_data: z.ZodDate;
     working_type: z.ZodNativeEnum<typeof StockOrderType>;
     description: z.ZodOptional<z.ZodString>;
@@ -14,20 +18,30 @@ export declare const ProductionTaskSchema: z.ZodObject<{
     details_filters: z.ZodType<IDescriptionFilters, z.ZodTypeDef, IDescriptionFilters>;
 }, "strip", z.ZodTypeAny, {
     ban: boolean;
+    subtask_order: number;
+    global_order_index: number;
     due_data: Date;
     working_type: StockOrderType;
     details_filters: IDescriptionFilters;
     description?: string | undefined;
     id?: number | null | undefined;
+    parent_production_task_id?: number | null | undefined;
+    subtask_number?: number | null | undefined;
 }, {
+    global_order_index: number;
     due_data: Date;
     working_type: StockOrderType;
     details_filters: IDescriptionFilters;
     ban?: boolean | undefined;
     description?: string | undefined;
     id?: number | null | undefined;
+    parent_production_task_id?: number | null | undefined;
+    subtask_number?: number | null | undefined;
+    subtask_order?: number | undefined;
 }>;
 export type ModelProductionTask = z.infer<typeof ProductionTaskSchema> & {
+    parent?: ModelProductionTask | null;
+    children?: ModelProductionTask[];
     ass?: ModelAssemble[];
     metall?: ModelMetaloworking[];
     marks?: ModelMarks[];

package/dist/production-tasks/schemas/production-task.schema.js

@@ -5,6 +5,10 @@ const zod_1 = require("zod");
 const utils_1 = require("../../utils");
 exports.ProductionTaskSchema = zod_1.z.object({
     id: zod_1.z.number().nullish(),
+    parent_production_task_id: zod_1.z.number().int().nullish(),
+    subtask_number: zod_1.z.number().int().min(1).nullish(),
+    subtask_order: zod_1.z.number().int().nonnegative().default(0),
+    global_order_index: zod_1.z.number().int(),
     due_data: zod_1.z.date(),
     working_type: zod_1.z.nativeEnum(utils_1.StockOrderType),
     description: zod_1.z.string().optional(),

package/dist/specification/dto/mutate-specification.dto.d.ts

@@ -0,0 +1,58 @@
+import { z } from 'zod';
+import { IzdType, SpetificationEntityKeys } from '../../utils';
+export declare const SpecificationParentTypeZod: z.ZodEnum<[IzdType.product, IzdType.cbed, IzdType.detal]>;
+export declare const SpecificationSectionZod: z.ZodNativeEnum<typeof SpetificationEntityKeys>;
+export declare const SpecificationMutationOperationZod: z.ZodEnum<["add", "update", "move", "remove"]>;
+/**
+ * Единая команда точечного изменения спецификации.
+ * position задаётся в привычном пользователю формате: первый элемент имеет позицию 1.
+ */
+export declare const MutateSpecificationDtoZod: z.ZodEffects<z.ZodObject<{
+    parentType: z.ZodEnum<[IzdType.product, IzdType.cbed, IzdType.detal]>;
+    parentId: z.ZodNumber;
+    section: z.ZodNativeEnum<typeof SpetificationEntityKeys>;
+    operation: z.ZodEnum<["add", "update", "move", "remove"]>;
+    itemId: z.ZodNumber;
+    quantity: z.ZodOptional<z.ZodNumber>;
+    measureId: z.ZodOptional<z.ZodNumber>;
+    position: z.ZodOptional<z.ZodNumber>;
+}, "strip", z.ZodTypeAny, {
+    operation: "update" | "add" | "move" | "remove";
+    parentId: number;
+    parentType: IzdType.product | IzdType.cbed | IzdType.detal;
+    section: SpetificationEntityKeys;
+    itemId: number;
+    quantity?: number | undefined;
+    position?: number | undefined;
+    measureId?: number | undefined;
+}, {
+    operation: "update" | "add" | "move" | "remove";
+    parentId: number;
+    parentType: IzdType.product | IzdType.cbed | IzdType.detal;
+    section: SpetificationEntityKeys;
+    itemId: number;
+    quantity?: number | undefined;
+    position?: number | undefined;
+    measureId?: number | undefined;
+}>, {
+    operation: "update" | "add" | "move" | "remove";
+    parentId: number;
+    parentType: IzdType.product | IzdType.cbed | IzdType.detal;
+    section: SpetificationEntityKeys;
+    itemId: number;
+    quantity?: number | undefined;
+    position?: number | undefined;
+    measureId?: number | undefined;
+}, {
+    operation: "update" | "add" | "move" | "remove";
+    parentId: number;
+    parentType: IzdType.product | IzdType.cbed | IzdType.detal;
+    section: SpetificationEntityKeys;
+    itemId: number;
+    quantity?: number | undefined;
+    position?: number | undefined;
+    measureId?: number | undefined;
+}>;
+export type SpecificationParentType = z.infer<typeof SpecificationParentTypeZod>;
+export type SpecificationMutationOperation = z.infer<typeof SpecificationMutationOperationZod>;
+export type MutateSpecificationDto = z.infer<typeof MutateSpecificationDtoZod>;

package/dist/specification/dto/mutate-specification.dto.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MutateSpecificationDtoZod = exports.SpecificationMutationOperationZod = exports.SpecificationSectionZod = exports.SpecificationParentTypeZod = void 0;
+const zod_1 = require("zod");
+const utils_1 = require("../../utils");
+exports.SpecificationParentTypeZod = zod_1.z.enum([
+    utils_1.IzdType.product,
+    utils_1.IzdType.cbed,
+    utils_1.IzdType.detal
+]);
+exports.SpecificationSectionZod = zod_1.z.nativeEnum(utils_1.SpetificationEntityKeys);
+exports.SpecificationMutationOperationZod = zod_1.z.enum([
+    'add',
+    'update',
+    'move',
+    'remove'
+]);
+/**
+ * Единая команда точечного изменения спецификации.
+ * position задаётся в привычном пользователю формате: первый элемент имеет позицию 1.
+ */
+exports.MutateSpecificationDtoZod = zod_1.z
+    .object({
+    parentType: exports.SpecificationParentTypeZod,
+    parentId: zod_1.z.coerce.number().int().min(1),
+    section: exports.SpecificationSectionZod,
+    operation: exports.SpecificationMutationOperationZod,
+    itemId: zod_1.z.coerce.number().int().min(1),
+    quantity: zod_1.z.coerce.number().min(0.000001).max(1000000).optional(),
+    measureId: zod_1.z.coerce.number().int().min(1).optional(),
+    position: zod_1.z.coerce.number().int().min(1).optional()
+})
+    .superRefine((command, context) => {
+    if (command.parentType === utils_1.IzdType.detal &&
+        command.section !== utils_1.SpetificationEntityKeys.materialList) {
+        context.addIssue({
+            code: zod_1.z.ZodIssueCode.custom,
+            path: ['section'],
+            message: 'Спецификация детали поддерживает только список материалов'
+        });
+    }
+    if (command.operation === 'add' && command.quantity === undefined) {
+        context.addIssue({
+            code: zod_1.z.ZodIssueCode.custom,
+            path: ['quantity'],
+            message: 'Для добавления необходимо указать количество'
+        });
+    }
+    if (command.operation === 'move' && command.position === undefined) {
+        context.addIssue({
+            code: zod_1.z.ZodIssueCode.custom,
+            path: ['position'],
+            message: 'Для перемещения необходимо указать новую позицию'
+        });
+    }
+    if (command.operation === 'update' &&
+        command.quantity === undefined &&
+        command.measureId === undefined) {
+        context.addIssue({
+            code: zod_1.z.ZodIssueCode.custom,
+            path: ['operation'],
+            message: 'Для изменения необходимо указать количество или единицу измерения'
+        });
+    }
+});

package/dist/specification/index.d.ts

@@ -1,4 +1,5 @@
 export * from './dto/specification-attributes.dto';
+export * from './dto/mutate-specification.dto';
 export * from './schema/attributes.schema';
 export * from './type/type';
 export * from './interface/interface';

package/dist/specification/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./dto/specification-attributes.dto"), exports);
+__exportStar(require("./dto/mutate-specification.dto"), exports);
 __exportStar(require("./schema/attributes.schema"), exports);
 __exportStar(require("./type/type"), exports);
 __exportStar(require("./interface/interface"), exports);

package/dist/specification/interface/interface.d.ts

@@ -2,6 +2,9 @@ import { ActionEntityTypes } from '../../action';
 import { ModelCbed } from '../../cbed';
 import { ModelProduct } from '../../product';
 import { SpetificationEntityKeys } from '../../utils';
+import { EntityCommonSpecificationArray, IzdType } from '../../utils';
+import { Transaction } from 'sequelize';
+import { MutateSpecificationDto } from '../dto/mutate-specification.dto';
 export interface ICheckIsComplitEntity {
     entity: ModelCbed | ModelProduct;
     childrensQuantityMap: Map<string, number>;
@@ -9,3 +12,17 @@ export interface ICheckIsComplitEntity {
     type: ActionEntityTypes;
     funcToGetEntity: (params: any) => Promise<any>;
 }
+export interface ISpecificationMutationContext {
+    userId: number;
+    transactionArgument?: Transaction;
+    relativeActionId?: number;
+}
+export interface ISpecificationMutationResult {
+    parentType: IzdType.product | IzdType.cbed | IzdType.detal;
+    parentId: number;
+    section: SpetificationEntityKeys;
+    operation: MutateSpecificationDto['operation'];
+    itemId: number;
+    position: number | null;
+    specification: EntityCommonSpecificationArray;
+}

package/dist/utils/methods/sequelize.d.ts

@@ -17,3 +17,5 @@
     })
  */
 export declare const addFieldByCondition: (conditions: any, query: any) => any;
+/** Экранирует пользовательский ввод и формирует шаблон поиска по части строки. */
+export declare const toContainsSearchPattern: (value: string) => string;

package/dist/utils/methods/sequelize.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addFieldByCondition = void 0;
+exports.toContainsSearchPattern = exports.addFieldByCondition = void 0;
 /**
  * Упрощает добавление поля в запрос sequelie
  * @param conditions
@@ -21,3 +21,6 @@ exports.addFieldByCondition = void 0;
  */
 const addFieldByCondition = (conditions, query) => conditions ? query : {};
 exports.addFieldByCondition = addFieldByCondition;
+/** Экранирует пользовательский ввод и формирует шаблон поиска по части строки. */
+const toContainsSearchPattern = (value) => `%${value.replace(/[\\%_]/g, '\\$&')}%`;
+exports.toContainsSearchPattern = toContainsSearchPattern;

package/dist/utils/methods.js

@@ -72,10 +72,8 @@ function getFieldsSpetification(list, subKey) {
     }
 }
 const calculateByMeasurementRate = (units_measurement, ezId) => {
-    const unitsMeasurementMap = new Map(units_measurement.map(unit => [unit.unitTypeId, unit.convertRate]));
-    if (!unitsMeasurementMap.has(ezId))
-        return 0;
-    const convertRate = ezId === 1 ? 1 : unitsMeasurementMap.get(ezId);
+    const unit = units_measurement.find(unit => unit.unitTypeId === ezId);
+    const convertRate = Number((unit === null || unit === void 0 ? void 0 : unit.convertRate) || 0);
     return convertRate;
 };
 exports.calculateByMeasurementRate = calculateByMeasurementRate;
@@ -792,16 +790,18 @@ const countChildrensRelative = (data) => {
                         ? Math.ceil(detalMass / materialConverRate)
                         : 0;
                     const characteristicQuantity = characteristicValue || 0;
-                    // всегда добавляем материал, даже если количество = 0, чтобы не терять его в графе
+                    // Для заготовки явно фиксируем ЕИ "шт", чтобы deep-дефицит пересчитывал норму тем же коэффициентом, что и карточка материала
                     concatedMaterialLists.push({
                         id: relative === null || relative === void 0 ? void 0 : relative.mat_zag,
-                        quantity: characteristicQuantity
+                        quantity: characteristicQuantity,
+                        measureId: 1
                     });
                 }
             }
             const materialMap = new Map();
             const materialsArray = concatedMaterialLists
                 .map((listMaterialItem) => {
+                var _a;
                 const foundedMaterials = materials.find(material => listMaterialItem.id === material.id);
                 //  если материал не найден, пропускаем
                 if (!foundedMaterials) {
@@ -809,8 +809,14 @@ const countChildrensRelative = (data) => {
                 }
                 // проверяем: это реальный 0 или результат ошибки/расчета
                 const isZeroQuantity = listMaterialItem.quantity === 0;
-                //конвертируем потребность в ШТ
-                const materialConverRate = (0, exports.calculateByMeasurementRate)(foundedMaterials.units_measurement, listMaterialItem.measureId);
+                const measureId = Number(listMaterialItem.measureId || 1);
+                const baseUnit = (_a = foundedMaterials.units_measurement) === null || _a === void 0 ? void 0 : _a.find(unit => unit.isBase);
+                const baseMeasureId = Number((baseUnit === null || baseUnit === void 0 ? void 0 : baseUnit.unitTypeId) || measureId);
+                // Конвертируем только явную ЕИ из спецификации; расчетные заготовки уже приходят в складских единицах
+                const materialConverRate = listMaterialItem.measureId
+                    ? (0, exports.calculateByMeasurementRate)(foundedMaterials.units_measurement, measureId)
+                    : 1;
+                const baseConvertRate = Number((baseUnit === null || baseUnit === void 0 ? void 0 : baseUnit.convertRate) || materialConverRate || 1);
                 // если количество 0, не пересчитываем, иначе - считаем как раньше
                 const specificationConvertedQuantity = isZeroQuantity
                     ? 0
@@ -819,14 +825,28 @@ 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_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) || '-' });
+                })), { measure_id: measureId, measureId, measureName: (0, edizm_1.returnEzName)(measureId), convertRate: materialConverRate, baseMeasureId, baseMeasureName: (0, edizm_1.returnEzName)(baseMeasureId), baseConvertRate, 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) || '-' });
             })
                 .filter(Boolean);
             materialsArray.forEach((currentMaterial) => {
                 const materialKey = `${currentMaterial.parent_id}_${currentMaterial.parent_type}_${currentMaterial.id}`;
                 if (materialMap.has(materialKey)) {
                     const material = materialMap.get(materialKey);
-                    materialMap.set(materialKey, Object.assign(Object.assign({}, material), { needs: material.needs + currentMaterial.needs, count_to_obj: material.count_to_obj + currentMaterial.count_to_obj, count_to_needs: material.count_to_needs + currentMaterial.count_to_needs }));
+                    const isSameMeasure = material.measure_id === currentMaterial.measure_id;
+                    const isSameBaseMeasure = material.baseMeasureId === currentMaterial.baseMeasureId;
+                    materialMap.set(materialKey, Object.assign(Object.assign({}, material), { needs: material.needs + currentMaterial.needs, count_to_obj: material.count_to_obj + currentMaterial.count_to_obj, count_to_needs: material.count_to_needs + currentMaterial.count_to_needs, count_to_obj_not_converted: isSameMeasure
+                            ? material.count_to_obj_not_converted +
+                                currentMaterial.count_to_obj_not_converted
+                            : material.count_to_obj + currentMaterial.count_to_obj, count_to_needs_not_converted: isSameMeasure
+                            ? material.count_to_needs_not_converted +
+                                currentMaterial.count_to_needs_not_converted
+                            : material.count_to_needs + currentMaterial.count_to_needs, measure_id: isSameMeasure ? material.measure_id : 1, measureId: isSameMeasure ? material.measureId : 1, measureName: isSameMeasure ? material.measureName : (0, edizm_1.returnEzName)(1), convertRate: isSameMeasure ? material.convertRate : 1, baseMeasureId: isSameBaseMeasure
+                            ? material.baseMeasureId
+                            : material.measureId, baseMeasureName: isSameBaseMeasure
+                            ? material.baseMeasureName
+                            : material.measureName, baseConvertRate: isSameBaseMeasure
+                            ? material.baseConvertRate
+                            : material.convertRate }));
                 }
                 else {
                     materialMap.set(materialKey, currentMaterial);

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

@@ -13,6 +13,11 @@ export declare enum tablesEnumConfig {
     productionDelay = "productionDelay",
     startTimeDelay = "startTimeDelay",
     ordered = "ordered",
+    maxAvailable = "maxAvailable",
+    deficit = "deficit",
+    shipmentDeficit = "shipmentDeficit",
+    productionTaskDeficit = "productionTaskDeficit",
+    globalProductionTaskDeficit = "globalProductionTaskDeficit",
     deficitChildCreateTime = "deficitChildCreateTime",
     remainingByProductionTask = "remainingByProductionTask",
     dateByUrgency = "dateByUrgency",

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

@@ -29,6 +29,16 @@ var tablesEnumConfig;
     tablesEnumConfig["startTimeDelay"] = "startTimeDelay";
     // заказано
     tablesEnumConfig["ordered"] = "ordered";
+    // Доступно к планированию по ПЗ
+    tablesEnumConfig["maxAvailable"] = "maxAvailable";
+    // Дефицит
+    tablesEnumConfig["deficit"] = "deficit";
+    // Дефицит по заказам на отгрузку
+    tablesEnumConfig["shipmentDeficit"] = "shipmentDeficit";
+    // Дефицит по ПЗ
+    tablesEnumConfig["productionTaskDeficit"] = "productionTaskDeficit";
+    // Общий дефицит по ПЗ
+    tablesEnumConfig["globalProductionTaskDeficit"] = "globalProductionTaskDeficit";
     // Время изг. дефицитных Д/СБ
     tablesEnumConfig["deficitChildCreateTime"] = "deficitChildCreateTime";
     // Осталось сделать по ПЗ

package/dist/utils/types/types.d.ts

@@ -3,7 +3,7 @@ import { ActionEntityTypes } from '../../action';
 import { ModelCbed } from '../../cbed';
 import { ModelDetal } from '../../detal';
 import { ModelMaterial } from '../../material';
-import { IzdType, ParentTypeEnum, QueueStatusEnum } from '../enums';
+import { IzdType, ParentTypeEnum, QueueStatusEnum, StockOrderType } from '../enums';
 import { IParentTypeInterface } from '../interface/parent-type.interface';
 export type listKeys = 'cb' | 'det' | 'mat';
 export type IdsList = {
@@ -28,6 +28,9 @@ export type RelativesProductionTasksType = {
     relativeDesignation: string;
     equipmentId: number | null;
     userId: number | null;
+    operationId?: number | null;
+    productionEntityId?: number | null;
+    productionEntityType?: StockOrderType | null;
     relativeAttention: boolean;
     relativeDiscontinued: boolean;
     relativeDescription: string;
@@ -109,6 +112,12 @@ export type RecursiveGraphType = {
     needs?: number;
     parent_id?: number;
     measure_id?: number;
+    measureId?: number;
+    measureName?: string;
+    convertRate?: number;
+    baseMeasureId?: number;
+    baseMeasureName?: string;
+    baseConvertRate?: number;
     count_to_obj_not_converted?: number;
     count_to_needs_not_converted?: number;
     parent_type?: IzdType;

package/dist/utils/validation/transform.d.ts

@@ -5,3 +5,5 @@
  * @returns
  */
 export declare const parseParamsOrBody: ({ value }: any, defaultValue?: any) => any;
+export declare const parseJsonField: <T>(value: unknown, defaultValue: T) => unknown;
+export declare const parseOptionalNullableInteger: (value: unknown) => unknown;

package/dist/utils/validation/transform.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseParamsOrBody = void 0;
+exports.parseOptionalNullableInteger = exports.parseJsonField = exports.parseParamsOrBody = void 0;
 /**
  * Парсим и возвращаем json при валидации контроллера
  * @param param0
@@ -17,3 +17,27 @@ const parseParamsOrBody = ({ value }, defaultValue) => {
     }
 };
 exports.parseParamsOrBody = parseParamsOrBody;
+const parseJsonField = (value, defaultValue) => {
+    if (value === undefined || value === null || value === '') {
+        return defaultValue;
+    }
+    if (typeof value !== 'string')
+        return value;
+    try {
+        return JSON.parse(value);
+    }
+    catch (_a) {
+        return value;
+    }
+};
+exports.parseJsonField = parseJsonField;
+const parseOptionalNullableInteger = (value) => {
+    if (value === undefined)
+        return undefined;
+    if (value === null || value === '' || value === 'null')
+        return null;
+    if (typeof value === 'string' && /^\d+$/.test(value))
+        return Number(value);
+    return value;
+};
+exports.parseOptionalNullableInteger = parseOptionalNullableInteger;

package/package.json

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

package/dist/issue/dto/up-create-issue.dto.d.ts

@@ -1,49 +0,0 @@
-import { z } from 'zod';
-import { StatusIssue } from '../../utils';
-export declare const UpCreateIssueDtoZod: z.ZodObject<{
-    description: z.ZodString;
-    dateUse: z.ZodString;
-    normTime: z.ZodString;
-    sourse: z.ZodString;
-    srok: z.ZodString;
-    status: z.ZodNativeEnum<typeof StatusIssue>;
-    controllerList: z.ZodString;
-    executorList: z.ZodString;
-    izdList: z.ZodString;
-    shopNeeds: z.ZodString;
-    fileArrModal: z.ZodString;
-    srok_control: z.ZodString;
-    id: z.ZodNumber;
-    name: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    status: StatusIssue;
-    id: number;
-    name: string;
-    description: string;
-    dateUse: string;
-    normTime: string;
-    sourse: string;
-    srok: string;
-    controllerList: string;
-    executorList: string;
-    srok_control: string;
-    izdList: string;
-    shopNeeds: string;
-    fileArrModal: string;
-}, {
-    status: StatusIssue;
-    id: number;
-    name: string;
-    description: string;
-    dateUse: string;
-    normTime: string;
-    sourse: string;
-    srok: string;
-    controllerList: string;
-    executorList: string;
-    srok_control: string;
-    izdList: string;
-    shopNeeds: string;
-    fileArrModal: string;
-}>;
-export type UpCreateIssueDtoType = z.infer<typeof UpCreateIssueDtoZod>;

package/dist/issue/dto/up-create-issue.dto.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UpCreateIssueDtoZod = void 0;
-const zod_1 = require("zod");
-const utils_1 = require("../../utils");
-exports.UpCreateIssueDtoZod = zod_1.z.object({
-    description: zod_1.z.string(),
-    dateUse: zod_1.z.string(),
-    normTime: zod_1.z.string(),
-    sourse: zod_1.z.string(),
-    srok: zod_1.z.string(),
-    status: zod_1.z.nativeEnum(utils_1.StatusIssue),
-    controllerList: zod_1.z.string(),
-    executorList: zod_1.z.string(),
-    izdList: zod_1.z.string(),
-    shopNeeds: zod_1.z.string(),
-    fileArrModal: zod_1.z.string(),
-    srok_control: zod_1.z.string(),
-    id: zod_1.z.number(),
-    name: zod_1.z.string()
-});

package/dist/issue/index.d.ts

@@ -1,5 +0,0 @@
-export * from './schemas/issue.schema';
-export * from './schemas/issue-user.schema';
-export * from './schemas/issue-user-controller.schema';
-export * from './interfaces/interface';
-export * from './dto/up-create-issue.dto';

package/dist/issue/interfaces/interface.d.ts

@@ -1,4 +0,0 @@
-export interface IIssueCreationAttrs {
-    name: string;
-    instans: number;
-}

package/dist/issue/schemas/issue-user-controller.schema.d.ts

@@ -1,15 +0,0 @@
-import { z } from 'zod';
-export declare const issueUserControllerSchema: z.ZodObject<{
-    id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
-    issueId: z.ZodNumber;
-    userId: z.ZodNumber;
-}, "strip", z.ZodTypeAny, {
-    userId: number;
-    issueId: number;
-    id?: number | null | undefined;
-}, {
-    userId: number;
-    issueId: number;
-    id?: number | null | undefined;
-}>;
-export type ModelIssueUserController = z.infer<typeof issueUserControllerSchema>;

package/dist/issue/schemas/issue-user-controller.schema.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.issueUserControllerSchema = void 0;
-const zod_1 = require("zod");
-exports.issueUserControllerSchema = zod_1.z.object({
-    id: zod_1.z.number().nullish(),
-    issueId: zod_1.z.number().int().positive(),
-    userId: zod_1.z.number().int().positive()
-});