@pksep/zod-shared 0.0.500 → 0.0.501

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

@@ -193,8 +193,8 @@ export declare const TechProcessSchema: z.ZodObject<{
     id?: number | null | undefined;
     name?: number | undefined;
     detalId?: number | null | undefined;
-    cbedId?: number | null | undefined;
     productId?: number | null | undefined;
+    cbedId?: number | null | undefined;
     operations?: {
         ban: boolean;
         description: string;
@@ -245,8 +245,8 @@ export declare const TechProcessSchema: z.ZodObject<{
     id?: number | null | undefined;
     name?: number | undefined;
     detalId?: number | null | undefined;
-    cbedId?: number | null | undefined;
     productId?: number | null | undefined;
+    cbedId?: number | null | undefined;
     operations?: {
         name: number;
         full_name: string;

package/dist/utils/methods.d.ts

@@ -193,6 +193,7 @@ export declare const countUniqueValueChildren: (entities: any[], countField: str
     id: number;
     [key: string]: number;
 }[];
+export declare const concatedLists: (firstArray: any[], seconsArray: any[]) => any[];
 /**
  * Функция формирует графовый объект с потомками сущности
  * @param data

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.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.calculateEndDate = exports.leftToDoByProductionTask = exports.calculateByMeasurementRate = void 0;
 exports.moreMinusNum = moreMinusNum;
 exports.getFieldsSpetification = getFieldsSpetification;
 exports.isThisExclusionDesignation = isThisExclusionDesignation;
@@ -44,6 +44,7 @@ exports.openInNewTab = openInNewTab;
 const edizm_1 = require("./edizm");
 const enums_1 = require("./enums");
 const types_1 = require("./types");
+const sequelize_1 = require("./methods/sequelize");
 /**
  * Возвращает ноль или число больше нуля
  * @param num
@@ -689,6 +690,8 @@ const countUniqueValueChildren = (entities, countField) => {
     return uniqueItems;
 };
 exports.countUniqueValueChildren = countUniqueValueChildren;
+const concatedLists = (firstArray, seconsArray) => (firstArray || []).concat(seconsArray || []).filter(Boolean);
+exports.concatedLists = concatedLists;
 /**
  * Функция формирует графовый объект с потомками сущности
  * @param data
@@ -701,17 +704,19 @@ const countChildrensRelative = (data) => {
     const countChildrens = (relative, relativeType) => {
         var _a, _b, _c, _d;
         const relativeNeeds = (relative === null || relative === void 0 ? void 0 : relative.needs) || 1;
-        if (relativeType !== enums_1.IzdType.detal) {
-            relative.cbedGraph = [];
-            relative.detalsGraph = [];
-        }
+        relative.cbedGraph = [];
+        relative.detalsGraph = [];
+        if (data.isNeedsTypes && !(relative === null || relative === void 0 ? void 0 : relative.entity_type))
+            relative.entity_type = relativeEntityType;
         if (isAppendedMaterials)
             relative.materialGraph = [];
         if (relative === null || relative === void 0 ? void 0 : relative.listCbed) {
             relative.cbeds =
                 ((_a = relative === null || relative === void 0 ? void 0 : relative.listCbed) === null || _a === void 0 ? void 0 : _a.map((listCbedItem) => {
                     const foundedCbed = cbeds.find(cbed => listCbedItem.id === cbed.id);
-                    return Object.assign(Object.assign({}, foundedCbed), { count_to_obj: listCbedItem.quantity, count_to_needs: relativeNeeds * listCbedItem.quantity, needs: relativeNeeds * listCbedItem.quantity, 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) || '-' });
+                    return Object.assign(Object.assign(Object.assign({}, foundedCbed), (0, sequelize_1.addFieldByCondition)(data.isNeedsTypes, {
+                        entity_type: enums_1.IzdType.cbed
+                    })), { count_to_obj: listCbedItem.quantity, count_to_needs: relativeNeeds * listCbedItem.quantity, needs: relativeNeeds * listCbedItem.quantity, 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) || '-' });
                 })) || [];
             relative.cbedGraph = [...relative.cbeds];
         }
@@ -719,26 +724,59 @@ const countChildrensRelative = (data) => {
             relative.detals =
                 ((_b = relative === null || relative === void 0 ? void 0 : relative.listDetal) === null || _b === void 0 ? void 0 : _b.map((listDetalItem) => {
                     const foundedDetal = detals.find(detal => listDetalItem.id === detal.id);
-                    return Object.assign(Object.assign({}, foundedDetal), { count_to_obj: listDetalItem.quantity, count_to_needs: relativeNeeds * listDetalItem.quantity, needs: relativeNeeds * listDetalItem.quantity, 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) || '-' });
+                    return Object.assign(Object.assign(Object.assign({}, foundedDetal), (0, sequelize_1.addFieldByCondition)(data.isNeedsTypes, {
+                        entity_type: enums_1.IzdType.detal
+                    })), { count_to_obj: listDetalItem.quantity, count_to_needs: relativeNeeds * listDetalItem.quantity, needs: relativeNeeds * listDetalItem.quantity, 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) || '-' });
                 })) || [];
             relative.detalsGraph = [...relative.detals];
         }
         if (isAppendedMaterials) {
-            /**
-             * @todo если в одной детали материал будет и заготовкой, и в спецификации, то
-             * в materialGraph этот материал продублируется с одинаковым родителем,
-             * хотя должен был увеличиться needs.
-             * На unicalMaterialNeeds это не влияет. Там подсчеты верны
-             */
             const concatedMaterialLists = ((relative === null || relative === void 0 ? void 0 : relative.materialList) || [])
-                .concat((relative === null || relative === void 0 ? void 0 : relative.listPokDet) || [], (relative === null || relative === void 0 ? void 0 : relative.mat_zag) ? { id: relative === null || relative === void 0 ? void 0 : relative.mat_zag, quantity: 1 } : null, (relative === null || relative === void 0 ? void 0 : relative.mat_zag_zam)
-                ? { id: relative === null || relative === void 0 ? void 0 : relative.mat_zag_zam, quantity: 1 }
-                : null)
+                .concat((relative === null || relative === void 0 ? void 0 : relative.listPokDet) || [])
                 .filter(Boolean);
-            relative.materials = concatedMaterialLists.map((listMaterialItem) => {
+            if (relative === null || relative === void 0 ? void 0 : relative.mat_zag) {
+                const material = materials.find(currentMaterial => currentMaterial.id === (relative === null || relative === void 0 ? void 0 : relative.mat_zag));
+                if (material) {
+                    const detalMass = relative.workpiece_characterization.mass;
+                    const materialConverRate = (0, exports.calculateByMeasurementRate)(material.units_measurement, 3);
+                    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 materialMap = new Map();
+            const materialsArray = concatedMaterialLists.map((listMaterialItem) => {
                 const foundedMaterials = materials.find(material => listMaterialItem.id === material.id);
-                return Object.assign(Object.assign({}, foundedMaterials), { count_to_obj: listMaterialItem.quantity, count_to_needs: relativeNeeds * listMaterialItem.quantity, needs: relativeNeeds * listMaterialItem.quantity, 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) || '-' });
+                //конвертируем потребность в ШТ
+                const materialConverRate = foundedMaterials
+                    ? (0, exports.calculateByMeasurementRate)(foundedMaterials.units_measurement, listMaterialItem.measureId)
+                    : 0;
+                const specificationConvertedQuantity = 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) || '-' });
+            });
+            materialsArray.forEach((currentMaterial) => {
+                const materialKey = `${currentMaterial.parent_id}_${currentMaterial.parent_type}_${currentMaterial.id}`;
+                if (materialMap.has(materialKey)) {
+                    const material = materialMap.get(materialKey);
+                    materialMap.set(materialKey, Object.assign(Object.assign({}, material), { needs: material.needs + currentMaterial.needs, count_to_obj: material.count_to_obj + currentMaterial.count_to_obj, count_to_needs: material.count_to_needs + currentMaterial.count_to_needs }));
+                }
+                else {
+                    materialMap.set(materialKey, currentMaterial);
+                }
             });
+            relative.materials = Array.from(materialMap.values());
             relative.materialGraph = [...relative.materials];
         }
         if ((_c = relative === null || relative === void 0 ? void 0 : relative.listCbed) === null || _c === void 0 ? void 0 : _c.length) {
@@ -788,6 +826,10 @@ const countChildrensRelative = (data) => {
             })
                 .filter(entity => entity.id);
         }
+        else {
+            relative.unicalDetalNeeds = [];
+            relative.unicalCbedNeeds = [];
+        }
         if (isAppendedMaterials) {
             const unicalMaterialNeedsObject = {};
             for (const material of relative.materialGraph) {

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

@@ -65,6 +65,7 @@ export type ParentTypeFilter = {
 };
 export type countChildrensRelativeType = {
     relativeEntity: any;
+    isNeedsTypes?: boolean;
     relativeEntityType: IzdType;
     isAppendedMaterials: boolean;
     detals: ModelDetal[];
@@ -73,6 +74,7 @@ export type countChildrensRelativeType = {
 };
 export type RecursiveGraphParentType = {
     id: number;
+    entity_type?: IzdType;
     listCbed: EntityCommonSpecificationArray;
     listDetal: EntityCommonSpecificationArray;
     materialList: EntityCommonSpecificationArray;
@@ -103,6 +105,9 @@ export type RecursiveGraphType = {
     count_to_needs?: number;
     needs?: number;
     parent_id?: number;
+    measure_id?: number;
+    count_to_obj_not_converted?: number;
+    count_to_needs_not_converted?: number;
     parent_type?: IzdType;
     parent_designation?: string;
     parent_name?: string;

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

@@ -31,9 +31,9 @@ export declare const CreateWaybillProductSchema: z.ZodObject<{
     detalId?: number | null | undefined;
     equipmentId?: number | null | undefined;
     materialId?: number | null | undefined;
+    productId?: number | null | undefined;
     sum?: number | undefined;
     cbedId?: number | null | undefined;
-    productId?: number | null | undefined;
     assembleId?: number | null | undefined;
     toolsId?: number | null | undefined;
     instrumentId?: number | null | undefined;
@@ -51,9 +51,9 @@ export declare const CreateWaybillProductSchema: z.ZodObject<{
     detalId?: number | null | undefined;
     equipmentId?: number | null | undefined;
     materialId?: number | null | undefined;
+    productId?: number | null | undefined;
     sum?: number | undefined;
     cbedId?: number | null | undefined;
-    productId?: number | null | undefined;
     assembleId?: number | null | undefined;
     toolsId?: number | null | undefined;
     instrumentId?: number | null | undefined;

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

@@ -32,9 +32,9 @@ export declare const CreateWaybillDtoZod: z.ZodObject<{
         detalId?: number | null | undefined;
         equipmentId?: number | null | undefined;
         materialId?: number | null | undefined;
+        productId?: number | null | undefined;
         sum?: number | undefined;
         cbedId?: number | null | undefined;
-        productId?: number | null | undefined;
         assembleId?: number | null | undefined;
         toolsId?: number | null | undefined;
         instrumentId?: number | null | undefined;
@@ -52,9 +52,9 @@ export declare const CreateWaybillDtoZod: z.ZodObject<{
         detalId?: number | null | undefined;
         equipmentId?: number | null | undefined;
         materialId?: number | null | undefined;
+        productId?: number | null | undefined;
         sum?: number | undefined;
         cbedId?: number | null | undefined;
-        productId?: number | null | undefined;
         assembleId?: number | null | undefined;
         toolsId?: number | null | undefined;
         instrumentId?: number | null | undefined;
@@ -84,9 +84,9 @@ export declare const CreateWaybillDtoZod: z.ZodObject<{
         detalId?: number | null | undefined;
         equipmentId?: number | null | undefined;
         materialId?: number | null | undefined;
+        productId?: number | null | undefined;
         sum?: number | undefined;
         cbedId?: number | null | undefined;
-        productId?: number | null | undefined;
         assembleId?: number | null | undefined;
         toolsId?: number | null | undefined;
         instrumentId?: number | null | undefined;
@@ -112,9 +112,9 @@ export declare const CreateWaybillDtoZod: z.ZodObject<{
         detalId?: number | null | undefined;
         equipmentId?: number | null | undefined;
         materialId?: number | null | undefined;
+        productId?: number | null | undefined;
         sum?: number | undefined;
         cbedId?: number | null | undefined;
-        productId?: number | null | undefined;
         assembleId?: number | null | undefined;
         toolsId?: number | null | undefined;
         instrumentId?: number | null | undefined;

package/package.json

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