@pksep/zod-shared 0.0.557 → 0.0.558

package/dist/assemble/dto/get-assemble-pagination-sclad.dto.d.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { IFiltersByByOrder, IFiltersByParents } from '../../production-tasks';
-import { AssembleIzdEnum } from '../../utils';
+import { AssembleIzdEnum, WarehouseReadinessDateFilterEnum } from '../../utils';
 export declare const GetAssembleScladPaginationDtoZod: z.ZodObject<{
     page: z.ZodNumber;
     searchString: z.ZodString;
@@ -9,6 +9,7 @@ export declare const GetAssembleScladPaginationDtoZod: z.ZodObject<{
     type: z.ZodDefault<z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof AssembleIzdEnum>>>>;
     byOrder: z.ZodOptional<z.ZodNullable<z.ZodType<IFiltersByByOrder, z.ZodTypeDef, IFiltersByByOrder>>>;
     isDiscontinued: z.ZodDefault<z.ZodOptional<z.ZodNullable<z.ZodBoolean>>>;
+    warehouseReadinessDateFilter: z.ZodOptional<z.ZodNativeEnum<typeof WarehouseReadinessDateFilterEnum>>;
     sort: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
         sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof import("../../utils").ProductionPlanSortField>>>;
         sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -29,6 +30,7 @@ export declare const GetAssembleScladPaginationDtoZod: z.ZodObject<{
     searchString: string;
     isDiscontinued: boolean | null;
     responsibleUserId?: number | null | undefined;
+    warehouseReadinessDateFilter?: WarehouseReadinessDateFilterEnum | undefined;
     byParents?: IFiltersByParents | null | undefined;
     byOrder?: IFiltersByByOrder | null | undefined;
 }, {
@@ -41,6 +43,7 @@ export declare const GetAssembleScladPaginationDtoZod: z.ZodObject<{
     }[] | undefined;
     responsibleUserId?: number | null | undefined;
     isDiscontinued?: boolean | null | undefined;
+    warehouseReadinessDateFilter?: WarehouseReadinessDateFilterEnum | undefined;
     byParents?: IFiltersByParents | null | undefined;
     byOrder?: IFiltersByByOrder | null | undefined;
 }>;

package/dist/assemble/dto/get-assemble-pagination-sclad.dto.js

@@ -11,5 +11,8 @@ exports.GetAssembleScladPaginationDtoZod = zod_1.z.object({
     type: zod_1.z.nativeEnum(utils_1.AssembleIzdEnum).nullish().default(utils_1.AssembleIzdEnum.all),
     byOrder: zod_1.z.custom().nullable().optional(),
     isDiscontinued: zod_1.z.boolean().nullable().optional().default(false),
+    warehouseReadinessDateFilter: zod_1.z
+        .nativeEnum(utils_1.WarehouseReadinessDateFilterEnum)
+        .optional(),
     sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
 });

package/dist/cbed/dto/get-deficit.dto.d.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { statusWorkingsDeficit } from '../../utils';
+import { statusWorkingsDeficit, WarehouseReadinessDateFilterEnum } from '../../utils';
 export declare const GetDeficitDtoZod: z.ZodObject<{
     cbedIds: z.ZodArray<z.ZodNumber, "many">;
     page: z.ZodNullable<z.ZodOptional<z.ZodNumber>>;
@@ -17,6 +17,7 @@ export declare const GetDeficitDtoZod: z.ZodObject<{
         sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
         sortDesc?: boolean | undefined;
     }>, "many">>>;
+    warehouseReadinessDateFilter: z.ZodOptional<z.ZodNativeEnum<typeof WarehouseReadinessDateFilterEnum>>;
 }, "strip", z.ZodTypeAny, {
     sort: {
         sortDesc: boolean;
@@ -28,6 +29,7 @@ export declare const GetDeficitDtoZod: z.ZodObject<{
     cbedIds: number[];
     page?: number | null | undefined;
     shipmentIds?: number[] | null | undefined;
+    warehouseReadinessDateFilter?: WarehouseReadinessDateFilterEnum | undefined;
 }, {
     searchString: string;
     statusWorking: statusWorkingsDeficit;
@@ -39,5 +41,6 @@ export declare const GetDeficitDtoZod: z.ZodObject<{
     page?: number | null | undefined;
     isDiscontinued?: boolean | null | undefined;
     shipmentIds?: number[] | null | undefined;
+    warehouseReadinessDateFilter?: WarehouseReadinessDateFilterEnum | undefined;
 }>;
 export type GetDeficitDtoZodType = z.infer<typeof GetDeficitDtoZod>;

package/dist/cbed/dto/get-deficit.dto.js

@@ -10,5 +10,8 @@ exports.GetDeficitDtoZod = zod_1.z.object({
     searchString: zod_1.z.string(),
     shipmentIds: zod_1.z.array(zod_1.z.number()).nullable().optional(),
     isDiscontinued: zod_1.z.boolean().nullable().optional().default(false),
-    sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
+    sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([]),
+    warehouseReadinessDateFilter: zod_1.z
+        .nativeEnum(utils_1.WarehouseReadinessDateFilterEnum)
+        .optional()
 });

package/dist/detal/dto/get-deficit.dto.d.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { statusWorkingsDeficit } from '../../utils';
+import { statusWorkingsDeficit, WarehouseReadinessDateFilterEnum } from '../../utils';
 export declare const GetDetalDeficitDtoZod: z.ZodObject<{
     detalIds: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>>;
     statusWorking: z.ZodDefault<z.ZodOptional<z.ZodNativeEnum<typeof statusWorkingsDeficit>>>;
@@ -17,6 +17,7 @@ export declare const GetDetalDeficitDtoZod: z.ZodObject<{
         sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
         sortDesc?: boolean | undefined;
     }>, "many">>>;
+    warehouseReadinessDateFilter: z.ZodOptional<z.ZodNativeEnum<typeof WarehouseReadinessDateFilterEnum>>;
 }, "strip", z.ZodTypeAny, {
     sort: {
         sortDesc: boolean;
@@ -28,6 +29,7 @@ export declare const GetDetalDeficitDtoZod: z.ZodObject<{
     detalIds: number[];
     statusWorking: statusWorkingsDeficit;
     shipmentIds: number[] | null;
+    warehouseReadinessDateFilter?: WarehouseReadinessDateFilterEnum | undefined;
 }, {
     page: number;
     sort?: {
@@ -39,5 +41,6 @@ export declare const GetDetalDeficitDtoZod: z.ZodObject<{
     detalIds?: number[] | undefined;
     statusWorking?: statusWorkingsDeficit | undefined;
     shipmentIds?: number[] | null | undefined;
+    warehouseReadinessDateFilter?: WarehouseReadinessDateFilterEnum | undefined;
 }>;
 export type GetDetalDeficitDtoType = z.infer<typeof GetDetalDeficitDtoZod>;

package/dist/detal/dto/get-deficit.dto.js

@@ -13,5 +13,8 @@ exports.GetDetalDeficitDtoZod = zod_1.z.object({
     shipmentIds: zod_1.z.number().int().array().optional().nullable().default(null),
     page: zod_1.z.number().int(),
     isDiscontinued: zod_1.z.boolean().optional().default(false),
-    sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
+    sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([]),
+    warehouseReadinessDateFilter: zod_1.z
+        .nativeEnum(utils_1.WarehouseReadinessDateFilterEnum)
+        .optional()
 });

package/dist/material/dto/get-deficit.dto.d.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { statusWorkingsDeficit } from '../../utils';
+import { statusWorkingsDeficit, WarehouseReadinessDateFilterEnum } from '../../utils';
 export declare enum MaterialDeficitSortField {
     plannedDeliveryDate = "plannedDeliveryDate"
 }
@@ -32,6 +32,7 @@ export declare const GetMaterialDeficitDtoZod: z.ZodObject<{
         sortField?: MaterialDeficitSortField | null | undefined;
         sortDesc?: boolean | undefined;
     }>, "many">>>;
+    warehouseReadinessDateFilter: z.ZodOptional<z.ZodNativeEnum<typeof WarehouseReadinessDateFilterEnum>>;
 }, "strip", z.ZodTypeAny, {
     sort: {
         sortDesc: boolean;
@@ -44,6 +45,7 @@ export declare const GetMaterialDeficitDtoZod: z.ZodObject<{
     materialIds: number[];
     typeMaterialIds: number[];
     subTypeMaterialIds: number[];
+    warehouseReadinessDateFilter?: WarehouseReadinessDateFilterEnum | undefined;
 }, {
     page: number;
     sort?: {
@@ -53,6 +55,7 @@ export declare const GetMaterialDeficitDtoZod: z.ZodObject<{
     searchString?: string | undefined;
     statusWorking?: statusWorkingsDeficit | undefined;
     shipmentIds?: number[] | null | undefined;
+    warehouseReadinessDateFilter?: WarehouseReadinessDateFilterEnum | undefined;
     materialIds?: number[] | undefined;
     typeMaterialIds?: number[] | undefined;
     subTypeMaterialIds?: number[] | undefined;

package/dist/material/dto/get-deficit.dto.js

@@ -22,5 +22,8 @@ exports.GetMaterialDeficitDtoZod = zod_1.z.object({
     searchString: zod_1.z.string().optional().default(''),
     shipmentIds: zod_1.z.number().int().array().optional().nullable().default(null),
     page: zod_1.z.number().int(),
-    sort: zod_1.z.array(exports.MaterialDeficitSortRuleSchema).optional().default([])
+    sort: zod_1.z.array(exports.MaterialDeficitSortRuleSchema).optional().default([]),
+    warehouseReadinessDateFilter: zod_1.z
+        .nativeEnum(utils_1.WarehouseReadinessDateFilterEnum)
+        .optional()
 });

package/dist/metaloworking/dto/get-metallworking-pagination.dto.d.ts

@@ -1,4 +1,5 @@
 import { z } from 'zod';
+import { WarehouseReadinessDateFilterEnum } from '../../utils';
 import { IFiltersByByOrder, IFiltersByParents } from '../../production-tasks';
 export declare const GetMetaloworkingPaginationDtoZod: z.ZodObject<{
     page: z.ZodNumber;
@@ -10,6 +11,7 @@ export declare const GetMetaloworkingPaginationDtoZod: z.ZodObject<{
     byOrder: z.ZodOptional<z.ZodNullable<z.ZodType<IFiltersByByOrder, z.ZodTypeDef, IFiltersByByOrder>>>;
     childrenByProductionTaskIds: z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>>;
     isDiscontinued: z.ZodDefault<z.ZodOptional<z.ZodNullable<z.ZodBoolean>>>;
+    warehouseReadinessDateFilter: z.ZodOptional<z.ZodNativeEnum<typeof WarehouseReadinessDateFilterEnum>>;
     sort: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
         sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof import("../../utils").ProductionPlanSortField>>>;
         sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -30,6 +32,7 @@ export declare const GetMetaloworkingPaginationDtoZod: z.ZodObject<{
     isBan: boolean;
     isDiscontinued: boolean | null;
     responsibleUserId?: number | null | undefined;
+    warehouseReadinessDateFilter?: WarehouseReadinessDateFilterEnum | undefined;
     byParents?: IFiltersByParents | null | undefined;
     byOrder?: IFiltersByByOrder | null | undefined;
     childrenByProductionTaskIds?: number[] | null | undefined;
@@ -44,6 +47,7 @@ export declare const GetMetaloworkingPaginationDtoZod: z.ZodObject<{
     }[] | undefined;
     responsibleUserId?: number | null | undefined;
     isDiscontinued?: boolean | null | undefined;
+    warehouseReadinessDateFilter?: WarehouseReadinessDateFilterEnum | undefined;
     byParents?: IFiltersByParents | null | undefined;
     byOrder?: IFiltersByByOrder | null | undefined;
     childrenByProductionTaskIds?: number[] | null | undefined;

package/dist/metaloworking/dto/get-metallworking-pagination.dto.js

@@ -13,5 +13,8 @@ exports.GetMetaloworkingPaginationDtoZod = zod_1.z.object({
     byOrder: zod_1.z.custom().nullable().optional(),
     childrenByProductionTaskIds: zod_1.z.array(zod_1.z.number()).optional().nullable(),
     isDiscontinued: zod_1.z.boolean().nullable().optional().default(false),
+    warehouseReadinessDateFilter: zod_1.z
+        .nativeEnum(utils_1.WarehouseReadinessDateFilterEnum)
+        .optional(),
     sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
 });

package/dist/operations/dto/create-type-operation.dto.d.ts

@@ -2,19 +2,19 @@ import { z } from 'zod';
 import { WorkStartCalcType } from '../enums/enums';
 export declare const CreateTypeOperationSchema: z.ZodObject<{
     name: z.ZodString;
-    preTime: z.ZodBoolean;
-    helperTime: z.ZodBoolean;
-    mainTime: z.ZodBoolean;
-    cpu: z.ZodBoolean;
-    square: z.ZodBoolean;
-    list: z.ZodBoolean;
+    preTime: z.ZodDefault<z.ZodBoolean>;
+    helperTime: z.ZodDefault<z.ZodBoolean>;
+    mainTime: z.ZodDefault<z.ZodBoolean>;
+    cpu: z.ZodDefault<z.ZodBoolean>;
+    square: z.ZodDefault<z.ZodBoolean>;
+    list: z.ZodDefault<z.ZodBoolean>;
     users: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodNumber, "many">>>;
     equipmentIds: z.ZodDefault<z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodNumber, "many">>>>;
-    metaloworking: z.ZodBoolean;
-    assembly: z.ZodBoolean;
-    sclad: z.ZodBoolean;
-    preTimeMinute: z.ZodNumber;
-    helperTimeMinute: z.ZodNumber;
+    metaloworking: z.ZodDefault<z.ZodBoolean>;
+    assembly: z.ZodDefault<z.ZodBoolean>;
+    sclad: z.ZodDefault<z.ZodBoolean>;
+    preTimeMinute: z.ZodDefault<z.ZodNumber>;
+    helperTimeMinute: z.ZodDefault<z.ZodNumber>;
     workStartCalcType: z.ZodDefault<z.ZodNativeEnum<typeof WorkStartCalcType>>;
 }, "strip", z.ZodTypeAny, {
     metaloworking: boolean;
@@ -33,20 +33,20 @@ export declare const CreateTypeOperationSchema: z.ZodObject<{
     helperTimeMinute: number;
     users?: number[] | null | undefined;
 }, {
-    metaloworking: boolean;
     name: string;
-    preTime: boolean;
-    helperTime: boolean;
-    mainTime: boolean;
-    cpu: boolean;
-    square: boolean;
-    list: boolean;
-    assembly: boolean;
-    sclad: boolean;
-    preTimeMinute: number;
-    helperTimeMinute: number;
+    metaloworking?: boolean | undefined;
     users?: number[] | null | undefined;
+    preTime?: boolean | undefined;
+    helperTime?: boolean | undefined;
+    mainTime?: boolean | undefined;
+    cpu?: boolean | undefined;
+    square?: boolean | undefined;
+    list?: boolean | undefined;
     workStartCalcType?: WorkStartCalcType | undefined;
     equipmentIds?: number[] | null | undefined;
+    assembly?: boolean | undefined;
+    sclad?: boolean | undefined;
+    preTimeMinute?: number | undefined;
+    helperTimeMinute?: number | undefined;
 }>;
 export type CreateTypeOperationDto = z.infer<typeof CreateTypeOperationSchema>;

package/dist/operations/dto/create-type-operation.dto.js

@@ -4,20 +4,20 @@ exports.CreateTypeOperationSchema = void 0;
 const zod_1 = require("zod");
 const enums_1 = require("../enums/enums");
 exports.CreateTypeOperationSchema = zod_1.z.object({
-    name: zod_1.z.string(),
-    preTime: zod_1.z.boolean(),
-    helperTime: zod_1.z.boolean(),
-    mainTime: zod_1.z.boolean(),
-    cpu: zod_1.z.boolean(),
-    square: zod_1.z.boolean(),
-    list: zod_1.z.boolean(),
+    name: zod_1.z.string().trim().min(1),
+    preTime: zod_1.z.boolean().default(false),
+    helperTime: zod_1.z.boolean().default(false),
+    mainTime: zod_1.z.boolean().default(false),
+    cpu: zod_1.z.boolean().default(false),
+    square: zod_1.z.boolean().default(false),
+    list: zod_1.z.boolean().default(false),
     users: zod_1.z.number().array().nullable().optional(),
     equipmentIds: zod_1.z.array(zod_1.z.number()).nullish().default([]),
-    metaloworking: zod_1.z.boolean(),
-    assembly: zod_1.z.boolean(),
-    sclad: zod_1.z.boolean(),
-    preTimeMinute: zod_1.z.number(),
-    helperTimeMinute: zod_1.z.number(),
+    metaloworking: zod_1.z.boolean().default(false),
+    assembly: zod_1.z.boolean().default(false),
+    sclad: zod_1.z.boolean().default(false),
+    preTimeMinute: zod_1.z.number().default(0),
+    helperTimeMinute: zod_1.z.number().default(0),
     workStartCalcType: zod_1.z
         .nativeEnum(enums_1.WorkStartCalcType)
         .default(enums_1.WorkStartCalcType.automatic)

package/dist/product/dto/get-deficit.dto.d.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { statusWorkingsDeficit } from '../../utils';
+import { statusWorkingsDeficit, WarehouseReadinessDateFilterEnum } from '../../utils';
 export declare const GetDeficitProductSchema: z.ZodObject<{
     productIds: z.ZodArray<z.ZodNumber, "many">;
     statusWorking: z.ZodNativeEnum<typeof statusWorkingsDeficit>;
@@ -17,6 +17,7 @@ export declare const GetDeficitProductSchema: z.ZodObject<{
         sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
         sortDesc?: boolean | undefined;
     }>, "many">>>;
+    warehouseReadinessDateFilter: z.ZodOptional<z.ZodNativeEnum<typeof WarehouseReadinessDateFilterEnum>>;
 }, "strip", z.ZodTypeAny, {
     sort: {
         sortDesc: boolean;
@@ -28,6 +29,7 @@ export declare const GetDeficitProductSchema: z.ZodObject<{
     productIds: number[];
     page?: number | undefined;
     shipmentIds?: number[] | null | undefined;
+    warehouseReadinessDateFilter?: WarehouseReadinessDateFilterEnum | undefined;
 }, {
     searchString: string;
     statusWorking: statusWorkingsDeficit;
@@ -39,5 +41,6 @@ export declare const GetDeficitProductSchema: z.ZodObject<{
     page?: number | undefined;
     isDiscontinued?: boolean | null | undefined;
     shipmentIds?: number[] | null | undefined;
+    warehouseReadinessDateFilter?: WarehouseReadinessDateFilterEnum | undefined;
 }>;
 export type GetDeficitProductDtoType = z.infer<typeof GetDeficitProductSchema>;

package/dist/product/dto/get-deficit.dto.js

@@ -10,5 +10,8 @@ exports.GetDeficitProductSchema = zod_1.z.object({
     shipmentIds: zod_1.z.number().int().array().optional().nullable(),
     page: zod_1.z.number().int().optional(),
     isDiscontinued: zod_1.z.boolean().nullable().optional().default(false),
-    sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
+    sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([]),
+    warehouseReadinessDateFilter: zod_1.z
+        .nativeEnum(utils_1.WarehouseReadinessDateFilterEnum)
+        .optional()
 });

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

@@ -133,6 +133,9 @@ export interface IgetTaskByOperations {
         ordered: number;
         typeOperationId: number;
         firstPlanReadyDate: Date | null;
+        prevOperation?: ITaskByOperations | null;
+        nextOperation?: ITaskByOperations | null;
+        nextOperationCalculateNeedsTime?: Date | null;
     };
 }
 export interface ITaskByOperations {
@@ -157,6 +160,7 @@ export interface ITaskByOperations {
     planReadyTime: Date;
     name: string;
     fullName: string;
+    calculateNeedsTime?: Date | null;
 }
 export interface IGetDeficitsDetalByProductionTask {
     detalId: number;

package/dist/production-tasks/schemas/orders-summary-by-entity.schema.d.ts

@@ -21,8 +21,10 @@ export declare const OrdersSummaryShipmentZod: z.ZodObject<{
     parentPTQuantity: z.ZodNullable<z.ZodNumber>;
     parentPTNeed: z.ZodNullable<z.ZodNumber>;
     parentWarehouseReadinessDate: z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
+    parentReadinessDate: z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
     shipmentNumber: z.ZodNullable<z.ZodString>;
     shipmentWarehouseReadinessDate: z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
+    shipmentReadinessDate: z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
     quantity: z.ZodNumber;
     requiredReadyDate: z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
 }, "strip", z.ZodTypeAny, {
@@ -33,8 +35,10 @@ export declare const OrdersSummaryShipmentZod: z.ZodObject<{
     parentPTQuantity: number | null;
     parentPTNeed: number | null;
     parentWarehouseReadinessDate: string | Date | null;
+    parentReadinessDate: string | Date | null;
     shipmentNumber: string | null;
     shipmentWarehouseReadinessDate: string | Date | null;
+    shipmentReadinessDate: string | Date | null;
 }, {
     quantity: number;
     shipmentId: number | null;
@@ -43,8 +47,10 @@ export declare const OrdersSummaryShipmentZod: z.ZodObject<{
     parentPTQuantity: number | null;
     parentPTNeed: number | null;
     parentWarehouseReadinessDate: string | Date | null;
+    parentReadinessDate: string | Date | null;
     shipmentNumber: string | null;
     shipmentWarehouseReadinessDate: string | Date | null;
+    shipmentReadinessDate: string | Date | null;
 }>;
 export declare const OrdersSummaryStockOrderZod: z.ZodObject<{
     stockOrderItemId: z.ZodNumber;
@@ -77,8 +83,10 @@ export declare const OrdersSummaryDemandRowZod: z.ZodObject<{
     parentPTQuantity: z.ZodNullable<z.ZodNumber>;
     parentPTNeed: z.ZodNullable<z.ZodNumber>;
     parentWarehouseReadinessDate: z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
+    parentReadinessDate: z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
     shipmentNumber: z.ZodNullable<z.ZodString>;
     shipmentWarehouseReadinessDate: z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
+    shipmentReadinessDate: z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
     quantityByShipment: z.ZodNullable<z.ZodNumber>;
     shipmentNeed: z.ZodNullable<z.ZodNumber>;
     demandQuantity: z.ZodNumber;
@@ -92,8 +100,10 @@ export declare const OrdersSummaryDemandRowZod: z.ZodObject<{
     parentPTQuantity: number | null;
     parentPTNeed: number | null;
     parentWarehouseReadinessDate: string | Date | null;
+    parentReadinessDate: string | Date | null;
     shipmentNumber: string | null;
     shipmentWarehouseReadinessDate: string | Date | null;
+    shipmentReadinessDate: string | Date | null;
     quantityByProductionTask: number;
     quantityByShipment: number | null;
     shipmentNeed: number | null;
@@ -107,8 +117,10 @@ export declare const OrdersSummaryDemandRowZod: z.ZodObject<{
     parentPTQuantity: number | null;
     parentPTNeed: number | null;
     parentWarehouseReadinessDate: string | Date | null;
+    parentReadinessDate: string | Date | null;
     shipmentNumber: string | null;
     shipmentWarehouseReadinessDate: string | Date | null;
+    shipmentReadinessDate: string | Date | null;
     quantityByProductionTask: number;
     quantityByShipment: number | null;
     shipmentNeed: number | null;
@@ -124,8 +136,10 @@ export declare const OrdersSummaryByEntityRowZod: z.ZodObject<{
     parentPTQuantity: z.ZodNullable<z.ZodNumber>;
     parentPTNeed: z.ZodNullable<z.ZodNumber>;
     parentWarehouseReadinessDate: z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
+    parentReadinessDate: z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
     shipmentNumber: z.ZodNullable<z.ZodString>;
     shipmentWarehouseReadinessDate: z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
+    shipmentReadinessDate: z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
     quantityByShipment: z.ZodNullable<z.ZodNumber>;
     shipmentNeed: z.ZodNullable<z.ZodNumber>;
     stockOrderItemId: z.ZodNullable<z.ZodNumber>;
@@ -134,7 +148,9 @@ export declare const OrdersSummaryByEntityRowZod: z.ZodObject<{
     quantityByStockOrder: z.ZodNumber;
     stockOrderNeed: z.ZodNumber;
     warehouseReadinessDate: z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
+    stockReadinessDate: z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
     deficitWithPlannedIncoming: z.ZodNumber;
+    plannedIncomingFinal: z.ZodNumber;
     deficit: z.ZodNumber;
 }, "strip", z.ZodTypeAny, {
     deficit: number;
@@ -147,8 +163,10 @@ export declare const OrdersSummaryByEntityRowZod: z.ZodObject<{
     parentPTQuantity: number | null;
     parentPTNeed: number | null;
     parentWarehouseReadinessDate: string | Date | null;
+    parentReadinessDate: string | Date | null;
     shipmentNumber: string | null;
     shipmentWarehouseReadinessDate: string | Date | null;
+    shipmentReadinessDate: string | Date | null;
     stockOrderItemId: number | null;
     stockOrderId: number | null;
     quantityByProductionTask: number;
@@ -157,7 +175,9 @@ export declare const OrdersSummaryByEntityRowZod: z.ZodObject<{
     positionNumber: number | null;
     quantityByStockOrder: number;
     stockOrderNeed: number;
+    stockReadinessDate: string | Date | null;
     deficitWithPlannedIncoming: number;
+    plannedIncomingFinal: number;
 }, {
     deficit: number;
     warehouseReadinessDate: string | Date | null;
@@ -169,8 +189,10 @@ export declare const OrdersSummaryByEntityRowZod: z.ZodObject<{
     parentPTQuantity: number | null;
     parentPTNeed: number | null;
     parentWarehouseReadinessDate: string | Date | null;
+    parentReadinessDate: string | Date | null;
     shipmentNumber: string | null;
     shipmentWarehouseReadinessDate: string | Date | null;
+    shipmentReadinessDate: string | Date | null;
     stockOrderItemId: number | null;
     stockOrderId: number | null;
     quantityByProductionTask: number;
@@ -179,7 +201,9 @@ export declare const OrdersSummaryByEntityRowZod: z.ZodObject<{
     positionNumber: number | null;
     quantityByStockOrder: number;
     stockOrderNeed: number;
+    stockReadinessDate: string | Date | null;
     deficitWithPlannedIncoming: number;
+    plannedIncomingFinal: number;
 }>;
 export declare const OrdersSummaryByEntityResponseZod: z.ZodObject<{
     rows: z.ZodArray<z.ZodObject<{
@@ -192,8 +216,10 @@ export declare const OrdersSummaryByEntityResponseZod: z.ZodObject<{
         parentPTQuantity: z.ZodNullable<z.ZodNumber>;
         parentPTNeed: z.ZodNullable<z.ZodNumber>;
         parentWarehouseReadinessDate: z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
+        parentReadinessDate: z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
         shipmentNumber: z.ZodNullable<z.ZodString>;
         shipmentWarehouseReadinessDate: z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
+        shipmentReadinessDate: z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
         quantityByShipment: z.ZodNullable<z.ZodNumber>;
         shipmentNeed: z.ZodNullable<z.ZodNumber>;
         stockOrderItemId: z.ZodNullable<z.ZodNumber>;
@@ -202,7 +228,9 @@ export declare const OrdersSummaryByEntityResponseZod: z.ZodObject<{
         quantityByStockOrder: z.ZodNumber;
         stockOrderNeed: z.ZodNumber;
         warehouseReadinessDate: z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
+        stockReadinessDate: z.ZodNullable<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
         deficitWithPlannedIncoming: z.ZodNumber;
+        plannedIncomingFinal: z.ZodNumber;
         deficit: z.ZodNumber;
     }, "strip", z.ZodTypeAny, {
         deficit: number;
@@ -215,8 +243,10 @@ export declare const OrdersSummaryByEntityResponseZod: z.ZodObject<{
         parentPTQuantity: number | null;
         parentPTNeed: number | null;
         parentWarehouseReadinessDate: string | Date | null;
+        parentReadinessDate: string | Date | null;
         shipmentNumber: string | null;
         shipmentWarehouseReadinessDate: string | Date | null;
+        shipmentReadinessDate: string | Date | null;
         stockOrderItemId: number | null;
         stockOrderId: number | null;
         quantityByProductionTask: number;
@@ -225,7 +255,9 @@ export declare const OrdersSummaryByEntityResponseZod: z.ZodObject<{
         positionNumber: number | null;
         quantityByStockOrder: number;
         stockOrderNeed: number;
+        stockReadinessDate: string | Date | null;
         deficitWithPlannedIncoming: number;
+        plannedIncomingFinal: number;
     }, {
         deficit: number;
         warehouseReadinessDate: string | Date | null;
@@ -237,8 +269,10 @@ export declare const OrdersSummaryByEntityResponseZod: z.ZodObject<{
         parentPTQuantity: number | null;
         parentPTNeed: number | null;
         parentWarehouseReadinessDate: string | Date | null;
+        parentReadinessDate: string | Date | null;
         shipmentNumber: string | null;
         shipmentWarehouseReadinessDate: string | Date | null;
+        shipmentReadinessDate: string | Date | null;
         stockOrderItemId: number | null;
         stockOrderId: number | null;
         quantityByProductionTask: number;
@@ -247,7 +281,9 @@ export declare const OrdersSummaryByEntityResponseZod: z.ZodObject<{
         positionNumber: number | null;
         quantityByStockOrder: number;
         stockOrderNeed: number;
+        stockReadinessDate: string | Date | null;
         deficitWithPlannedIncoming: number;
+        plannedIncomingFinal: number;
     }>, "many">;
     totalOrderNeed: z.ZodNumber;
     totalQuantityByStockOrder: z.ZodNumber;
@@ -266,8 +302,10 @@ export declare const OrdersSummaryByEntityResponseZod: z.ZodObject<{
         parentPTQuantity: number | null;
         parentPTNeed: number | null;
         parentWarehouseReadinessDate: string | Date | null;
+        parentReadinessDate: string | Date | null;
         shipmentNumber: string | null;
         shipmentWarehouseReadinessDate: string | Date | null;
+        shipmentReadinessDate: string | Date | null;
         stockOrderItemId: number | null;
         stockOrderId: number | null;
         quantityByProductionTask: number;
@@ -276,7 +314,9 @@ export declare const OrdersSummaryByEntityResponseZod: z.ZodObject<{
         positionNumber: number | null;
         quantityByStockOrder: number;
         stockOrderNeed: number;
+        stockReadinessDate: string | Date | null;
         deficitWithPlannedIncoming: number;
+        plannedIncomingFinal: number;
     }[];
     totalOrderNeed: number;
     totalQuantityByStockOrder: number;
@@ -295,8 +335,10 @@ export declare const OrdersSummaryByEntityResponseZod: z.ZodObject<{
         parentPTQuantity: number | null;
         parentPTNeed: number | null;
         parentWarehouseReadinessDate: string | Date | null;
+        parentReadinessDate: string | Date | null;
         shipmentNumber: string | null;
         shipmentWarehouseReadinessDate: string | Date | null;
+        shipmentReadinessDate: string | Date | null;
         stockOrderItemId: number | null;
         stockOrderId: number | null;
         quantityByProductionTask: number;
@@ -305,7 +347,9 @@ export declare const OrdersSummaryByEntityResponseZod: z.ZodObject<{
         positionNumber: number | null;
         quantityByStockOrder: number;
         stockOrderNeed: number;
+        stockReadinessDate: string | Date | null;
         deficitWithPlannedIncoming: number;
+        plannedIncomingFinal: number;
     }[];
     totalOrderNeed: number;
     totalQuantityByStockOrder: number;

package/dist/production-tasks/schemas/orders-summary-by-entity.schema.js

@@ -15,8 +15,10 @@ exports.OrdersSummaryShipmentZod = zod_1.z.object({
     parentPTQuantity: zod_1.z.number().nullable(),
     parentPTNeed: zod_1.z.number().nullable(),
     parentWarehouseReadinessDate: OrdersSummaryDateZod,
+    parentReadinessDate: OrdersSummaryDateZod,
     shipmentNumber: zod_1.z.string().nullable(),
     shipmentWarehouseReadinessDate: OrdersSummaryDateZod,
+    shipmentReadinessDate: OrdersSummaryDateZod,
     quantity: zod_1.z.number(),
     requiredReadyDate: OrdersSummaryDateZod
 });
@@ -37,8 +39,10 @@ exports.OrdersSummaryDemandRowZod = zod_1.z.object({
     parentPTQuantity: zod_1.z.number().nullable(),
     parentPTNeed: zod_1.z.number().nullable(),
     parentWarehouseReadinessDate: OrdersSummaryDateZod,
+    parentReadinessDate: OrdersSummaryDateZod,
     shipmentNumber: zod_1.z.string().nullable(),
     shipmentWarehouseReadinessDate: OrdersSummaryDateZod,
+    shipmentReadinessDate: OrdersSummaryDateZod,
     quantityByShipment: zod_1.z.number().nullable(),
     shipmentNeed: zod_1.z.number().nullable(),
     demandQuantity: zod_1.z.number(),
@@ -54,8 +58,10 @@ exports.OrdersSummaryByEntityRowZod = zod_1.z.object({
     parentPTQuantity: zod_1.z.number().nullable(),
     parentPTNeed: zod_1.z.number().nullable(),
     parentWarehouseReadinessDate: OrdersSummaryDateZod,
+    parentReadinessDate: OrdersSummaryDateZod,
     shipmentNumber: zod_1.z.string().nullable(),
     shipmentWarehouseReadinessDate: OrdersSummaryDateZod,
+    shipmentReadinessDate: OrdersSummaryDateZod,
     quantityByShipment: zod_1.z.number().nullable(),
     shipmentNeed: zod_1.z.number().nullable(),
     stockOrderItemId: zod_1.z.number().nullable(),
@@ -64,7 +70,9 @@ exports.OrdersSummaryByEntityRowZod = zod_1.z.object({
     quantityByStockOrder: zod_1.z.number(),
     stockOrderNeed: zod_1.z.number(),
     warehouseReadinessDate: OrdersSummaryDateZod,
+    stockReadinessDate: OrdersSummaryDateZod,
     deficitWithPlannedIncoming: zod_1.z.number(),
+    plannedIncomingFinal: zod_1.z.number(),
     deficit: zod_1.z.number()
 });
 exports.OrdersSummaryByEntityResponseZod = zod_1.z.object({

package/dist/shipments/dto/shipments-paginate.dto.d.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { statusShipment } from '../../utils';
+import { statusShipment, WarehouseReadinessDateFilterEnum } from '../../utils';
 export declare const ShipmentsPaginateSchema: z.ZodObject<{
     offset: z.ZodNumber;
     parentId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
@@ -17,6 +17,7 @@ export declare const ShipmentsPaginateSchema: z.ZodObject<{
     companyId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
     searchStr: z.ZodOptional<z.ZodString>;
     attributes: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    warehouseReadinessDateFilter: z.ZodOptional<z.ZodNativeEnum<typeof WarehouseReadinessDateFilterEnum>>;
     sort: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
         sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof import("../../utils").ProductionPlanSortField>>>;
         sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -40,6 +41,7 @@ export declare const ShipmentsPaginateSchema: z.ZodObject<{
     offset: number;
     attributes?: string[] | undefined;
     parentId?: number | null | undefined;
+    warehouseReadinessDateFilter?: WarehouseReadinessDateFilterEnum | undefined;
     searchStr?: string | undefined;
     companyId?: number | null | undefined;
 }, {
@@ -55,6 +57,7 @@ export declare const ShipmentsPaginateSchema: z.ZodObject<{
     }[] | undefined;
     attributes?: string[] | undefined;
     parentId?: number | null | undefined;
+    warehouseReadinessDateFilter?: WarehouseReadinessDateFilterEnum | undefined;
     searchStr?: string | undefined;
     companyId?: number | null | undefined;
 }>;

package/dist/shipments/dto/shipments-paginate.dto.js

@@ -17,5 +17,8 @@ exports.ShipmentsPaginateSchema = zod_1.z.object({
     companyId: zod_1.z.number().int().nullish(),
     searchStr: zod_1.z.string().optional(),
     attributes: zod_1.z.array(zod_1.z.string()).optional(),
+    warehouseReadinessDateFilter: zod_1.z
+        .nativeEnum(utils_1.WarehouseReadinessDateFilterEnum)
+        .optional(),
     sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
 });

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

@@ -47,12 +47,10 @@ const optionalNumericIdSchema = zod_1.z.preprocess(value => {
     return value;
 }, zod_1.z.number().int().positive().optional());
 const nullableDateSchema = zod_1.z.preprocess(value => {
-    if (value === undefined ||
-        value === null ||
-        value === '' ||
-        value === 'null') {
+    if (value === undefined)
+        return undefined;
+    if (value === null || value === '' || value === 'null')
         return null;
-    }
     return value;
 }, zod_1.z.string().datetime({ offset: true }).nullable().optional());
 const shipmentQuantitySchema = zod_1.z.preprocess(value => {

package/dist/utils/enums.d.ts

@@ -110,6 +110,11 @@ export declare enum SortReadinesEnum {
     no = "no",
     any = "any"
 }
+/** Варианты фильтра по дате плановой готовности склада. */
+export declare enum WarehouseReadinessDateFilterEnum {
+    all = "all",
+    requiredDateMismatch = "requiredDateMismatch"
+}
 /**
  * Enum для обозначения типов производственных операций.
  * @readonly

package/dist/utils/enums.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EnumExclusionType = exports.EnumStatusOrder = exports.EnumRequisitesUserType = exports.EnumRequisitesType = exports.FileCategory = exports.SpetificationEntityKeys = exports.MetalloworkingStatus = exports.InstansMaterial = exports.InstansTypeInstrument = exports.ParentTypeEnum = exports.IMG_TYPES = exports.UnitsEnum = exports.FileType = exports.WorkSpaceObject = exports.enumDeficit = exports.statusWorkingsDeficit = exports.MovementObjectBase = exports.ActionType = exports.ModuleIncludeForAvatarEnum = exports.ModuleIncludeForDocumentEnum = exports.ModuleInclude = exports.MovementObjectType = exports.WaybilTypeComingEnums = exports.WorkingItemType = exports.AssembleStatus = exports.ProductionOperationType = exports.SortReadinesEnum = exports.AssembleIzdEnum = exports.StockOrderType = exports.RevisionEntityTypes = exports.Neo4jEntityTypes = exports.EntityTypes = exports.EnumEntityDeliveryItem = exports.EnumStatusDelivery = exports.statusShipment = exports.StatusScladWorking = exports.IzdType = exports.bullJobStatusEnum = exports.TypeSubTypeEntities = exports.StatusIssue = exports.EnumFilePrefix = exports.QueueStatusEnum = exports.StatusAssembleKit = void 0;
+exports.EnumExclusionType = exports.EnumStatusOrder = exports.EnumRequisitesUserType = exports.EnumRequisitesType = exports.FileCategory = exports.SpetificationEntityKeys = exports.MetalloworkingStatus = exports.InstansMaterial = exports.InstansTypeInstrument = exports.ParentTypeEnum = exports.IMG_TYPES = exports.UnitsEnum = exports.FileType = exports.WorkSpaceObject = exports.enumDeficit = exports.statusWorkingsDeficit = exports.MovementObjectBase = exports.ActionType = exports.ModuleIncludeForAvatarEnum = exports.ModuleIncludeForDocumentEnum = exports.ModuleInclude = exports.MovementObjectType = exports.WaybilTypeComingEnums = exports.WorkingItemType = exports.AssembleStatus = exports.ProductionOperationType = exports.WarehouseReadinessDateFilterEnum = exports.SortReadinesEnum = exports.AssembleIzdEnum = exports.StockOrderType = exports.RevisionEntityTypes = exports.Neo4jEntityTypes = exports.EntityTypes = exports.EnumEntityDeliveryItem = exports.EnumStatusDelivery = exports.statusShipment = exports.StatusScladWorking = exports.IzdType = exports.bullJobStatusEnum = exports.TypeSubTypeEntities = exports.StatusIssue = exports.EnumFilePrefix = exports.QueueStatusEnum = exports.StatusAssembleKit = void 0;
 var StatusAssembleKit;
 (function (StatusAssembleKit) {
     StatusAssembleKit["collected"] = "\u0421\u043E\u0431\u0440\u0430\u043D\u043E";
@@ -130,6 +130,12 @@ var SortReadinesEnum;
     SortReadinesEnum["no"] = "no";
     SortReadinesEnum["any"] = "any";
 })(SortReadinesEnum || (exports.SortReadinesEnum = SortReadinesEnum = {}));
+/** Варианты фильтра по дате плановой готовности склада. */
+var WarehouseReadinessDateFilterEnum;
+(function (WarehouseReadinessDateFilterEnum) {
+    WarehouseReadinessDateFilterEnum["all"] = "all";
+    WarehouseReadinessDateFilterEnum["requiredDateMismatch"] = "requiredDateMismatch";
+})(WarehouseReadinessDateFilterEnum || (exports.WarehouseReadinessDateFilterEnum = WarehouseReadinessDateFilterEnum = {}));
 /**
  * Enum для обозначения типов производственных операций.
  * @readonly

package/package.json

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