@pksep/zod-shared 0.0.555 → 0.0.557

package/dist/tech-process/schemas/tech-process-with-options.schema.d.ts

@@ -0,0 +1,306 @@
+import { z } from 'zod';
+import { ModelProduct } from '../../product';
+import { ModelCbed } from '../../cbed';
+import { ModelDetal } from '../../detal';
+export declare const TechProcessWithOpetionsSchema: z.ZodObject<{
+    id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    name: z.ZodOptional<z.ZodNumber>;
+    ban: z.ZodDefault<z.ZodBoolean>;
+    description: z.ZodDefault<z.ZodString>;
+    detalId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    cbedId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    productId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    operations: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        id: z.ZodOptional<z.ZodNumber>;
+        idx: z.ZodDefault<z.ZodNumber>;
+        name: z.ZodNumber;
+        full_name: z.ZodString;
+        ban: z.ZodDefault<z.ZodBoolean>;
+        preTime: z.ZodDefault<z.ZodNumber>;
+        helperTime: z.ZodDefault<z.ZodNumber>;
+        mainTime: z.ZodDefault<z.ZodNumber>;
+        generalCountTime: z.ZodDefault<z.ZodString>;
+        description: z.ZodDefault<z.ZodString>;
+        instrumentList: z.ZodDefault<z.ZodString>;
+        instrumentID: z.ZodDefault<z.ZodNullable<z.ZodNumber>>;
+        instrumentMerList: z.ZodDefault<z.ZodString>;
+        instrumentMerID: z.ZodDefault<z.ZodNullable<z.ZodNumber>>;
+        instrumentOsnList: z.ZodDefault<z.ZodString>;
+        instrumentOsnID: z.ZodDefault<z.ZodNullable<z.ZodNumber>>;
+        eqList: z.ZodDefault<z.ZodString>;
+        eqID: z.ZodDefault<z.ZodNullable<z.ZodNumber>>;
+        tOperationId: z.ZodDefault<z.ZodNullable<z.ZodNumber>>;
+        tech_process_id: z.ZodNumber;
+        marks: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            id: z.ZodNumber;
+            date_build: z.ZodString;
+            kol: z.ZodNumber;
+            quantity_shipped: z.ZodNumber;
+            brak: z.ZodBoolean;
+            ban: z.ZodBoolean;
+            status: z.ZodNativeEnum<typeof import("../..").MarkStatusEnums>;
+            description: z.ZodOptional<z.ZodString>;
+            execution_time: z.ZodNumber;
+            operation_execution_time: z.ZodOptional<z.ZodObject<{
+                helperTime: z.ZodNumber;
+                mainTime: z.ZodNumber;
+                preTime: z.ZodNumber;
+            }, "strip", z.ZodTypeAny, {
+                preTime: number;
+                helperTime: number;
+                mainTime: number;
+            }, {
+                preTime: number;
+                helperTime: number;
+                mainTime: number;
+            }>>;
+            user_id: z.ZodNumber;
+            assemble_id: z.ZodNumber;
+            metaloworking_id: z.ZodNumber;
+            oper_id: z.ZodNumber;
+            assemble_kit_id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+            production_task_id: z.ZodNullable<z.ZodNumber>;
+        }, "strip", z.ZodTypeAny, {
+            status: import("../..").MarkStatusEnums;
+            ban: boolean;
+            id: number;
+            date_build: string;
+            kol: number;
+            user_id: number;
+            oper_id: number;
+            assemble_id: number;
+            metaloworking_id: number;
+            brak: boolean;
+            execution_time: number;
+            production_task_id: number | null;
+            quantity_shipped: number;
+            description?: string | undefined;
+            assemble_kit_id?: number | null | undefined;
+            operation_execution_time?: {
+                preTime: number;
+                helperTime: number;
+                mainTime: number;
+            } | undefined;
+        }, {
+            status: import("../..").MarkStatusEnums;
+            ban: boolean;
+            id: number;
+            date_build: string;
+            kol: number;
+            user_id: number;
+            oper_id: number;
+            assemble_id: number;
+            metaloworking_id: number;
+            brak: boolean;
+            execution_time: number;
+            production_task_id: number | null;
+            quantity_shipped: number;
+            description?: string | undefined;
+            assemble_kit_id?: number | null | undefined;
+            operation_execution_time?: {
+                preTime: number;
+                helperTime: number;
+                mainTime: number;
+            } | undefined;
+        }>, "many">>;
+    }, "strip", z.ZodTypeAny, {
+        ban: boolean;
+        description: string;
+        name: number;
+        full_name: string;
+        preTime: number;
+        helperTime: number;
+        mainTime: number;
+        generalCountTime: string;
+        instrumentList: string;
+        instrumentMerList: string;
+        instrumentOsnList: string;
+        eqList: string;
+        instrumentID: number | null;
+        instrumentMerID: number | null;
+        instrumentOsnID: number | null;
+        eqID: number | null;
+        idx: number;
+        tOperationId: number | null;
+        tech_process_id: number;
+        id?: number | undefined;
+        marks?: {
+            status: import("../..").MarkStatusEnums;
+            ban: boolean;
+            id: number;
+            date_build: string;
+            kol: number;
+            user_id: number;
+            oper_id: number;
+            assemble_id: number;
+            metaloworking_id: number;
+            brak: boolean;
+            execution_time: number;
+            production_task_id: number | null;
+            quantity_shipped: number;
+            description?: string | undefined;
+            assemble_kit_id?: number | null | undefined;
+            operation_execution_time?: {
+                preTime: number;
+                helperTime: number;
+                mainTime: number;
+            } | undefined;
+        }[] | undefined;
+    }, {
+        name: number;
+        full_name: string;
+        tech_process_id: number;
+        ban?: boolean | undefined;
+        description?: string | undefined;
+        id?: number | undefined;
+        marks?: {
+            status: import("../..").MarkStatusEnums;
+            ban: boolean;
+            id: number;
+            date_build: string;
+            kol: number;
+            user_id: number;
+            oper_id: number;
+            assemble_id: number;
+            metaloworking_id: number;
+            brak: boolean;
+            execution_time: number;
+            production_task_id: number | null;
+            quantity_shipped: number;
+            description?: string | undefined;
+            assemble_kit_id?: number | null | undefined;
+            operation_execution_time?: {
+                preTime: number;
+                helperTime: number;
+                mainTime: number;
+            } | undefined;
+        }[] | undefined;
+        preTime?: number | undefined;
+        helperTime?: number | undefined;
+        mainTime?: number | undefined;
+        generalCountTime?: string | undefined;
+        instrumentList?: string | undefined;
+        instrumentMerList?: string | undefined;
+        instrumentOsnList?: string | undefined;
+        eqList?: string | undefined;
+        instrumentID?: number | null | undefined;
+        instrumentMerID?: number | null | undefined;
+        instrumentOsnID?: number | null | undefined;
+        eqID?: number | null | undefined;
+        idx?: number | undefined;
+        tOperationId?: number | null | undefined;
+    }>, "many">>;
+} & {
+    isCanUpdated: z.ZodDefault<z.ZodBoolean>;
+}, "strip", z.ZodTypeAny, {
+    ban: boolean;
+    description: string;
+    isCanUpdated: boolean;
+    id?: number | null | undefined;
+    name?: number | undefined;
+    detalId?: number | null | undefined;
+    cbedId?: number | null | undefined;
+    productId?: number | null | undefined;
+    operations?: {
+        ban: boolean;
+        description: string;
+        name: number;
+        full_name: string;
+        preTime: number;
+        helperTime: number;
+        mainTime: number;
+        generalCountTime: string;
+        instrumentList: string;
+        instrumentMerList: string;
+        instrumentOsnList: string;
+        eqList: string;
+        instrumentID: number | null;
+        instrumentMerID: number | null;
+        instrumentOsnID: number | null;
+        eqID: number | null;
+        idx: number;
+        tOperationId: number | null;
+        tech_process_id: number;
+        id?: number | undefined;
+        marks?: {
+            status: import("../..").MarkStatusEnums;
+            ban: boolean;
+            id: number;
+            date_build: string;
+            kol: number;
+            user_id: number;
+            oper_id: number;
+            assemble_id: number;
+            metaloworking_id: number;
+            brak: boolean;
+            execution_time: number;
+            production_task_id: number | null;
+            quantity_shipped: number;
+            description?: string | undefined;
+            assemble_kit_id?: number | null | undefined;
+            operation_execution_time?: {
+                preTime: number;
+                helperTime: number;
+                mainTime: number;
+            } | undefined;
+        }[] | undefined;
+    }[] | undefined;
+}, {
+    ban?: boolean | undefined;
+    description?: string | undefined;
+    id?: number | null | undefined;
+    name?: number | undefined;
+    detalId?: number | null | undefined;
+    cbedId?: number | null | undefined;
+    productId?: number | null | undefined;
+    operations?: {
+        name: number;
+        full_name: string;
+        tech_process_id: number;
+        ban?: boolean | undefined;
+        description?: string | undefined;
+        id?: number | undefined;
+        marks?: {
+            status: import("../..").MarkStatusEnums;
+            ban: boolean;
+            id: number;
+            date_build: string;
+            kol: number;
+            user_id: number;
+            oper_id: number;
+            assemble_id: number;
+            metaloworking_id: number;
+            brak: boolean;
+            execution_time: number;
+            production_task_id: number | null;
+            quantity_shipped: number;
+            description?: string | undefined;
+            assemble_kit_id?: number | null | undefined;
+            operation_execution_time?: {
+                preTime: number;
+                helperTime: number;
+                mainTime: number;
+            } | undefined;
+        }[] | undefined;
+        preTime?: number | undefined;
+        helperTime?: number | undefined;
+        mainTime?: number | undefined;
+        generalCountTime?: string | undefined;
+        instrumentList?: string | undefined;
+        instrumentMerList?: string | undefined;
+        instrumentOsnList?: string | undefined;
+        eqList?: string | undefined;
+        instrumentID?: number | null | undefined;
+        instrumentMerID?: number | null | undefined;
+        instrumentOsnID?: number | null | undefined;
+        eqID?: number | null | undefined;
+        idx?: number | undefined;
+        tOperationId?: number | null | undefined;
+    }[] | undefined;
+    isCanUpdated?: boolean | undefined;
+}>;
+export type ModelTechProcessWithOpetions = z.infer<typeof TechProcessWithOpetionsSchema> & {
+    product?: ModelProduct | null;
+    cbed?: ModelCbed | null;
+    detal?: ModelDetal | null;
+};

package/dist/tech-process/schemas/tech-process-with-options.schema.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TechProcessWithOpetionsSchema = void 0;
+const zod_1 = require("zod");
+const tech_process_schema_1 = require("./tech-process.schema");
+exports.TechProcessWithOpetionsSchema = tech_process_schema_1.TechProcessSchema.extend({
+    isCanUpdated: zod_1.z.boolean().default(false)
+});

package/dist/tech-process/schemas/tech-process.schema.d.ts

@@ -196,8 +196,8 @@ export declare const TechProcessSchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     ban: boolean;
     description: string;
-    id?: number | null | undefined;
     name?: number | undefined;
+    id?: number | null | undefined;
     detalId?: number | null | undefined;
     cbedId?: number | null | undefined;
     productId?: number | null | undefined;
@@ -249,8 +249,8 @@ export declare const TechProcessSchema: z.ZodObject<{
 }, {
     ban?: boolean | undefined;
     description?: string | undefined;
-    id?: number | null | undefined;
     name?: number | undefined;
+    id?: number | null | undefined;
     detalId?: number | null | undefined;
     cbedId?: number | null | undefined;
     productId?: number | null | undefined;

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

@@ -125,8 +125,8 @@ export declare const UserSchema: z.ZodObject<{
         cbed: import("../../cbed").CbedRelativeType[];
         designation: string | null;
         description: string | null;
-        id: number;
         name: string;
+        id: number;
         calculate_needs_time: Date | null;
         entity_children_need_time: Date | null;
         min_remaining: number;
@@ -156,8 +156,8 @@ export declare const UserSchema: z.ZodObject<{
     }, {
         designation: string | null;
         description: string | null;
-        id: number;
         name: string;
+        id: number;
         ava_path: string | null;
         parametrs: import("../../cbed").CbedParametrsField | null;
         characteristic: import("../../cbed").CbedCharacteristicField | null;
@@ -600,8 +600,8 @@ export declare const UserSchema: z.ZodObject<{
         cbed: import("../../cbed").CbedRelativeType[];
         designation: string | null;
         description: string | null;
-        id: number;
         name: string;
+        id: number;
         calculate_needs_time: Date | null;
         entity_children_need_time: Date | null;
         min_remaining: number;
@@ -794,8 +794,8 @@ export declare const UserSchema: z.ZodObject<{
     cbeds: {
         designation: string | null;
         description: string | null;
-        id: number;
         name: string;
+        id: number;
         ava_path: string | null;
         parametrs: import("../../cbed").CbedParametrsField | null;
         characteristic: import("../../cbed").CbedCharacteristicField | null;

package/dist/utils/interface/mat.interface.d.ts

@@ -0,0 +1,10 @@
+export interface IUnitsMeasurementStructure {
+    units_type: number;
+    shipments: number;
+    delivery: number;
+    quantity: number;
+    price: number;
+    used: boolean;
+    min_remaining: number;
+    working_quantity: number;
+}

package/dist/utils/interface/mat.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/utils/methods.js

@@ -800,7 +800,8 @@ const countChildrensRelative = (data) => {
                 }
             }
             const materialMap = new Map();
-            const materialsArray = concatedMaterialLists.map((listMaterialItem) => {
+            const materialsArray = concatedMaterialLists
+                .map((listMaterialItem) => {
                 const foundedMaterials = materials.find(material => listMaterialItem.id === material.id);
                 //  если материал не найден, пропускаем
                 if (!foundedMaterials) {
@@ -819,7 +820,8 @@ const countChildrensRelative = (data) => {
                 return Object.assign(Object.assign(Object.assign({}, foundedMaterials), (0, sequelize_1.addFieldByCondition)(data.isNeedsTypes, {
                     entity_type: enums_1.IzdType.material
                 })), { measure_id: listMaterialItem.measureId, count_to_obj_not_converted: listMaterialItem.quantity, count_to_needs_not_converted: relativeNeeds * listMaterialItem.quantity, count_to_obj: specificationConvertedQuantity, count_to_needs: relativeNeeds * specificationConvertedQuantity, needs: relativeNeeds * specificationConvertedQuantity, parent_id: relative.id, parent_type: relativeType, parent_ava: relative === null || relative === void 0 ? void 0 : relative.ava_path, parent_designation: (relative === null || relative === void 0 ? void 0 : relative.designation) || '-', parent_name: (relative === null || relative === void 0 ? void 0 : relative.name) || '-' });
-            });
+            })
+                .filter(Boolean);
             materialsArray.forEach((currentMaterial) => {
                 const materialKey = `${currentMaterial.parent_id}_${currentMaterial.parent_type}_${currentMaterial.id}`;
                 if (materialMap.has(materialKey)) {

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

@@ -8,15 +8,15 @@ export declare const SpecificationForObjectSchema: z.ZodObject<{
     measureId: z.ZodNumber;
 }, "strip", z.ZodTypeAny, {
     designation: string;
-    id: number;
     name: string;
+    id: number;
     quantity: number;
     discontinued: boolean;
     measureId: number;
 }, {
     designation: string;
-    id: number;
     name: string;
+    id: number;
     quantity: number;
     measureId: number;
     discontinued?: boolean | undefined;

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

@@ -43,5 +43,6 @@ export declare enum tablesEnumConfig {
     readyInProcent = "readyInProcent",
     readyToAssembleQuantity = "readyToAssembleQuantity",
     deltaTime = "deltaTime",
-    childrenCalculateNeedsTime = "childrenCalculateNeedsTime"
+    childrenCalculateNeedsTime = "childrenCalculateNeedsTime",
+    entityCalculatedCreateTimeColumn = "entityCalculatedCreateTimeColumn"
 }

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

@@ -88,4 +88,6 @@ var tablesEnumConfig;
     tablesEnumConfig["deltaTime"] = "deltaTime";
     // Готовность к комплектации
     tablesEnumConfig["childrenCalculateNeedsTime"] = "childrenCalculateNeedsTime";
+    // Требуемя дата готовности сущности
+    tablesEnumConfig["entityCalculatedCreateTimeColumn"] = "entityCalculatedCreateTimeColumn";
 })(tablesEnumConfig || (exports.tablesEnumConfig = tablesEnumConfig = {}));

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

@@ -128,6 +128,7 @@ exports.productionTaskByUserTableConfig = [
     enum_1.tablesEnumConfig.designation,
     enum_1.tablesEnumConfig.name,
     enum_1.tablesEnumConfig.deficitChildCreateTime,
+    enum_1.tablesEnumConfig.entityCalculatedCreateTimeColumn,
     enum_1.tablesEnumConfig.startTime,
     enum_1.tablesEnumConfig.calculatedCreateTime,
     enum_1.tablesEnumConfig.calculateNeedsTime,
@@ -157,6 +158,7 @@ exports.productionTaskByOperationTableConfig = [
     enum_1.tablesEnumConfig.name,
     enum_1.tablesEnumConfig.workpieceParameters,
     enum_1.tablesEnumConfig.material,
+    enum_1.tablesEnumConfig.entityCalculatedCreateTimeColumn,
     enum_1.tablesEnumConfig.startTime,
     enum_1.tablesEnumConfig.calculatedCreateTime,
     enum_1.tablesEnumConfig.calculateNeedsTime,
@@ -187,6 +189,7 @@ exports.productionTaskByEquipmentTableConfig = [
     enum_1.tablesEnumConfig.name,
     enum_1.tablesEnumConfig.workpieceParameters,
     enum_1.tablesEnumConfig.material,
+    enum_1.tablesEnumConfig.entityCalculatedCreateTimeColumn,
     enum_1.tablesEnumConfig.startTime,
     enum_1.tablesEnumConfig.calculatedCreateTime,
     enum_1.tablesEnumConfig.calculateNeedsTime,

package/dist/utils/types.d.ts

@@ -57,6 +57,8 @@ export type DetalWorkpieceCharacteristics = {
     outsideDiameter: number;
     thickness: number;
     areaCrossSectional: number;
+    acrossFlats: number;
+    massPerMeter: number;
     mass: number;
     trash: number;
     density: number;
@@ -76,6 +78,8 @@ export type MaterialCharacteristics = {
     outsideDiameter: MaterialCharacteristicsItem;
     thickness: MaterialCharacteristicsItem;
     areaCrossSectional: MaterialCharacteristicsItem;
+    acrossFlats: MaterialCharacteristicsItem;
+    massPerMeter: MaterialCharacteristicsItem;
 };
 export declare enum TypeMaterialCharZnachEnum {
     variable = "variable",
@@ -94,6 +98,8 @@ export type TypeMaterialCharacteristics = {
     outsideDiameter: TypeMaterialCharacteristicsItem;
     thickness: TypeMaterialCharacteristicsItem;
     areaCrossSectional: TypeMaterialCharacteristicsItem;
+    acrossFlats: TypeMaterialCharacteristicsItem;
+    massPerMeter: TypeMaterialCharacteristicsItem;
 };
 export interface IgetFirstUnits {
     units_measurement: any[];

package/package.json

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

package/dist/material/workpiece-mass.d.ts

@@ -1,45 +0,0 @@
-import { WorkpieceMassFormulaKey } from './enum/enum';
-import type { ModelMaterial } from './schemas/material.schema';
-import type { ModelTypeMaterial } from './schemas/type-material.schema';
-export type TWorkpieceMassVariableKey = 'density' | 'length' | 'width' | 'height' | 'thickness' | 'wallThickness' | 'outsideDiameter' | 'areaCrossSectional' | 'acrossFlats' | 'massPerMeter';
-export interface IWorkpieceMassFormulaVariable {
-    key: TWorkpieceMassVariableKey;
-    name: string;
-    source: 'material' | 'workpiece';
-    required: boolean;
-}
-export interface IWorkpieceMassFormula {
-    key: WorkpieceMassFormulaKey;
-    name: string;
-    description: string;
-    variables: IWorkpieceMassFormulaVariable[];
-}
-export type TResolvedWorkpieceMassVariables = Partial<Record<TWorkpieceMassVariableKey, number>>;
-export interface ICalculateWorkpieceMassContext {
-    typeMaterial: ModelTypeMaterial;
-    material: ModelMaterial;
-    workpieceCharacterization?: Record<string, number | null | undefined>;
-    workpieceMassFormulaKey?: WorkpieceMassFormulaKey;
-}
-export interface ICalculateWorkpieceMassResult {
-    formulaKey: WorkpieceMassFormulaKey;
-    mass: number;
-    variables: TResolvedWorkpieceMassVariables;
-}
-type TPreparedWorkpieceValues = Partial<Record<TWorkpieceMassVariableKey | 'mass' | 'trash', number>>;
-type TWorkpieceMassVariableResolver = (context: ICalculateWorkpieceMassContext, prepared: TPreparedWorkpieceValues) => number | null;
-type TWorkpieceMassCalculator = (vars: TResolvedWorkpieceMassVariables) => number;
-export declare const WORKPIECE_MASS_FORMULAS: IWorkpieceMassFormula[];
-/**
- * Реестр источников значений переменных.
- * Здесь описано, откуда брать каждую переменную под расчет массы заготовки.
- */
-export declare const WORKPIECE_MASS_VARIABLE_RESOLVERS: Record<TWorkpieceMassVariableKey, TWorkpieceMassVariableResolver>;
-/**
- * Реестр математических алгоритмов расчета.
- * Здесь только математика, без поиска значений по моделям.
- */
-export declare const WORKPIECE_MASS_CALCULATORS: Record<WorkpieceMassFormulaKey, TWorkpieceMassCalculator>;
-export declare const resolveWorkpieceMassVariables: (context: ICalculateWorkpieceMassContext, variableKeys: TWorkpieceMassVariableKey[]) => TResolvedWorkpieceMassVariables;
-export declare const calculateWorkpieceMassPreview: (context: ICalculateWorkpieceMassContext) => ICalculateWorkpieceMassResult | null;
-export {};