@pksep/zod-shared 0.0.529 → 0.0.530

package/dist/action/schemas/actions.schema.d.ts

@@ -23,6 +23,7 @@ import { ModelRole } from '../../role';
 import { ModelProductionTask } from '../../production-tasks';
 import { ModelContact } from '../../contact';
 import { ModelCompany } from '../../company';
+import { ModelRevision } from '../../sclad';
 export declare const ActionsSchema: z.ZodObject<{
     id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
     responsible_id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
@@ -58,6 +59,7 @@ export declare const ActionsSchema: z.ZodObject<{
     parent_action_idL: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
     production_task_id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
     createdAt: z.ZodOptional<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
+    revision_id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
 }, "strip", z.ZodTypeAny, {
     ban: boolean;
     action: IActionText[];
@@ -93,6 +95,7 @@ export declare const ActionsSchema: z.ZodObject<{
     parent_action_idL?: number | null | undefined;
     production_task_id?: number | null | undefined;
     createdAt?: string | Date | undefined;
+    revision_id?: number | null | undefined;
 }, {
     action: IActionText[];
     type_object: string;
@@ -128,6 +131,7 @@ export declare const ActionsSchema: z.ZodObject<{
     parent_action_idL?: number | null | undefined;
     production_task_id?: number | null | undefined;
     createdAt?: string | Date | undefined;
+    revision_id?: number | null | undefined;
 }>;
 export type ModelActions = z.infer<typeof ActionsSchema> & {
     child_actions?: ModelActions[];
@@ -158,4 +162,5 @@ export type ModelActions = z.infer<typeof ActionsSchema> & {
     type_operation?: ModelTypeOperation;
     contact?: ModelContact;
     company?: ModelCompany;
+    revision?: ModelRevision;
 };

package/dist/action/schemas/actions.schema.js

@@ -36,5 +36,6 @@ exports.ActionsSchema = zod_1.z.object({
     role_id: zod_1.z.number().nullish(),
     parent_action_idL: zod_1.z.number().nullable().optional(),
     production_task_id: zod_1.z.number().nullish(),
-    createdAt: zod_1.z.union([zod_1.z.date(), zod_1.z.string()]).optional()
+    createdAt: zod_1.z.union([zod_1.z.date(), zod_1.z.string()]).optional(),
+    revision_id: zod_1.z.number().nullish()
 });

package/dist/company/dto/companies-pagination.dto.d.ts

@@ -5,6 +5,7 @@ export declare const companiesPaginationDtoZod: z.ZodObject<{
     isSortedByAttention: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     isSortedByDate: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     filterByTypes: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodNativeEnum<typeof import("../enums/enums").DtoEnumCompanyType>, "many">>>;
+    isFilteredByInboundSupplier: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     isBan: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     filterByEntities: z.ZodOptional<z.ZodObject<{
         materialIds: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>>;
@@ -29,6 +30,7 @@ export declare const companiesPaginationDtoZod: z.ZodObject<{
     isSortedByDate: boolean;
     isBan: boolean;
     filterByTypes: import("../enums/enums").DtoEnumCompanyType[];
+    isFilteredByInboundSupplier: boolean;
     filterByEntities?: {
         equipmentIds: number[];
         materialIds: number[];
@@ -42,6 +44,7 @@ export declare const companiesPaginationDtoZod: z.ZodObject<{
     isSortedByDate?: boolean | undefined;
     isBan?: boolean | undefined;
     filterByTypes?: import("../enums/enums").DtoEnumCompanyType[] | undefined;
+    isFilteredByInboundSupplier?: boolean | undefined;
     filterByEntities?: {
         equipmentIds?: number[] | undefined;
         materialIds?: number[] | undefined;

package/dist/company/dto/companies-pagination.dto.js

@@ -9,6 +9,7 @@ exports.companiesPaginationDtoZod = zod_1.z.object({
     isSortedByAttention: zod_1.z.boolean().optional().default(false),
     isSortedByDate: zod_1.z.boolean().optional().default(false),
     filterByTypes: zod_1.z.array(enums_1.EnumDtoCompanyTypeZod).optional().default([]),
+    isFilteredByInboundSupplier: zod_1.z.boolean().optional().default(false),
     isBan: zod_1.z.boolean().optional().default(false),
     filterByEntities: zod_1.z
         .object({

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

@@ -375,6 +375,7 @@ export declare const EquipmentSchema: z.ZodObject<{
         parent_action_idL: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
         production_task_id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
         createdAt: z.ZodOptional<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
+        revision_id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
     }, "strip", z.ZodTypeAny, {
         ban: boolean;
         action: import("../../action").IActionText[];
@@ -410,6 +411,7 @@ export declare const EquipmentSchema: z.ZodObject<{
         parent_action_idL?: number | null | undefined;
         production_task_id?: number | null | undefined;
         createdAt?: string | Date | undefined;
+        revision_id?: number | null | undefined;
     }, {
         action: import("../../action").IActionText[];
         type_object: string;
@@ -445,6 +447,7 @@ export declare const EquipmentSchema: z.ZodObject<{
         parent_action_idL?: number | null | undefined;
         production_task_id?: number | null | undefined;
         createdAt?: string | Date | undefined;
+        revision_id?: number | null | undefined;
     }>, "many">>;
 }, "strip", z.ZodTypeAny, {
     ban: boolean;
@@ -591,6 +594,7 @@ export declare const EquipmentSchema: z.ZodObject<{
         parent_action_idL?: number | null | undefined;
         production_task_id?: number | null | undefined;
         createdAt?: string | Date | undefined;
+        revision_id?: number | null | undefined;
     }[] | undefined;
     nameInstrument?: any[] | undefined;
     equipmentType?: any;
@@ -737,6 +741,7 @@ export declare const EquipmentSchema: z.ZodObject<{
         parent_action_idL?: number | null | undefined;
         production_task_id?: number | null | undefined;
         createdAt?: string | Date | undefined;
+        revision_id?: number | null | undefined;
     }[] | undefined;
     price?: number | undefined;
     delivery_ordered?: number | undefined;

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

@@ -309,6 +309,7 @@ export declare const MovingSchema: z.ZodObject<{
             parent_action_idL: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
             production_task_id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
             createdAt: z.ZodOptional<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
+            revision_id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
         }, "strip", z.ZodTypeAny, {
             ban: boolean;
             action: import("../..").IActionText[];
@@ -344,6 +345,7 @@ export declare const MovingSchema: z.ZodObject<{
             parent_action_idL?: number | null | undefined;
             production_task_id?: number | null | undefined;
             createdAt?: string | Date | undefined;
+            revision_id?: number | null | undefined;
         }, {
             action: import("../..").IActionText[];
             type_object: string;
@@ -379,6 +381,7 @@ export declare const MovingSchema: z.ZodObject<{
             parent_action_idL?: number | null | undefined;
             production_task_id?: number | null | undefined;
             createdAt?: string | Date | undefined;
+            revision_id?: number | null | undefined;
         }>, "many">;
         responsibleForProduct: z.ZodArray<z.ZodObject<{
             id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
@@ -691,6 +694,7 @@ export declare const MovingSchema: z.ZodObject<{
             parent_action_idL?: number | null | undefined;
             production_task_id?: number | null | undefined;
             createdAt?: string | Date | undefined;
+            revision_id?: number | null | undefined;
         }[];
         responsibleForProduct: {
             ban: boolean;
@@ -884,6 +888,7 @@ export declare const MovingSchema: z.ZodObject<{
             parent_action_idL?: number | null | undefined;
             production_task_id?: number | null | undefined;
             createdAt?: string | Date | undefined;
+            revision_id?: number | null | undefined;
         }[];
         responsibleForProduct: {
             designation: string | null;
@@ -1174,6 +1179,7 @@ export declare const MovingSchema: z.ZodObject<{
             parent_action_idL?: number | null | undefined;
             production_task_id?: number | null | undefined;
             createdAt?: string | Date | undefined;
+            revision_id?: number | null | undefined;
         }[];
         responsibleForProduct: {
             ban: boolean;
@@ -1395,6 +1401,7 @@ export declare const MovingSchema: z.ZodObject<{
             parent_action_idL?: number | null | undefined;
             production_task_id?: number | null | undefined;
             createdAt?: string | Date | undefined;
+            revision_id?: number | null | undefined;
         }[];
         responsibleForProduct: {
             designation: string | null;

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

@@ -319,6 +319,7 @@ export interface IGetActualRelative {
     product_id: number | null;
     production_task_id: number;
     start_time: Date;
+    calculate_start_time: Date;
     tech_process_id: number;
 }
 export interface IRelativeIds {

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

@@ -0,0 +1,19 @@
+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;
+        }[];
+    };
+}

package/dist/production-tasks/schemas/operation-positions.schema.d.ts

@@ -17,6 +17,7 @@ export declare const OperationPositionSchema: z.ZodObject<{
     count_created: z.ZodDefault<z.ZodNumber>;
     plan_ready_time: z.ZodOptional<z.ZodNullable<z.ZodDate>>;
     is_relevance: z.ZodDefault<z.ZodBoolean>;
+    calculate_start_time: z.ZodOptional<z.ZodNullable<z.ZodDate>>;
     createdAt: z.ZodDate;
     updatedAt: z.ZodDate;
 }, "strip", z.ZodTypeAny, {
@@ -35,6 +36,7 @@ export declare const OperationPositionSchema: z.ZodObject<{
     detal_idx?: number | undefined;
     production_operation_pos_id?: number | null | undefined;
     plan_ready_time?: Date | null | undefined;
+    calculate_start_time?: Date | null | undefined;
 }, {
     id: number;
     createdAt: Date;
@@ -51,6 +53,7 @@ export declare const OperationPositionSchema: z.ZodObject<{
     count_created?: number | undefined;
     plan_ready_time?: Date | null | undefined;
     is_relevance?: boolean | undefined;
+    calculate_start_time?: Date | null | undefined;
 }>;
 export type ModelOperationPosition = z.infer<typeof OperationPositionSchema> & {
     responsibleUser?: ModelUser;

package/dist/production-tasks/schemas/operation-positions.schema.js

@@ -16,6 +16,7 @@ exports.OperationPositionSchema = zod_1.z.object({
     count_created: zod_1.z.number().int().nonnegative().default(0),
     plan_ready_time: zod_1.z.date().nullish(),
     is_relevance: zod_1.z.boolean().default(true),
+    calculate_start_time: zod_1.z.date().nullish(),
     createdAt: zod_1.z.date(),
     updatedAt: zod_1.z.date()
 });

package/dist/rack/dto/get-all-racks.dto.d.ts

@@ -1,9 +1,12 @@
 import { z } from 'zod';
 export declare const getAllRacksSchemaDto: z.ZodObject<{
     page: z.ZodNumber;
+    searchString: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     page: number;
+    searchString?: string | undefined;
 }, {
     page: number;
+    searchString?: string | undefined;
 }>;
 export type GetAllRacksDto = z.infer<typeof getAllRacksSchemaDto>;

package/dist/rack/dto/get-all-racks.dto.js

@@ -3,5 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllRacksSchemaDto = void 0;
 const zod_1 = require("zod");
 exports.getAllRacksSchemaDto = zod_1.z.object({
-    page: zod_1.z.number().int().describe('страница пагинации')
+    page: zod_1.z.number().int().describe('страница пагинации'),
+    searchString: zod_1.z.string().optional().describe('поиск')
 });

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

@@ -305,6 +305,7 @@ export declare const RoleSchema: z.ZodObject<{
             parent_action_idL: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
             production_task_id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
             createdAt: z.ZodOptional<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
+            revision_id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
         }, "strip", z.ZodTypeAny, {
             ban: boolean;
             action: import("../..").IActionText[];
@@ -340,6 +341,7 @@ export declare const RoleSchema: z.ZodObject<{
             parent_action_idL?: number | null | undefined;
             production_task_id?: number | null | undefined;
             createdAt?: string | Date | undefined;
+            revision_id?: number | null | undefined;
         }, {
             action: import("../..").IActionText[];
             type_object: string;
@@ -375,6 +377,7 @@ export declare const RoleSchema: z.ZodObject<{
             parent_action_idL?: number | null | undefined;
             production_task_id?: number | null | undefined;
             createdAt?: string | Date | undefined;
+            revision_id?: number | null | undefined;
         }>, "many">;
         responsibleForProduct: z.ZodArray<z.ZodObject<{
             id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
@@ -687,6 +690,7 @@ export declare const RoleSchema: z.ZodObject<{
             parent_action_idL?: number | null | undefined;
             production_task_id?: number | null | undefined;
             createdAt?: string | Date | undefined;
+            revision_id?: number | null | undefined;
         }[];
         responsibleForProduct: {
             ban: boolean;
@@ -880,6 +884,7 @@ export declare const RoleSchema: z.ZodObject<{
             parent_action_idL?: number | null | undefined;
             production_task_id?: number | null | undefined;
             createdAt?: string | Date | undefined;
+            revision_id?: number | null | undefined;
         }[];
         responsibleForProduct: {
             designation: string | null;
@@ -1097,6 +1102,7 @@ export declare const RoleSchema: z.ZodObject<{
             parent_action_idL?: number | null | undefined;
             production_task_id?: number | null | undefined;
             createdAt?: string | Date | undefined;
+            revision_id?: number | null | undefined;
         }[];
         responsibleForProduct: {
             ban: boolean;
@@ -1295,6 +1301,7 @@ export declare const RoleSchema: z.ZodObject<{
             parent_action_idL?: number | null | undefined;
             production_task_id?: number | null | undefined;
             createdAt?: string | Date | undefined;
+            revision_id?: number | null | undefined;
         }[];
         responsibleForProduct: {
             designation: string | null;

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

@@ -303,6 +303,7 @@ export declare const UserSchema: z.ZodObject<{
         parent_action_idL: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
         production_task_id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
         createdAt: z.ZodOptional<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
+        revision_id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
     }, "strip", z.ZodTypeAny, {
         ban: boolean;
         action: import("../..").IActionText[];
@@ -338,6 +339,7 @@ export declare const UserSchema: z.ZodObject<{
         parent_action_idL?: number | null | undefined;
         production_task_id?: number | null | undefined;
         createdAt?: string | Date | undefined;
+        revision_id?: number | null | undefined;
     }, {
         action: import("../..").IActionText[];
         type_object: string;
@@ -373,6 +375,7 @@ export declare const UserSchema: z.ZodObject<{
         parent_action_idL?: number | null | undefined;
         production_task_id?: number | null | undefined;
         createdAt?: string | Date | undefined;
+        revision_id?: number | null | undefined;
     }>, "many">;
     responsibleForProduct: z.ZodArray<z.ZodObject<{
         id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
@@ -685,6 +688,7 @@ export declare const UserSchema: z.ZodObject<{
         parent_action_idL?: number | null | undefined;
         production_task_id?: number | null | undefined;
         createdAt?: string | Date | undefined;
+        revision_id?: number | null | undefined;
     }[];
     responsibleForProduct: {
         ban: boolean;
@@ -878,6 +882,7 @@ export declare const UserSchema: z.ZodObject<{
         parent_action_idL?: number | null | undefined;
         production_task_id?: number | null | undefined;
         createdAt?: string | Date | undefined;
+        revision_id?: number | null | undefined;
     }[];
     responsibleForProduct: {
         designation: string | null;

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"

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";

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;