@pksep/zod-shared 0.0.548 → 0.0.550

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

@@ -781,6 +781,8 @@ export declare const GetAssembleByOperationCountDtoZod: z.ZodObject<{
             type_сoming: z.ZodNativeEnum<typeof import("../..").WaybilTypeComingEnums>;
             createdAt: z.ZodOptional<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
             company_id: z.ZodOptional<z.ZodNumber>;
+            order_number: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+            order_date: z.ZodOptional<z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>>;
         }, "strip", z.ZodTypeAny, {
             ban: boolean;
             description: string;
@@ -789,6 +791,8 @@ export declare const GetAssembleByOperationCountDtoZod: z.ZodObject<{
             id?: number | null | undefined;
             createdAt?: string | Date | undefined;
             company_id?: number | undefined;
+            order_number?: string | null | undefined;
+            order_date?: string | Date | null | undefined;
         }, {
             name: string;
             type_сoming: import("../..").WaybilTypeComingEnums;
@@ -797,6 +801,8 @@ export declare const GetAssembleByOperationCountDtoZod: z.ZodObject<{
             id?: number | null | undefined;
             createdAt?: string | Date | undefined;
             company_id?: number | undefined;
+            order_number?: string | null | undefined;
+            order_date?: string | Date | null | undefined;
         }>, "many">>>>;
     }, "strip", z.ZodTypeAny, {
         status: import("../..").StatusScladWorking;
@@ -984,6 +990,8 @@ export declare const GetAssembleByOperationCountDtoZod: z.ZodObject<{
             id?: number | null | undefined;
             createdAt?: string | Date | undefined;
             company_id?: number | undefined;
+            order_number?: string | null | undefined;
+            order_date?: string | Date | null | undefined;
         }[] | null | undefined;
     }, {
         status: import("../..").StatusScladWorking;
@@ -1171,6 +1179,8 @@ export declare const GetAssembleByOperationCountDtoZod: z.ZodObject<{
             id?: number | null | undefined;
             createdAt?: string | Date | undefined;
             company_id?: number | undefined;
+            order_number?: string | null | undefined;
+            order_date?: string | Date | null | undefined;
         }[] | null | undefined;
     }>, "many">;
 }, "strip", z.ZodTypeAny, {
@@ -1361,6 +1371,8 @@ export declare const GetAssembleByOperationCountDtoZod: z.ZodObject<{
             id?: number | null | undefined;
             createdAt?: string | Date | undefined;
             company_id?: number | undefined;
+            order_number?: string | null | undefined;
+            order_date?: string | Date | null | undefined;
         }[] | null | undefined;
     }[];
 }, {
@@ -1550,6 +1562,8 @@ export declare const GetAssembleByOperationCountDtoZod: z.ZodObject<{
             id?: number | null | undefined;
             createdAt?: string | Date | undefined;
             company_id?: number | undefined;
+            order_number?: string | null | undefined;
+            order_date?: string | Date | null | undefined;
         }[] | null | undefined;
     }[];
     operationId?: number | null | undefined;

package/dist/assemble/interfaces/interfaces.d.ts

@@ -88,6 +88,7 @@ export interface ICreateMovementObject {
     detal_id?: number;
     cbed_id?: number;
     product_id?: number;
+    material_id?: number;
 }
 type KitsSelected = {
     id: number;

package/dist/assemble/schemas/assemble-coming.schema.d.ts

@@ -781,6 +781,8 @@ export declare const AssembleComingSchema: z.ZodObject<{
         type_сoming: z.ZodNativeEnum<typeof import("../..").WaybilTypeComingEnums>;
         createdAt: z.ZodOptional<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
         company_id: z.ZodOptional<z.ZodNumber>;
+        order_number: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+        order_date: z.ZodOptional<z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>>;
     }, "strip", z.ZodTypeAny, {
         ban: boolean;
         description: string;
@@ -789,6 +791,8 @@ export declare const AssembleComingSchema: z.ZodObject<{
         id?: number | null | undefined;
         createdAt?: string | Date | undefined;
         company_id?: number | undefined;
+        order_number?: string | null | undefined;
+        order_date?: string | Date | null | undefined;
     }, {
         name: string;
         type_сoming: import("../..").WaybilTypeComingEnums;
@@ -797,6 +801,8 @@ export declare const AssembleComingSchema: z.ZodObject<{
         id?: number | null | undefined;
         createdAt?: string | Date | undefined;
         company_id?: number | undefined;
+        order_number?: string | null | undefined;
+        order_date?: string | Date | null | undefined;
     }>, "many">>>>;
 } & {
     ava_path: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodObject<{
@@ -1012,6 +1018,8 @@ export declare const AssembleComingSchema: z.ZodObject<{
         id?: number | null | undefined;
         createdAt?: string | Date | undefined;
         company_id?: number | undefined;
+        order_number?: string | null | undefined;
+        order_date?: string | Date | null | undefined;
     }[] | null | undefined;
 }, {
     type: PositionItemType.product | PositionItemType.cbed;
@@ -1210,6 +1218,8 @@ export declare const AssembleComingSchema: z.ZodObject<{
         id?: number | null | undefined;
         createdAt?: string | Date | undefined;
         company_id?: number | undefined;
+        order_number?: string | null | undefined;
+        order_date?: string | Date | null | undefined;
     }[] | null | undefined;
 }>;
 export type ModelAssembleComing = z.infer<typeof AssembleComingSchema> & {

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

@@ -782,6 +782,8 @@ export declare const AssembleSchema: z.ZodObject<{
         type_сoming: z.ZodNativeEnum<typeof import("../../utils").WaybilTypeComingEnums>;
         createdAt: z.ZodOptional<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
         company_id: z.ZodOptional<z.ZodNumber>;
+        order_number: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+        order_date: z.ZodOptional<z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>>;
     }, "strip", z.ZodTypeAny, {
         ban: boolean;
         description: string;
@@ -790,6 +792,8 @@ export declare const AssembleSchema: z.ZodObject<{
         id?: number | null | undefined;
         createdAt?: string | Date | undefined;
         company_id?: number | undefined;
+        order_number?: string | null | undefined;
+        order_date?: string | Date | null | undefined;
     }, {
         name: string;
         type_сoming: import("../../utils").WaybilTypeComingEnums;
@@ -798,6 +802,8 @@ export declare const AssembleSchema: z.ZodObject<{
         id?: number | null | undefined;
         createdAt?: string | Date | undefined;
         company_id?: number | undefined;
+        order_number?: string | null | undefined;
+        order_date?: string | Date | null | undefined;
     }>, "many">>>>;
 }, "strip", z.ZodTypeAny, {
     status: StatusScladWorking;
@@ -985,6 +991,8 @@ export declare const AssembleSchema: z.ZodObject<{
         id?: number | null | undefined;
         createdAt?: string | Date | undefined;
         company_id?: number | undefined;
+        order_number?: string | null | undefined;
+        order_date?: string | Date | null | undefined;
     }[] | null | undefined;
 }, {
     status: StatusScladWorking;
@@ -1172,6 +1180,8 @@ export declare const AssembleSchema: z.ZodObject<{
         id?: number | null | undefined;
         createdAt?: string | Date | undefined;
         company_id?: number | undefined;
+        order_number?: string | null | undefined;
+        order_date?: string | Date | null | undefined;
     }[] | null | undefined;
 }>;
 export type ModelAssemble = z.infer<typeof AssembleSchema> & {

package/dist/assemble-kit/dto/assemble-kit-paginate.dto.d.ts

@@ -17,10 +17,10 @@ export declare const AssembleKitPaginateDtoZod: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     status: string;
     responsibleId: number | null;
+    offset: number;
     isShowDeactivate: boolean;
     productIds: number[];
     searchStr: string;
-    offset: number;
     currentPage: number;
     sortKitCount: string;
     cbedsIds: number[];
@@ -30,8 +30,8 @@ export declare const AssembleKitPaginateDtoZod: z.ZodObject<{
     assemblyId?: number | null | undefined;
 }, {
     status: string;
-    searchStr: string;
     offset: number;
+    searchStr: string;
     currentPage: number;
     sortKitCount: string;
     responsibleId?: number | null | undefined;

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

@@ -4,6 +4,7 @@ export declare const DeliveryPositionListItemSchema: z.ZodObject<{
     entityId: z.ZodNumber;
     type: z.ZodNativeEnum<typeof EnumEntityDeliveryItem>;
     ezId: z.ZodNumber;
+    plannedDeliveryDate: z.ZodOptional<z.ZodString>;
     shipped: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
     quantity: z.ZodNumber;
     sum: z.ZodNumber;
@@ -18,6 +19,7 @@ export declare const DeliveryPositionListItemSchema: z.ZodObject<{
     ezId: number;
     sum: number;
     coming: number;
+    plannedDeliveryDate?: string | undefined;
 }, {
     type: EnumEntityDeliveryItem;
     description: string;
@@ -27,6 +29,7 @@ export declare const DeliveryPositionListItemSchema: z.ZodObject<{
     sum: number;
     coming: number;
     shipped?: number | undefined;
+    plannedDeliveryDate?: string | undefined;
 }>;
 export declare const CreateDeliveriesDtoZod: z.ZodObject<{
     companyId: z.ZodNumber;
@@ -37,6 +40,7 @@ export declare const CreateDeliveriesDtoZod: z.ZodObject<{
         entityId: z.ZodNumber;
         type: z.ZodNativeEnum<typeof EnumEntityDeliveryItem>;
         ezId: z.ZodNumber;
+        plannedDeliveryDate: z.ZodOptional<z.ZodString>;
         shipped: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
         quantity: z.ZodNumber;
         sum: z.ZodNumber;
@@ -51,6 +55,7 @@ export declare const CreateDeliveriesDtoZod: z.ZodObject<{
         ezId: number;
         sum: number;
         coming: number;
+        plannedDeliveryDate?: string | undefined;
     }, {
         type: EnumEntityDeliveryItem;
         description: string;
@@ -60,6 +65,7 @@ export declare const CreateDeliveriesDtoZod: z.ZodObject<{
         sum: number;
         coming: number;
         shipped?: number | undefined;
+        plannedDeliveryDate?: string | undefined;
     }>, "many">;
     documentsIds: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodNumber, "many">>>;
     dateShipments: z.ZodString;
@@ -79,6 +85,7 @@ export declare const CreateDeliveriesDtoZod: z.ZodObject<{
         ezId: number;
         sum: number;
         coming: number;
+        plannedDeliveryDate?: string | undefined;
     }[];
     dateShipments: string;
     documentsIds?: number[] | null | undefined;
@@ -97,8 +104,186 @@ export declare const CreateDeliveriesDtoZod: z.ZodObject<{
         sum: number;
         coming: number;
         shipped?: number | undefined;
+        plannedDeliveryDate?: string | undefined;
     }[];
     dateShipments: string;
     documentsIds?: number[] | null | undefined;
 }>;
 export type CreateDeliveriesDtoZodType = z.infer<typeof CreateDeliveriesDtoZod>;
+export declare const CreateDeliveryPositionDtoZod: z.ZodEffects<z.ZodObject<Omit<{
+    id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    deliveryId: z.ZodNumber;
+    entityType: z.ZodNativeEnum<typeof EnumEntityDeliveryItem>;
+    materialId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    equipmentId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    instrumentId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    inventaryId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    unitMeasurementId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    orderedQuantity: z.ZodNumber;
+    receivedQuantity: z.ZodDefault<z.ZodNumber>;
+    plannedDeliveryDate: z.ZodDate;
+    totalAmount: z.ZodDefault<z.ZodNumber>;
+    description: z.ZodDefault<z.ZodString>;
+    createdAt: z.ZodOptional<z.ZodString>;
+    updatedAt: z.ZodOptional<z.ZodString>;
+}, "id" | "createdAt" | "updatedAt" | "plannedDeliveryDate" | "deliveryId" | "receivedQuantity"> & {
+    plannedDeliveryDate: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    description: string;
+    plannedDeliveryDate: string;
+    entityType: EnumEntityDeliveryItem;
+    orderedQuantity: number;
+    totalAmount: number;
+    equipmentId?: number | null | undefined;
+    materialId?: number | null | undefined;
+    instrumentId?: number | null | undefined;
+    inventaryId?: number | null | undefined;
+    unitMeasurementId?: number | null | undefined;
+}, {
+    plannedDeliveryDate: string;
+    entityType: EnumEntityDeliveryItem;
+    orderedQuantity: number;
+    description?: string | undefined;
+    equipmentId?: number | null | undefined;
+    materialId?: number | null | undefined;
+    instrumentId?: number | null | undefined;
+    inventaryId?: number | null | undefined;
+    unitMeasurementId?: number | null | undefined;
+    totalAmount?: number | undefined;
+}>, {
+    description: string;
+    plannedDeliveryDate: string;
+    entityType: EnumEntityDeliveryItem;
+    orderedQuantity: number;
+    totalAmount: number;
+    equipmentId?: number | null | undefined;
+    materialId?: number | null | undefined;
+    instrumentId?: number | null | undefined;
+    inventaryId?: number | null | undefined;
+    unitMeasurementId?: number | null | undefined;
+}, {
+    plannedDeliveryDate: string;
+    entityType: EnumEntityDeliveryItem;
+    orderedQuantity: number;
+    description?: string | undefined;
+    equipmentId?: number | null | undefined;
+    materialId?: number | null | undefined;
+    instrumentId?: number | null | undefined;
+    inventaryId?: number | null | undefined;
+    unitMeasurementId?: number | null | undefined;
+    totalAmount?: number | undefined;
+}>;
+export declare const CreateDeliveriesByPositionsDtoZod: z.ZodObject<{
+    companyId: z.ZodNumber;
+    numberCheck: z.ZodString;
+    nds: z.ZodNumber;
+    count: z.ZodNumber;
+    positions: z.ZodArray<z.ZodEffects<z.ZodObject<Omit<{
+        id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        deliveryId: z.ZodNumber;
+        entityType: z.ZodNativeEnum<typeof EnumEntityDeliveryItem>;
+        materialId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        equipmentId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        instrumentId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        inventaryId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        unitMeasurementId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        orderedQuantity: z.ZodNumber;
+        receivedQuantity: z.ZodDefault<z.ZodNumber>;
+        plannedDeliveryDate: z.ZodDate;
+        totalAmount: z.ZodDefault<z.ZodNumber>;
+        description: z.ZodDefault<z.ZodString>;
+        createdAt: z.ZodOptional<z.ZodString>;
+        updatedAt: z.ZodOptional<z.ZodString>;
+    }, "id" | "createdAt" | "updatedAt" | "plannedDeliveryDate" | "deliveryId" | "receivedQuantity"> & {
+        plannedDeliveryDate: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        description: string;
+        plannedDeliveryDate: string;
+        entityType: EnumEntityDeliveryItem;
+        orderedQuantity: number;
+        totalAmount: number;
+        equipmentId?: number | null | undefined;
+        materialId?: number | null | undefined;
+        instrumentId?: number | null | undefined;
+        inventaryId?: number | null | undefined;
+        unitMeasurementId?: number | null | undefined;
+    }, {
+        plannedDeliveryDate: string;
+        entityType: EnumEntityDeliveryItem;
+        orderedQuantity: number;
+        description?: string | undefined;
+        equipmentId?: number | null | undefined;
+        materialId?: number | null | undefined;
+        instrumentId?: number | null | undefined;
+        inventaryId?: number | null | undefined;
+        unitMeasurementId?: number | null | undefined;
+        totalAmount?: number | undefined;
+    }>, {
+        description: string;
+        plannedDeliveryDate: string;
+        entityType: EnumEntityDeliveryItem;
+        orderedQuantity: number;
+        totalAmount: number;
+        equipmentId?: number | null | undefined;
+        materialId?: number | null | undefined;
+        instrumentId?: number | null | undefined;
+        inventaryId?: number | null | undefined;
+        unitMeasurementId?: number | null | undefined;
+    }, {
+        plannedDeliveryDate: string;
+        entityType: EnumEntityDeliveryItem;
+        orderedQuantity: number;
+        description?: string | undefined;
+        equipmentId?: number | null | undefined;
+        materialId?: number | null | undefined;
+        instrumentId?: number | null | undefined;
+        inventaryId?: number | null | undefined;
+        unitMeasurementId?: number | null | undefined;
+        totalAmount?: number | undefined;
+    }>, "many">;
+    documentsIds: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodNumber, "many">>>;
+    dateShipments: z.ZodString;
+    description: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    description: string;
+    count: number;
+    nds: number;
+    companyId: number;
+    numberCheck: string;
+    dateShipments: string;
+    positions: {
+        description: string;
+        plannedDeliveryDate: string;
+        entityType: EnumEntityDeliveryItem;
+        orderedQuantity: number;
+        totalAmount: number;
+        equipmentId?: number | null | undefined;
+        materialId?: number | null | undefined;
+        instrumentId?: number | null | undefined;
+        inventaryId?: number | null | undefined;
+        unitMeasurementId?: number | null | undefined;
+    }[];
+    documentsIds?: number[] | null | undefined;
+}, {
+    description: string;
+    count: number;
+    nds: number;
+    companyId: number;
+    numberCheck: string;
+    dateShipments: string;
+    positions: {
+        plannedDeliveryDate: string;
+        entityType: EnumEntityDeliveryItem;
+        orderedQuantity: number;
+        description?: string | undefined;
+        equipmentId?: number | null | undefined;
+        materialId?: number | null | undefined;
+        instrumentId?: number | null | undefined;
+        inventaryId?: number | null | undefined;
+        unitMeasurementId?: number | null | undefined;
+        totalAmount?: number | undefined;
+    }[];
+    documentsIds?: number[] | null | undefined;
+}>;
+export type CreateDeliveryPositionDtoZodType = z.infer<typeof CreateDeliveryPositionDtoZod>;
+export type CreateDeliveriesByPositionsDtoZodType = z.infer<typeof CreateDeliveriesByPositionsDtoZod>;

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

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreateDeliveriesDtoZod = exports.DeliveryPositionListItemSchema = void 0;
+exports.CreateDeliveriesByPositionsDtoZod = exports.CreateDeliveryPositionDtoZod = exports.CreateDeliveriesDtoZod = exports.DeliveryPositionListItemSchema = void 0;
 const zod_1 = require("zod");
 const utils_1 = require("../../utils");
+const deliveries_position_schema_1 = require("../schemas/deliveries-position.schema");
 exports.DeliveryPositionListItemSchema = zod_1.z.object({
     entityId: zod_1.z.number(),
     type: zod_1.z.nativeEnum(utils_1.EnumEntityDeliveryItem),
     ezId: zod_1.z.number(),
+    plannedDeliveryDate: zod_1.z.string().datetime({ offset: true }).optional(),
     shipped: zod_1.z.number().optional().default(0),
     quantity: zod_1.z.number(),
     sum: zod_1.z.number(),
@@ -23,3 +25,70 @@ exports.CreateDeliveriesDtoZod = zod_1.z.object({
     dateShipments: zod_1.z.string(),
     description: zod_1.z.string()
 });
+exports.CreateDeliveryPositionDtoZod = deliveries_position_schema_1.DeliveryPositionSchema.omit({
+    id: true,
+    deliveryId: true,
+    receivedQuantity: true,
+    plannedDeliveryDate: true,
+    createdAt: true,
+    updatedAt: true
+})
+    .extend({
+    plannedDeliveryDate: zod_1.z.string()
+})
+    .superRefine((position, ctx) => {
+    const entityIds = [
+        position.materialId,
+        position.equipmentId,
+        position.instrumentId,
+        position.inventaryId
+    ].filter(value => Number(value) > 0);
+    if (entityIds.length !== 1) {
+        ctx.addIssue({
+            code: zod_1.z.ZodIssueCode.custom,
+            message: 'Для позиции заказа должна быть указана ровно одна сущность'
+        });
+    }
+    if (position.entityType === utils_1.EnumEntityDeliveryItem.material &&
+        !position.materialId) {
+        ctx.addIssue({
+            code: zod_1.z.ZodIssueCode.custom,
+            path: ['materialId'],
+            message: 'Для материала должен быть указан materialId'
+        });
+    }
+    if (position.entityType === utils_1.EnumEntityDeliveryItem.equipment &&
+        !position.equipmentId) {
+        ctx.addIssue({
+            code: zod_1.z.ZodIssueCode.custom,
+            path: ['equipmentId'],
+            message: 'Для оборудования должен быть указан equipmentId'
+        });
+    }
+    if (position.entityType === utils_1.EnumEntityDeliveryItem.instrument &&
+        !position.instrumentId) {
+        ctx.addIssue({
+            code: zod_1.z.ZodIssueCode.custom,
+            path: ['instrumentId'],
+            message: 'Для инструмента должен быть указан instrumentId'
+        });
+    }
+    if (position.entityType === utils_1.EnumEntityDeliveryItem.inventary &&
+        !position.inventaryId) {
+        ctx.addIssue({
+            code: zod_1.z.ZodIssueCode.custom,
+            path: ['inventaryId'],
+            message: 'Для инвентаря должен быть указан inventaryId'
+        });
+    }
+});
+exports.CreateDeliveriesByPositionsDtoZod = zod_1.z.object({
+    companyId: zod_1.z.number(),
+    numberCheck: zod_1.z.string(),
+    nds: zod_1.z.number(),
+    count: zod_1.z.number(),
+    positions: exports.CreateDeliveryPositionDtoZod.array(),
+    documentsIds: zod_1.z.array(zod_1.z.number().int()).nullish(),
+    dateShipments: zod_1.z.string(),
+    description: zod_1.z.string()
+});

package/dist/deliveries/schemas/deliveries-position.schema.d.ts

@@ -1,32 +1,52 @@
 import { z } from 'zod';
+import { EnumEntityDeliveryItem } from '../../utils';
 export declare const DeliveryPositionSchema: z.ZodObject<{
-    id: z.ZodNumber;
-    art: z.ZodString;
-    name: z.ZodString;
-    type: z.ZodString;
-    ez: z.ZodNumber;
-    kol: z.ZodNumber;
-    coming: z.ZodNumber;
-    sum: z.ZodNumber;
-    description: z.ZodString;
+    id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    deliveryId: z.ZodNumber;
+    entityType: z.ZodNativeEnum<typeof EnumEntityDeliveryItem>;
+    materialId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    equipmentId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    instrumentId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    inventaryId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    unitMeasurementId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    orderedQuantity: z.ZodNumber;
+    receivedQuantity: z.ZodDefault<z.ZodNumber>;
+    plannedDeliveryDate: z.ZodDate;
+    totalAmount: z.ZodDefault<z.ZodNumber>;
+    description: z.ZodDefault<z.ZodString>;
+    createdAt: z.ZodOptional<z.ZodString>;
+    updatedAt: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    type: string;
     description: string;
-    id: number;
-    name: string;
-    kol: number;
-    sum: number;
-    coming: number;
-    art: string;
-    ez: number;
+    plannedDeliveryDate: Date;
+    entityType: EnumEntityDeliveryItem;
+    deliveryId: number;
+    orderedQuantity: number;
+    receivedQuantity: number;
+    totalAmount: number;
+    id?: number | null | undefined;
+    createdAt?: string | undefined;
+    equipmentId?: number | null | undefined;
+    materialId?: number | null | undefined;
+    updatedAt?: string | undefined;
+    instrumentId?: number | null | undefined;
+    inventaryId?: number | null | undefined;
+    unitMeasurementId?: number | null | undefined;
 }, {
-    type: string;
-    description: string;
-    id: number;
-    name: string;
-    kol: number;
-    sum: number;
-    coming: number;
-    art: string;
-    ez: number;
+    plannedDeliveryDate: Date;
+    entityType: EnumEntityDeliveryItem;
+    deliveryId: number;
+    orderedQuantity: number;
+    description?: string | undefined;
+    id?: number | null | undefined;
+    createdAt?: string | undefined;
+    equipmentId?: number | null | undefined;
+    materialId?: number | null | undefined;
+    updatedAt?: string | undefined;
+    instrumentId?: number | null | undefined;
+    inventaryId?: number | null | undefined;
+    unitMeasurementId?: number | null | undefined;
+    receivedQuantity?: number | undefined;
+    totalAmount?: number | undefined;
 }>;
+export type ModelDeliveryPosition = z.infer<typeof DeliveryPositionSchema>;

package/dist/deliveries/schemas/deliveries-position.schema.js

@@ -2,14 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeliveryPositionSchema = void 0;
 const zod_1 = require("zod");
+const utils_1 = require("../../utils");
 exports.DeliveryPositionSchema = zod_1.z.object({
-    id: zod_1.z.number(),
-    art: zod_1.z.string(),
-    name: zod_1.z.string(),
-    type: zod_1.z.string(),
-    ez: zod_1.z.number(),
-    kol: zod_1.z.number(),
-    coming: zod_1.z.number(),
-    sum: zod_1.z.number(),
-    description: zod_1.z.string()
+    id: zod_1.z.number().nullish(),
+    deliveryId: zod_1.z.number().int().positive(),
+    entityType: zod_1.z.nativeEnum(utils_1.EnumEntityDeliveryItem),
+    materialId: zod_1.z.number().int().positive().nullish(),
+    equipmentId: zod_1.z.number().int().positive().nullish(),
+    instrumentId: zod_1.z.number().int().positive().nullish(),
+    inventaryId: zod_1.z.number().int().positive().nullish(),
+    unitMeasurementId: zod_1.z.number().int().positive().nullish(),
+    orderedQuantity: zod_1.z.number(),
+    receivedQuantity: zod_1.z.number().default(0),
+    plannedDeliveryDate: zod_1.z.date(),
+    totalAmount: zod_1.z.number().default(0),
+    description: zod_1.z.string().default(''),
+    createdAt: zod_1.z.string().optional(),
+    updatedAt: zod_1.z.string().optional()
 });

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

@@ -1,6 +1,5 @@
 import { z } from 'zod';
-import { DELIVERY_POSITION_LIST, EnumStatusDelivery } from '../../utils';
-import { ModelProviders } from '../../provider';
+import { DELIVERY_POSITION_LIST, EnumStatusDelivery, EnumStatusOrder } from '../../utils';
 import { ModelDocuments } from '../../document';
 import { ModelMaterial } from '../../material';
 import { ModelNameInstrument } from '../../instrument';
@@ -18,7 +17,6 @@ export declare const DeliveriesSchema: z.ZodObject<{
     delivery_position_list: z.ZodOptional<z.ZodType<DELIVERY_POSITION_LIST, z.ZodTypeDef, DELIVERY_POSITION_LIST>>;
     description: z.ZodOptional<z.ZodString>;
     ban: z.ZodDefault<z.ZodBoolean>;
-    provider_id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
     company_id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
     createdAt: z.ZodOptional<z.ZodString>;
     updatedAt: z.ZodOptional<z.ZodString>;
@@ -31,7 +29,6 @@ export declare const DeliveriesSchema: z.ZodObject<{
     number_order?: string | undefined;
     number_check?: string | undefined;
     createdAt?: string | undefined;
-    provider_id?: number | null | undefined;
     count?: number | undefined;
     date_shipments?: Date | undefined;
     delivery_position_list?: DELIVERY_POSITION_LIST | undefined;
@@ -45,7 +42,6 @@ export declare const DeliveriesSchema: z.ZodObject<{
     number_order?: string | undefined;
     number_check?: string | undefined;
     createdAt?: string | undefined;
-    provider_id?: number | null | undefined;
     count?: number | undefined;
     date_shipments?: Date | undefined;
     nds?: number | undefined;
@@ -54,7 +50,6 @@ export declare const DeliveriesSchema: z.ZodObject<{
     updatedAt?: string | undefined;
 }>;
 export type ModelDeliveries = z.infer<typeof DeliveriesSchema> & {
-    provider?: ModelProviders;
     documents?: ModelDocuments[];
     materials?: ModelMaterial[];
     tools?: ModelNameInstrument[];
@@ -62,3 +57,7 @@ export type ModelDeliveries = z.infer<typeof DeliveriesSchema> & {
     inventary?: ModelInventary[];
     company?: ModelCompany;
 };
+export interface IModelDeliveriesExtended extends ModelDeliveries {
+    status_computed: EnumStatusOrder | null;
+    positions_count?: number;
+}

package/dist/deliveries/schemas/deliveries.schema.js

@@ -14,7 +14,6 @@ exports.DeliveriesSchema = zod_1.z.object({
     delivery_position_list: zod_1.z.custom().optional(),
     description: zod_1.z.string().optional(),
     ban: zod_1.z.boolean().default(false),
-    provider_id: zod_1.z.number().nullish(),
     company_id: zod_1.z.number().nullish(),
     createdAt: zod_1.z.string().optional(),
     updatedAt: zod_1.z.string().optional()