@pksep/zod-shared 0.0.528 → 0.0.530

package/dist/utils/enums.d.ts

@@ -48,6 +48,7 @@ export declare enum StatusScladWorking {
 export declare enum statusShipment {
     all = "\u0412\u0441\u0435",
     order = "\u0417\u0430\u043A\u0430\u0437\u0430\u043D\u043E",
+    readyToShip = "\u0413\u043E\u0442\u043E\u0432\u043E \u043A \u043E\u0442\u0433\u0440\u0443\u0437\u043A\u0435",
     ban = "\u0423\u0434\u0430\u043B\u0435\u043D\u043E",
     done = "\u041E\u0442\u0433\u0440\u0443\u0436\u0435\u043D\u043E",
     overbue = "\u041F\u0440\u043E\u0441\u0440\u043E\u0447\u0435\u043D\u043E"
@@ -226,7 +227,7 @@ export declare enum WorkSpaceObject {
     inventary = "\u0418\u043D\u0432\u0435\u043D\u0442\u0430\u0440\u044C",
     inventary_type = "\u0422\u0438\u043F \u0438\u043D\u0432\u0435\u043D\u0442\u0430\u0440\u044F",
     inventary_p_type = "\u041F\u043E\u0434 \u0442\u0438\u043F \u0438\u043D\u0432\u0435\u043D\u0442\u0430\u0440\u044F",
-    material = "\u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B",
+    material = "\u041C\u0430\u0442\u0435\u0440\u0438\u0430\u043B",
     material_type = "\u0422\u0438\u043F \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u0430",
     material_p_type = "\u041F\u043E\u0434 \u0442\u0438\u043F \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u0430",
     issue = "\u0417\u0430\u0434\u0430\u0447\u0438",

package/dist/utils/enums.js

@@ -60,6 +60,7 @@ var statusShipment;
 (function (statusShipment) {
     statusShipment["all"] = "\u0412\u0441\u0435";
     statusShipment["order"] = "\u0417\u0430\u043A\u0430\u0437\u0430\u043D\u043E";
+    statusShipment["readyToShip"] = "\u0413\u043E\u0442\u043E\u0432\u043E \u043A \u043E\u0442\u0433\u0440\u0443\u0437\u043A\u0435";
     statusShipment["ban"] = "\u0423\u0434\u0430\u043B\u0435\u043D\u043E";
     statusShipment["done"] = "\u041E\u0442\u0433\u0440\u0443\u0436\u0435\u043D\u043E";
     statusShipment["overbue"] = "\u041F\u0440\u043E\u0441\u0440\u043E\u0447\u0435\u043D\u043E";
@@ -259,7 +260,7 @@ var WorkSpaceObject;
     WorkSpaceObject["inventary"] = "\u0418\u043D\u0432\u0435\u043D\u0442\u0430\u0440\u044C";
     WorkSpaceObject["inventary_type"] = "\u0422\u0438\u043F \u0438\u043D\u0432\u0435\u043D\u0442\u0430\u0440\u044F";
     WorkSpaceObject["inventary_p_type"] = "\u041F\u043E\u0434 \u0442\u0438\u043F \u0438\u043D\u0432\u0435\u043D\u0442\u0430\u0440\u044F";
-    WorkSpaceObject["material"] = "\u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B";
+    WorkSpaceObject["material"] = "\u041C\u0430\u0442\u0435\u0440\u0438\u0430\u043B";
     WorkSpaceObject["material_type"] = "\u0422\u0438\u043F \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u0430";
     WorkSpaceObject["material_p_type"] = "\u041F\u043E\u0434 \u0442\u0438\u043F \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u0430";
     WorkSpaceObject["issue"] = "\u0417\u0430\u0434\u0430\u0447\u0438";

package/dist/utils/methods.d.ts

@@ -60,7 +60,20 @@ export interface HolidayConfig {
      */
     skipDefaultJanuaryHolidays?: boolean;
 }
+export declare const WORK_DAY_START_HOUR = 5;
+export declare const WORK_DAY_END_HOUR = 13;
+export declare const WORK_DAY_END_MINUTE = 30;
 export declare const calculateEndDate: (startDate: Date, totalMinutes: number, config?: HolidayConfig) => Date;
+/**
+ * Возвращает время начала работы, вычитая рабочие минуты из конечной даты.
+ * Обратное направление по сравнению с calculateEndDate.
+ * Учитываются только рабочие часы (5:00-13:30 UTC, будни).
+ * @param endDate Конечная дата (от которой идем назад)
+ * @param totalMinutes Количество минут, которое нужно вычесть
+ * @param config Опциональная конфигурация праздников
+ * @returns Дата начала работы
+ */
+export declare const calculateStartDate: (endDate: Date, totalMinutes: number, config?: HolidayConfig) => Date;
 /**
  * Функция получает сущность и генерирует из него элемент спецификации
  * @param entity

package/dist/utils/methods.js

@@ -20,7 +20,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 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.calculateEndDate = exports.leftToDoByProductionTask = exports.calculateByMeasurementRate = void 0;
+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;
@@ -113,13 +113,12 @@ const leftToDoByProductionTask = (marks, myQuantity) => {
     return moreMinusNum(myQuantity - createByMarks);
 };
 exports.leftToDoByProductionTask = leftToDoByProductionTask;
+exports.WORK_DAY_START_HOUR = 5;
+exports.WORK_DAY_END_HOUR = 13;
+exports.WORK_DAY_END_MINUTE = 30;
 const calculateEndDate = (startDate, totalMinutes, config) => {
     let currentDate = new Date(startDate);
     let remainingMinutes = totalMinutes;
-    const workDayStartHour = 5;
-    const workDayHours = 8;
-    const workDayEndHour = workDayStartHour + workDayHours;
-    // Функция для проверки, является ли дата рабочим днем
     const isWorkDay = (date) => {
         var _a, _b;
         const dayOfWeek = date.getUTCDay();
@@ -129,7 +128,6 @@ const calculateEndDate = (startDate, totalMinutes, config) => {
         if (skipJanuary && month === 0 && day >= 1 && day <= 14) {
             return false;
         }
-        // Проверяем кастомные праздники из конфига
         if ((_b = config === null || config === void 0 ? void 0 : config.holidays) === null || _b === void 0 ? void 0 : _b.length) {
             const isHoliday = config.holidays.some(holiday => holiday.month === month && holiday.day === day);
             if (isHoliday) {
@@ -140,12 +138,12 @@ const calculateEndDate = (startDate, totalMinutes, config) => {
     };
     const getWorkDayStart = (date) => {
         const start = new Date(date);
-        start.setUTCHours(workDayStartHour, 0, 0, 0);
+        start.setUTCHours(exports.WORK_DAY_START_HOUR, 0, 0, 0);
         return start;
     };
     const getWorkDayEnd = (date) => {
         const end = new Date(date);
-        end.setUTCHours(workDayEndHour, 0, 0, 0);
+        end.setUTCHours(exports.WORK_DAY_END_HOUR, exports.WORK_DAY_END_MINUTE, 0, 0);
         return end;
     };
     const moveToNextWorkDay = (date) => {
@@ -153,7 +151,7 @@ const calculateEndDate = (startDate, totalMinutes, config) => {
         do {
             nextDay.setUTCDate(nextDay.getUTCDate() + 1);
         } while (!isWorkDay(nextDay));
-        nextDay.setUTCHours(workDayStartHour, 0, 0, 0);
+        nextDay.setUTCHours(exports.WORK_DAY_START_HOUR, 0, 0, 0);
         return nextDay;
     };
     if (!isWorkDay(currentDate)) {
@@ -163,12 +161,12 @@ const calculateEndDate = (startDate, totalMinutes, config) => {
         const currentHour = currentDate.getUTCHours();
         const currentMinutes = currentDate.getUTCMinutes();
         const currentTimeInMinutes = currentHour * 60 + currentMinutes;
-        const workDayStartInMinutes = workDayStartHour * 60;
-        const workDayEndInMinutes = workDayEndHour * 60;
+        const workDayStartInMinutes = exports.WORK_DAY_START_HOUR * 60;
+        const workDayEndInMinutes = exports.WORK_DAY_END_HOUR * 60 + exports.WORK_DAY_END_MINUTE;
         if (currentTimeInMinutes < workDayStartInMinutes) {
             currentDate = getWorkDayStart(currentDate);
         }
-        else if (currentTimeInMinutes >= workDayEndInMinutes) {
+        else if (currentTimeInMinutes > workDayEndInMinutes) {
             currentDate = moveToNextWorkDay(currentDate);
         }
     }
@@ -186,6 +184,83 @@ const calculateEndDate = (startDate, totalMinutes, config) => {
     return currentDate;
 };
 exports.calculateEndDate = calculateEndDate;
+/**
+ * Возвращает время начала работы, вычитая рабочие минуты из конечной даты.
+ * Обратное направление по сравнению с calculateEndDate.
+ * Учитываются только рабочие часы (5:00-13:30 UTC, будни).
+ * @param endDate Конечная дата (от которой идем назад)
+ * @param totalMinutes Количество минут, которое нужно вычесть
+ * @param config Опциональная конфигурация праздников
+ * @returns Дата начала работы
+ */
+const calculateStartDate = (endDate, totalMinutes, config) => {
+    let currentDate = new Date(endDate);
+    let remainingMinutes = totalMinutes;
+    const isWorkDay = (date) => {
+        var _a, _b;
+        const dayOfWeek = date.getUTCDay();
+        const month = date.getUTCMonth();
+        const day = date.getUTCDate();
+        const skipJanuary = (_a = config === null || config === void 0 ? void 0 : config.skipDefaultJanuaryHolidays) !== null && _a !== void 0 ? _a : true;
+        if (skipJanuary && month === 0 && day >= 1 && day <= 14) {
+            return false;
+        }
+        if ((_b = config === null || config === void 0 ? void 0 : config.holidays) === null || _b === void 0 ? void 0 : _b.length) {
+            const isHoliday = config.holidays.some(holiday => holiday.month === month && holiday.day === day);
+            if (isHoliday) {
+                return false;
+            }
+        }
+        return dayOfWeek !== 0 && dayOfWeek !== 6;
+    };
+    const getWorkDayStart = (date) => {
+        const start = new Date(date);
+        start.setUTCHours(exports.WORK_DAY_START_HOUR, 0, 0, 0);
+        return start;
+    };
+    const getWorkDayEnd = (date) => {
+        const end = new Date(date);
+        end.setUTCHours(exports.WORK_DAY_END_HOUR, exports.WORK_DAY_END_MINUTE, 0, 0);
+        return end;
+    };
+    const moveToPrevWorkDay = (date) => {
+        const prevDay = new Date(date);
+        do {
+            prevDay.setUTCDate(prevDay.getUTCDate() - 1);
+        } while (!isWorkDay(prevDay));
+        prevDay.setUTCHours(exports.WORK_DAY_END_HOUR, exports.WORK_DAY_END_MINUTE, 0, 0);
+        return prevDay;
+    };
+    if (!isWorkDay(currentDate)) {
+        currentDate = moveToPrevWorkDay(currentDate);
+    }
+    else {
+        const currentHour = currentDate.getUTCHours();
+        const currentMinutes = currentDate.getUTCMinutes();
+        const currentTimeInMinutes = currentHour * 60 + currentMinutes;
+        const workDayStartInMinutes = exports.WORK_DAY_START_HOUR * 60;
+        const workDayEndInMinutes = exports.WORK_DAY_END_HOUR * 60 + exports.WORK_DAY_END_MINUTE;
+        if (currentTimeInMinutes > workDayEndInMinutes) {
+            currentDate = getWorkDayEnd(currentDate);
+        }
+        else if (currentTimeInMinutes < workDayStartInMinutes) {
+            currentDate = moveToPrevWorkDay(currentDate);
+        }
+    }
+    while (remainingMinutes > 0) {
+        const workDayStart = getWorkDayStart(currentDate);
+        const availableMinutesToday = Math.min(remainingMinutes, (currentDate.getTime() - workDayStart.getTime()) / (1000 * 60));
+        if (availableMinutesToday > 0) {
+            currentDate = new Date(currentDate.getTime() - availableMinutesToday * 60 * 1000);
+            remainingMinutes -= availableMinutesToday;
+        }
+        if (remainingMinutes > 0) {
+            currentDate = moveToPrevWorkDay(currentDate);
+        }
+    }
+    return currentDate;
+};
+exports.calculateStartDate = calculateStartDate;
 /**
  * Функция получает сущность и генерирует из него элемент спецификации
  * @param entity
@@ -735,26 +810,31 @@ const countChildrensRelative = (data) => {
                     const characteristicValue = materialConverRate
                         ? Math.ceil(detalMass / materialConverRate)
                         : 0;
-                    const characteristicQuantity = characteristicValue
-                        ? characteristicValue
-                        : 0;
-                    if (characteristicQuantity)
-                        concatedMaterialLists.push({
-                            id: relative === null || relative === void 0 ? void 0 : relative.mat_zag,
-                            quantity: characteristicQuantity
-                        });
+                    const characteristicQuantity = characteristicValue || 0;
+                    // всегда добавляем материал, даже если количество = 0, чтобы не терять его в графе
+                    concatedMaterialLists.push({
+                        id: relative === null || relative === void 0 ? void 0 : relative.mat_zag,
+                        quantity: characteristicQuantity
+                    });
                 }
             }
             const materialMap = new Map();
             const materialsArray = concatedMaterialLists.map((listMaterialItem) => {
                 const foundedMaterials = materials.find(material => listMaterialItem.id === material.id);
+                //  если материал не найден, пропускаем
+                if (!foundedMaterials) {
+                    return null;
+                }
+                // проверяем: это реальный 0 или результат ошибки/расчета
+                const isZeroQuantity = listMaterialItem.quantity === 0;
                 //конвертируем потребность в ШТ
-                const materialConverRate = foundedMaterials
-                    ? (0, exports.calculateByMeasurementRate)(foundedMaterials.units_measurement, listMaterialItem.measureId)
-                    : 0;
-                const specificationConvertedQuantity = materialConverRate
-                    ? Math.ceil(listMaterialItem.quantity / materialConverRate)
-                    : 0;
+                const materialConverRate = (0, exports.calculateByMeasurementRate)(foundedMaterials.units_measurement, listMaterialItem.measureId);
+                // если количество 0, не пересчитываем, иначе - считаем как раньше
+                const specificationConvertedQuantity = isZeroQuantity
+                    ? 0
+                    : materialConverRate
+                        ? Math.ceil(listMaterialItem.quantity / materialConverRate)
+                        : 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) || '-' });

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

@@ -33,6 +33,7 @@ export type RelativesProductionTasksType = {
     relativeDescription: string;
     relativeId: number;
     startTime: Date;
+    calculateStartTime: Date | null;
     relativeType: string;
 };
 export type DateRangeType = {

package/dist/waybill/dto/create-waybill-product.dto.d.ts

@@ -6,7 +6,9 @@ export declare const CreateWaybillProductSchema: z.ZodObject<{
     quantity: z.ZodNumber;
     entityType: z.ZodNativeEnum<typeof PositionItemType>;
     workerType: z.ZodNativeEnum<typeof WaybilTypeComingEnums>;
-    sum: z.ZodOptional<z.ZodNumber>;
+    sum: z.ZodEffects<z.ZodOptional<z.ZodNumber>, number | undefined, unknown>;
+    deliveryId: z.ZodOptional<z.ZodNullable<z.ZodOptional<z.ZodNumber>>>;
+    deliveryPositionIndex: z.ZodOptional<z.ZodNullable<z.ZodOptional<z.ZodNumber>>>;
     productId: z.ZodOptional<z.ZodNullable<z.ZodOptional<z.ZodNumber>>>;
     toolsId: z.ZodOptional<z.ZodNullable<z.ZodOptional<z.ZodNumber>>>;
     cbedId: z.ZodOptional<z.ZodNullable<z.ZodOptional<z.ZodNumber>>>;
@@ -36,6 +38,8 @@ export declare const CreateWaybillProductSchema: z.ZodObject<{
     cbedId?: number | null | undefined;
     productId?: number | null | undefined;
     assembleId?: number | null | undefined;
+    deliveryId?: number | null | undefined;
+    deliveryPositionIndex?: number | null | undefined;
     toolsId?: number | null | undefined;
     inventaryId?: number | null | undefined;
     metalloworkingId?: number | null | undefined;
@@ -51,11 +55,13 @@ export declare const CreateWaybillProductSchema: z.ZodObject<{
     detalId?: number | null | undefined;
     equipmentId?: number | null | undefined;
     materialId?: number | null | undefined;
-    sum?: number | undefined;
+    sum?: unknown;
     instrumentId?: number | null | undefined;
     cbedId?: number | null | undefined;
     productId?: number | null | undefined;
     assembleId?: number | null | undefined;
+    deliveryId?: number | null | undefined;
+    deliveryPositionIndex?: number | null | undefined;
     toolsId?: number | null | undefined;
     inventaryId?: number | null | undefined;
     metalloworkingId?: number | null | undefined;

package/dist/waybill/dto/create-waybill-product.dto.js

@@ -8,7 +8,21 @@ exports.CreateWaybillProductSchema = zod_1.z.object({
     quantity: zod_1.z.number(),
     entityType: zod_1.z.nativeEnum(enum_1.PositionItemType),
     workerType: zod_1.z.nativeEnum(utils_1.WaybilTypeComingEnums),
-    sum: zod_1.z.number().optional(),
+    sum: zod_1.z.preprocess(val => {
+        if (val === '' || val === null || val === undefined)
+            return undefined;
+        if (typeof val === 'string') {
+            const normalizedValue = val.trim().replace(',', '.');
+            if (!normalizedValue.length)
+                return undefined;
+            const parsedValue = Number(normalizedValue);
+            if (!isNaN(parsedValue))
+                return parsedValue;
+        }
+        return val;
+    }, zod_1.z.number().optional()),
+    deliveryId: zod_1.z.number().optional().nullish(),
+    deliveryPositionIndex: zod_1.z.number().int().optional().nullish(),
     productId: zod_1.z.number().optional().nullish(),
     toolsId: zod_1.z.number().optional().nullish(),
     cbedId: zod_1.z.number().optional().nullish(),

package/dist/waybill/dto/create-waybill.dto.d.ts

@@ -2,12 +2,14 @@ import { z } from 'zod';
 import { WaybilTypeComingEnums } from '../../utils';
 export declare const CreateWaybillDtoZod: z.ZodObject<{
     materialId: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodNumber>>, number | null | undefined, unknown>;
-    providerId: z.ZodOptional<z.ZodNullable<z.ZodUnion<[z.ZodNumber, z.ZodString]>>>;
+    companyId: z.ZodOptional<z.ZodNullable<z.ZodUnion<[z.ZodNumber, z.ZodString]>>>;
     productList: z.ZodOptional<z.ZodArray<z.ZodObject<{
         quantity: z.ZodNumber;
         entityType: z.ZodNativeEnum<typeof import("..").PositionItemType>;
         workerType: z.ZodNativeEnum<typeof WaybilTypeComingEnums>;
-        sum: z.ZodOptional<z.ZodNumber>;
+        sum: z.ZodEffects<z.ZodOptional<z.ZodNumber>, number | undefined, unknown>;
+        deliveryId: z.ZodOptional<z.ZodNullable<z.ZodOptional<z.ZodNumber>>>;
+        deliveryPositionIndex: z.ZodOptional<z.ZodNullable<z.ZodOptional<z.ZodNumber>>>;
         productId: z.ZodOptional<z.ZodNullable<z.ZodOptional<z.ZodNumber>>>;
         toolsId: z.ZodOptional<z.ZodNullable<z.ZodOptional<z.ZodNumber>>>;
         cbedId: z.ZodOptional<z.ZodNullable<z.ZodOptional<z.ZodNumber>>>;
@@ -37,6 +39,8 @@ export declare const CreateWaybillDtoZod: z.ZodObject<{
         cbedId?: number | null | undefined;
         productId?: number | null | undefined;
         assembleId?: number | null | undefined;
+        deliveryId?: number | null | undefined;
+        deliveryPositionIndex?: number | null | undefined;
         toolsId?: number | null | undefined;
         inventaryId?: number | null | undefined;
         metalloworkingId?: number | null | undefined;
@@ -52,11 +56,13 @@ export declare const CreateWaybillDtoZod: z.ZodObject<{
         detalId?: number | null | undefined;
         equipmentId?: number | null | undefined;
         materialId?: number | null | undefined;
-        sum?: number | undefined;
+        sum?: unknown;
         instrumentId?: number | null | undefined;
         cbedId?: number | null | undefined;
         productId?: number | null | undefined;
         assembleId?: number | null | undefined;
+        deliveryId?: number | null | undefined;
+        deliveryPositionIndex?: number | null | undefined;
         toolsId?: number | null | undefined;
         inventaryId?: number | null | undefined;
         metalloworkingId?: number | null | undefined;
@@ -73,8 +79,8 @@ export declare const CreateWaybillDtoZod: z.ZodObject<{
     typeComing: WaybilTypeComingEnums;
     sclad?: boolean | null | undefined;
     materialId?: number | null | undefined;
-    providerId?: string | number | null | undefined;
     documentsIds?: number[] | null | undefined;
+    companyId?: string | number | null | undefined;
     productList?: {
         quantity: number;
         ezId: number;
@@ -89,6 +95,8 @@ export declare const CreateWaybillDtoZod: z.ZodObject<{
         cbedId?: number | null | undefined;
         productId?: number | null | undefined;
         assembleId?: number | null | undefined;
+        deliveryId?: number | null | undefined;
+        deliveryPositionIndex?: number | null | undefined;
         toolsId?: number | null | undefined;
         inventaryId?: number | null | undefined;
         metalloworkingId?: number | null | undefined;
@@ -101,8 +109,8 @@ export declare const CreateWaybillDtoZod: z.ZodObject<{
     typeComing: WaybilTypeComingEnums;
     sclad?: unknown;
     materialId?: unknown;
-    providerId?: string | number | null | undefined;
     documentsIds?: number[] | null | undefined;
+    companyId?: string | number | null | undefined;
     productList?: {
         quantity: number;
         ezId: number;
@@ -112,11 +120,13 @@ export declare const CreateWaybillDtoZod: z.ZodObject<{
         detalId?: number | null | undefined;
         equipmentId?: number | null | undefined;
         materialId?: number | null | undefined;
-        sum?: number | undefined;
+        sum?: unknown;
         instrumentId?: number | null | undefined;
         cbedId?: number | null | undefined;
         productId?: number | null | undefined;
         assembleId?: number | null | undefined;
+        deliveryId?: number | null | undefined;
+        deliveryPositionIndex?: number | null | undefined;
         toolsId?: number | null | undefined;
         inventaryId?: number | null | undefined;
         metalloworkingId?: number | null | undefined;

package/dist/waybill/dto/create-waybill.dto.js

@@ -6,7 +6,7 @@ const utils_1 = require("../../utils");
 const create_waybill_product_dto_1 = require("./create-waybill-product.dto");
 exports.CreateWaybillDtoZod = zod_1.z.object({
     materialId: zod_1.z.preprocess(val => typeof val === 'string' && parseInt(val, 10) ? parseInt(val, 10) : null, zod_1.z.number().nullable().optional()),
-    providerId: zod_1.z.union([zod_1.z.number(), zod_1.z.string()]).nullish(),
+    companyId: zod_1.z.union([zod_1.z.number(), zod_1.z.string()]).nullish(),
     productList: create_waybill_product_dto_1.CreateWaybillProductSchema.array().optional(),
     documentsIds: zod_1.z.number().array().nullable().optional(),
     description: zod_1.z.string(),

package/dist/waybill/interface/interface.d.ts

@@ -7,6 +7,7 @@ export interface IKitSelected {
 export interface IWaybillCreationAttr {
     readonly name: string;
     readonly type_сoming: string;
+    readonly company_id?: number;
 }
 export interface IWaybillProductCreate {
     quantity: number;

package/dist/waybill/schemas/waybill-product.schema.d.ts

@@ -39,20 +39,20 @@ export declare const WaybillProductSchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     id: number;
     quantity: number;
-    sum: number;
     waybill_id: number;
+    sum: number;
     entity_type: PositionItemType;
     worker_type: WaybilTypeComingEnums;
     description?: string | undefined;
     assemble_id?: number | null | undefined;
-    cbed_id?: number | null | undefined;
-    provider_id?: number | null | undefined;
-    inventary_id?: number | null | undefined;
     equipment_id?: number | null | undefined;
+    provider_id?: number | null | undefined;
     material_id?: number | null | undefined;
     instrument_id?: number | null | undefined;
     detal_id?: number | null | undefined;
+    cbed_id?: number | null | undefined;
     product_id?: number | null | undefined;
+    inventary_id?: number | null | undefined;
     metalloworking_id?: number | null | undefined;
     ez_id?: number | undefined;
     tools_id?: number | null | undefined;
@@ -61,20 +61,20 @@ export declare const WaybillProductSchema: z.ZodObject<{
 }, {
     id: number;
     quantity: number;
-    sum: number;
     waybill_id: number;
+    sum: number;
     entity_type: PositionItemType;
     worker_type: WaybilTypeComingEnums;
     description?: string | undefined;
     assemble_id?: number | null | undefined;
-    cbed_id?: number | null | undefined;
-    provider_id?: number | null | undefined;
-    inventary_id?: number | null | undefined;
     equipment_id?: number | null | undefined;
+    provider_id?: number | null | undefined;
     material_id?: number | null | undefined;
     instrument_id?: number | null | undefined;
     detal_id?: number | null | undefined;
+    cbed_id?: number | null | undefined;
     product_id?: number | null | undefined;
+    inventary_id?: number | null | undefined;
     metalloworking_id?: number | null | undefined;
     ez_id?: number | undefined;
     tools_id?: number | null | undefined;

package/dist/waybill/schemas/waybill.schema.d.ts

@@ -19,16 +19,16 @@ export declare const WaybillSchema: z.ZodObject<{
     name: string;
     type_сoming: WaybilTypeComingEnums;
     id?: number | null | undefined;
-    company_id?: number | undefined;
     createdAt?: string | Date | undefined;
+    company_id?: number | undefined;
 }, {
     name: string;
     type_сoming: WaybilTypeComingEnums;
     ban?: boolean | undefined;
     description?: string | undefined;
     id?: number | null | undefined;
-    company_id?: number | undefined;
     createdAt?: string | Date | undefined;
+    company_id?: number | undefined;
 }>;
 export type ModelWaybill = z.infer<typeof WaybillSchema> & {
     documents?: ModelDocuments[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pksep/zod-shared",
-  "version": "0.0.528",
+  "version": "0.0.530",
   "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/index.js

@@ -1,21 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./schemas/issue.schema"), exports);
-__exportStar(require("./schemas/issue-user.schema"), exports);
-__exportStar(require("./schemas/issue-user-controller.schema"), exports);
-__exportStar(require("./interfaces/interface"), exports);
-__exportStar(require("./dto/up-create-issue.dto"), exports);

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()
-});