@pksep/zod-shared 0.0.538 → 0.0.540
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/assemble/dto/get-assemble-pagination-sclad.dto.d.ts +3 -0
- package/dist/assemble/dto/get-assemble-pagination-sclad.dto.js +1 -0
- package/dist/assemble/interfaces/interfaces.d.ts +3 -0
- package/dist/cbed/dto/get-deficit.dto.d.ts +3 -0
- package/dist/cbed/dto/get-deficit.dto.js +1 -0
- package/dist/detal/dto/get-deficit.dto.d.ts +3 -0
- package/dist/detal/dto/get-deficit.dto.js +1 -0
- package/dist/metaloworking/dto/get-metallworking-pagination.dto.d.ts +3 -0
- package/dist/metaloworking/dto/get-metallworking-pagination.dto.js +1 -0
- package/dist/product/dto/get-deficit.dto.d.ts +3 -0
- package/dist/product/dto/get-deficit.dto.js +1 -0
- package/dist/production-tasks/dto/get-production-task-by-equipment.dto.d.ts +6 -0
- package/dist/production-tasks/dto/get-production-task-by-equipment.dto.js +2 -0
- package/dist/production-tasks/dto/get-production-task-by-operation.dto.d.ts +3 -0
- package/dist/production-tasks/dto/get-production-task-by-operation.dto.js +1 -0
- package/dist/production-tasks/interfaces/production-tasks.d.ts +2 -0
- package/dist/utils/date.methods.js +3 -5
- package/dist/utils/sorting.js +1 -1
- package/dist/utils/tables-config/enum.d.ts +2 -1
- package/dist/utils/tables-config/enum.js +4 -0
- package/dist/utils/tables-config/tables-array.js +10 -4
- package/package.json +1 -1
|
@@ -8,6 +8,7 @@ export declare const GetAssembleScladPaginationDtoZod: z.ZodObject<{
|
|
|
8
8
|
byParents: z.ZodOptional<z.ZodNullable<z.ZodType<IFiltersByParents, z.ZodTypeDef, IFiltersByParents>>>;
|
|
9
9
|
type: z.ZodDefault<z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof AssembleIzdEnum>>>>;
|
|
10
10
|
byOrder: z.ZodOptional<z.ZodNullable<z.ZodType<IFiltersByByOrder, z.ZodTypeDef, IFiltersByByOrder>>>;
|
|
11
|
+
isDiscontinued: z.ZodDefault<z.ZodOptional<z.ZodNullable<z.ZodBoolean>>>;
|
|
11
12
|
sort: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
12
13
|
sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof import("../../utils").ProductionPlanSortField>>>;
|
|
13
14
|
sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
|
|
@@ -26,6 +27,7 @@ export declare const GetAssembleScladPaginationDtoZod: z.ZodObject<{
|
|
|
26
27
|
}[];
|
|
27
28
|
page: number;
|
|
28
29
|
searchString: string;
|
|
30
|
+
isDiscontinued: boolean | null;
|
|
29
31
|
responsibleUserId?: number | null | undefined;
|
|
30
32
|
byParents?: IFiltersByParents | null | undefined;
|
|
31
33
|
byOrder?: IFiltersByByOrder | null | undefined;
|
|
@@ -38,6 +40,7 @@ export declare const GetAssembleScladPaginationDtoZod: z.ZodObject<{
|
|
|
38
40
|
sortDesc?: boolean | undefined;
|
|
39
41
|
}[] | undefined;
|
|
40
42
|
responsibleUserId?: number | null | undefined;
|
|
43
|
+
isDiscontinued?: boolean | null | undefined;
|
|
41
44
|
byParents?: IFiltersByParents | null | undefined;
|
|
42
45
|
byOrder?: IFiltersByByOrder | null | undefined;
|
|
43
46
|
}>;
|
|
@@ -10,5 +10,6 @@ exports.GetAssembleScladPaginationDtoZod = zod_1.z.object({
|
|
|
10
10
|
byParents: zod_1.z.custom().nullable().optional(),
|
|
11
11
|
type: zod_1.z.nativeEnum(utils_1.AssembleIzdEnum).nullish().default(utils_1.AssembleIzdEnum.all),
|
|
12
12
|
byOrder: zod_1.z.custom().nullable().optional(),
|
|
13
|
+
isDiscontinued: zod_1.z.boolean().nullable().optional().default(false),
|
|
13
14
|
sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
|
|
14
15
|
});
|
|
@@ -57,6 +57,7 @@ export interface IChangeInKitQuantity {
|
|
|
57
57
|
export interface IChangeCreateMarksComplect {
|
|
58
58
|
kitsSelected: IKitSelected[];
|
|
59
59
|
marks: any[];
|
|
60
|
+
userId?: number;
|
|
60
61
|
relativeActionId?: number;
|
|
61
62
|
isWaybill: boolean;
|
|
62
63
|
transaction?: any;
|
|
@@ -83,6 +84,7 @@ export interface ICreateMovementObject {
|
|
|
83
84
|
waybill_id?: number;
|
|
84
85
|
revision_id?: number;
|
|
85
86
|
sh_complit_id?: number;
|
|
87
|
+
user_id?: number;
|
|
86
88
|
detal_id?: number;
|
|
87
89
|
cbed_id?: number;
|
|
88
90
|
product_id?: number;
|
|
@@ -94,6 +96,7 @@ type KitsSelected = {
|
|
|
94
96
|
export interface IChangeShipmentsAssemblyKits {
|
|
95
97
|
kitsSelected: KitsSelected[];
|
|
96
98
|
userId?: number;
|
|
99
|
+
relativeActionId?: number;
|
|
97
100
|
transaction: any;
|
|
98
101
|
}
|
|
99
102
|
export interface IGetKitsByParents {
|
|
@@ -6,6 +6,7 @@ export declare const GetDeficitDtoZod: z.ZodObject<{
|
|
|
6
6
|
statusWorking: z.ZodNativeEnum<typeof statusWorkingsDeficit>;
|
|
7
7
|
searchString: z.ZodString;
|
|
8
8
|
shipmentIds: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodNumber, "many">>>;
|
|
9
|
+
isDiscontinued: z.ZodDefault<z.ZodOptional<z.ZodNullable<z.ZodBoolean>>>;
|
|
9
10
|
sort: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
10
11
|
sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof import("../../utils").ProductionPlanSortField>>>;
|
|
11
12
|
sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
|
|
@@ -22,6 +23,7 @@ export declare const GetDeficitDtoZod: z.ZodObject<{
|
|
|
22
23
|
sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
|
|
23
24
|
}[];
|
|
24
25
|
searchString: string;
|
|
26
|
+
isDiscontinued: boolean | null;
|
|
25
27
|
statusWorking: statusWorkingsDeficit;
|
|
26
28
|
cbedIds: number[];
|
|
27
29
|
page?: number | null | undefined;
|
|
@@ -35,6 +37,7 @@ export declare const GetDeficitDtoZod: z.ZodObject<{
|
|
|
35
37
|
sortDesc?: boolean | undefined;
|
|
36
38
|
}[] | undefined;
|
|
37
39
|
page?: number | null | undefined;
|
|
40
|
+
isDiscontinued?: boolean | null | undefined;
|
|
38
41
|
shipmentIds?: number[] | null | undefined;
|
|
39
42
|
}>;
|
|
40
43
|
export type GetDeficitDtoZodType = z.infer<typeof GetDeficitDtoZod>;
|
|
@@ -9,5 +9,6 @@ exports.GetDeficitDtoZod = zod_1.z.object({
|
|
|
9
9
|
statusWorking: zod_1.z.nativeEnum(utils_1.statusWorkingsDeficit),
|
|
10
10
|
searchString: zod_1.z.string(),
|
|
11
11
|
shipmentIds: zod_1.z.array(zod_1.z.number()).nullable().optional(),
|
|
12
|
+
isDiscontinued: zod_1.z.boolean().nullable().optional().default(false),
|
|
12
13
|
sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
|
|
13
14
|
});
|
|
@@ -6,6 +6,7 @@ export declare const GetDetalDeficitDtoZod: z.ZodObject<{
|
|
|
6
6
|
searchString: z.ZodDefault<z.ZodOptional<z.ZodString>>;
|
|
7
7
|
shipmentIds: z.ZodDefault<z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>>>;
|
|
8
8
|
page: z.ZodNumber;
|
|
9
|
+
isDiscontinued: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
|
|
9
10
|
sort: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
10
11
|
sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof import("../../utils").ProductionPlanSortField>>>;
|
|
11
12
|
sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
|
|
@@ -23,6 +24,7 @@ export declare const GetDetalDeficitDtoZod: z.ZodObject<{
|
|
|
23
24
|
}[];
|
|
24
25
|
page: number;
|
|
25
26
|
searchString: string;
|
|
27
|
+
isDiscontinued: boolean;
|
|
26
28
|
detalIds: number[];
|
|
27
29
|
statusWorking: statusWorkingsDeficit;
|
|
28
30
|
shipmentIds: number[] | null;
|
|
@@ -33,6 +35,7 @@ export declare const GetDetalDeficitDtoZod: z.ZodObject<{
|
|
|
33
35
|
sortDesc?: boolean | undefined;
|
|
34
36
|
}[] | undefined;
|
|
35
37
|
searchString?: string | undefined;
|
|
38
|
+
isDiscontinued?: boolean | undefined;
|
|
36
39
|
detalIds?: number[] | undefined;
|
|
37
40
|
statusWorking?: statusWorkingsDeficit | undefined;
|
|
38
41
|
shipmentIds?: number[] | null | undefined;
|
|
@@ -12,5 +12,6 @@ exports.GetDetalDeficitDtoZod = zod_1.z.object({
|
|
|
12
12
|
searchString: zod_1.z.string().optional().default(''),
|
|
13
13
|
shipmentIds: zod_1.z.number().int().array().optional().nullable().default(null),
|
|
14
14
|
page: zod_1.z.number().int(),
|
|
15
|
+
isDiscontinued: zod_1.z.boolean().optional().default(false),
|
|
15
16
|
sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
|
|
16
17
|
});
|
|
@@ -8,6 +8,7 @@ export declare const GetMetaloworkingPaginationDtoZod: z.ZodObject<{
|
|
|
8
8
|
byParents: z.ZodOptional<z.ZodNullable<z.ZodType<IFiltersByParents, z.ZodTypeDef, IFiltersByParents>>>;
|
|
9
9
|
byOrder: z.ZodOptional<z.ZodNullable<z.ZodType<IFiltersByByOrder, z.ZodTypeDef, IFiltersByByOrder>>>;
|
|
10
10
|
childrenByProductionTaskIds: z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>>;
|
|
11
|
+
isDiscontinued: z.ZodDefault<z.ZodOptional<z.ZodNullable<z.ZodBoolean>>>;
|
|
11
12
|
sort: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
12
13
|
sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof import("../../utils").ProductionPlanSortField>>>;
|
|
13
14
|
sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
|
|
@@ -26,6 +27,7 @@ export declare const GetMetaloworkingPaginationDtoZod: z.ZodObject<{
|
|
|
26
27
|
page: number;
|
|
27
28
|
searchString: string;
|
|
28
29
|
isBan: boolean;
|
|
30
|
+
isDiscontinued: boolean | null;
|
|
29
31
|
responsibleUserId?: number | null | undefined;
|
|
30
32
|
byParents?: IFiltersByParents | null | undefined;
|
|
31
33
|
byOrder?: IFiltersByByOrder | null | undefined;
|
|
@@ -39,6 +41,7 @@ export declare const GetMetaloworkingPaginationDtoZod: z.ZodObject<{
|
|
|
39
41
|
sortDesc?: boolean | undefined;
|
|
40
42
|
}[] | undefined;
|
|
41
43
|
responsibleUserId?: number | null | undefined;
|
|
44
|
+
isDiscontinued?: boolean | null | undefined;
|
|
42
45
|
byParents?: IFiltersByParents | null | undefined;
|
|
43
46
|
byOrder?: IFiltersByByOrder | null | undefined;
|
|
44
47
|
childrenByProductionTaskIds?: number[] | null | undefined;
|
|
@@ -11,5 +11,6 @@ exports.GetMetaloworkingPaginationDtoZod = zod_1.z.object({
|
|
|
11
11
|
byParents: zod_1.z.custom().nullable().optional(),
|
|
12
12
|
byOrder: zod_1.z.custom().nullable().optional(),
|
|
13
13
|
childrenByProductionTaskIds: zod_1.z.array(zod_1.z.number()).optional().nullable(),
|
|
14
|
+
isDiscontinued: zod_1.z.boolean().nullable().optional().default(false),
|
|
14
15
|
sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
|
|
15
16
|
});
|
|
@@ -6,6 +6,7 @@ export declare const GetDeficitProductSchema: z.ZodObject<{
|
|
|
6
6
|
searchString: z.ZodString;
|
|
7
7
|
shipmentIds: z.ZodNullable<z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>>;
|
|
8
8
|
page: z.ZodOptional<z.ZodNumber>;
|
|
9
|
+
isDiscontinued: z.ZodDefault<z.ZodOptional<z.ZodNullable<z.ZodBoolean>>>;
|
|
9
10
|
sort: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
10
11
|
sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof import("../../utils").ProductionPlanSortField>>>;
|
|
11
12
|
sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
|
|
@@ -22,6 +23,7 @@ export declare const GetDeficitProductSchema: z.ZodObject<{
|
|
|
22
23
|
sortField?: import("../../utils").ProductionPlanSortField | null | undefined;
|
|
23
24
|
}[];
|
|
24
25
|
searchString: string;
|
|
26
|
+
isDiscontinued: boolean | null;
|
|
25
27
|
statusWorking: statusWorkingsDeficit;
|
|
26
28
|
productIds: number[];
|
|
27
29
|
page?: number | undefined;
|
|
@@ -35,6 +37,7 @@ export declare const GetDeficitProductSchema: z.ZodObject<{
|
|
|
35
37
|
sortDesc?: boolean | undefined;
|
|
36
38
|
}[] | undefined;
|
|
37
39
|
page?: number | undefined;
|
|
40
|
+
isDiscontinued?: boolean | null | undefined;
|
|
38
41
|
shipmentIds?: number[] | null | undefined;
|
|
39
42
|
}>;
|
|
40
43
|
export type GetDeficitProductDtoType = z.infer<typeof GetDeficitProductSchema>;
|
|
@@ -9,5 +9,6 @@ exports.GetDeficitProductSchema = zod_1.z.object({
|
|
|
9
9
|
searchString: zod_1.z.string(),
|
|
10
10
|
shipmentIds: zod_1.z.number().int().array().optional().nullable(),
|
|
11
11
|
page: zod_1.z.number().int().optional(),
|
|
12
|
+
isDiscontinued: zod_1.z.boolean().nullable().optional().default(false),
|
|
12
13
|
sort: zod_1.z.array(utils_1.ProductionPlanSortRuleSchema).optional().default([])
|
|
13
14
|
});
|
|
@@ -3,6 +3,7 @@ import { WorkStartCalcTypeFilter } from '../../operations/enums/enums';
|
|
|
3
3
|
export declare const GetProductionTaskByEquipmentDtoZod: z.ZodObject<{
|
|
4
4
|
equipmentId: z.ZodNumber;
|
|
5
5
|
searchString: z.ZodOptional<z.ZodString>;
|
|
6
|
+
page: z.ZodDefault<z.ZodNumber>;
|
|
6
7
|
taskId: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
7
8
|
range: z.ZodOptional<z.ZodNullable<z.ZodObject<{
|
|
8
9
|
start: z.ZodAny;
|
|
@@ -15,9 +16,12 @@ export declare const GetProductionTaskByEquipmentDtoZod: z.ZodObject<{
|
|
|
15
16
|
end?: any;
|
|
16
17
|
}>>>;
|
|
17
18
|
onlyTOperation: z.ZodOptional<z.ZodNumber>;
|
|
19
|
+
isShowCbed: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
|
|
18
20
|
workStartCalcTypeFilter: z.ZodOptional<z.ZodArray<z.ZodNativeEnum<typeof WorkStartCalcTypeFilter>, "many">>;
|
|
19
21
|
}, "strip", z.ZodTypeAny, {
|
|
22
|
+
page: number;
|
|
20
23
|
equipmentId: number;
|
|
24
|
+
isShowCbed: boolean;
|
|
21
25
|
searchString?: string | undefined;
|
|
22
26
|
range?: {
|
|
23
27
|
start?: any;
|
|
@@ -28,6 +32,7 @@ export declare const GetProductionTaskByEquipmentDtoZod: z.ZodObject<{
|
|
|
28
32
|
workStartCalcTypeFilter?: WorkStartCalcTypeFilter[] | undefined;
|
|
29
33
|
}, {
|
|
30
34
|
equipmentId: number;
|
|
35
|
+
page?: number | undefined;
|
|
31
36
|
searchString?: string | undefined;
|
|
32
37
|
range?: {
|
|
33
38
|
start?: any;
|
|
@@ -36,5 +41,6 @@ export declare const GetProductionTaskByEquipmentDtoZod: z.ZodObject<{
|
|
|
36
41
|
taskId?: number | null | undefined;
|
|
37
42
|
onlyTOperation?: number | undefined;
|
|
38
43
|
workStartCalcTypeFilter?: WorkStartCalcTypeFilter[] | undefined;
|
|
44
|
+
isShowCbed?: boolean | undefined;
|
|
39
45
|
}>;
|
|
40
46
|
export type GetProductionTaskByEquipmentDtoZodType = z.infer<typeof GetProductionTaskByEquipmentDtoZod>;
|
|
@@ -6,6 +6,7 @@ const enums_1 = require("../../operations/enums/enums");
|
|
|
6
6
|
exports.GetProductionTaskByEquipmentDtoZod = zod_1.z.object({
|
|
7
7
|
equipmentId: zod_1.z.number().int(),
|
|
8
8
|
searchString: zod_1.z.string().optional(),
|
|
9
|
+
page: zod_1.z.number().default(0),
|
|
9
10
|
taskId: zod_1.z.number().int().nullish(),
|
|
10
11
|
range: zod_1.z
|
|
11
12
|
.object({
|
|
@@ -15,6 +16,7 @@ exports.GetProductionTaskByEquipmentDtoZod = zod_1.z.object({
|
|
|
15
16
|
.nullable()
|
|
16
17
|
.optional(),
|
|
17
18
|
onlyTOperation: zod_1.z.number().int().optional(),
|
|
19
|
+
isShowCbed: zod_1.z.boolean().optional().default(false),
|
|
18
20
|
workStartCalcTypeFilter: zod_1.z
|
|
19
21
|
.array(zod_1.z.nativeEnum(enums_1.WorkStartCalcTypeFilter))
|
|
20
22
|
.optional()
|
|
@@ -2,6 +2,7 @@ import { z } from 'zod';
|
|
|
2
2
|
import { StockOrderType } from '../../utils';
|
|
3
3
|
export declare const GetProductionTaskByOperationDtoZod: z.ZodObject<{
|
|
4
4
|
operationTypeId: z.ZodNumber;
|
|
5
|
+
page: z.ZodDefault<z.ZodNumber>;
|
|
5
6
|
searchString: z.ZodOptional<z.ZodString>;
|
|
6
7
|
taskId: z.ZodOptional<z.ZodDefault<z.ZodNullable<z.ZodNumber>>>;
|
|
7
8
|
onlyTOperation: z.ZodOptional<z.ZodNumber>;
|
|
@@ -18,6 +19,7 @@ export declare const GetProductionTaskByOperationDtoZod: z.ZodObject<{
|
|
|
18
19
|
equipmentIds: z.ZodDefault<z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodNumber, "many">>>>;
|
|
19
20
|
productionOperationType: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof StockOrderType>>>;
|
|
20
21
|
}, "strip", z.ZodTypeAny, {
|
|
22
|
+
page: number;
|
|
21
23
|
equipmentIds: number[] | null;
|
|
22
24
|
operationTypeId: number;
|
|
23
25
|
searchString?: string | undefined;
|
|
@@ -30,6 +32,7 @@ export declare const GetProductionTaskByOperationDtoZod: z.ZodObject<{
|
|
|
30
32
|
productionOperationType?: StockOrderType | null | undefined;
|
|
31
33
|
}, {
|
|
32
34
|
operationTypeId: number;
|
|
35
|
+
page?: number | undefined;
|
|
33
36
|
equipmentIds?: number[] | null | undefined;
|
|
34
37
|
searchString?: string | undefined;
|
|
35
38
|
range?: {
|
|
@@ -5,6 +5,7 @@ const zod_1 = require("zod");
|
|
|
5
5
|
const utils_1 = require("../../utils");
|
|
6
6
|
exports.GetProductionTaskByOperationDtoZod = zod_1.z.object({
|
|
7
7
|
operationTypeId: zod_1.z.number().int(),
|
|
8
|
+
page: zod_1.z.number().int().min(0).default(0),
|
|
8
9
|
searchString: zod_1.z.string().optional(),
|
|
9
10
|
taskId: zod_1.z.number().int().nullable().default(null).optional(),
|
|
10
11
|
onlyTOperation: zod_1.z.number().int().optional(),
|
|
@@ -13,6 +13,7 @@ import { ModelDetal } from '../../detal';
|
|
|
13
13
|
import { ModelCbed } from '../../cbed';
|
|
14
14
|
import { ModelProduct } from '../../product/schemas/product.schema';
|
|
15
15
|
import { ModelProductionOperationPos } from '../schemas/production-operation-pos.schema';
|
|
16
|
+
import { ModelMaterial } from '../../material';
|
|
16
17
|
export interface IMarkExecute {
|
|
17
18
|
quantity: number;
|
|
18
19
|
executionTime: number;
|
|
@@ -255,6 +256,7 @@ export interface IGetByEquipment {
|
|
|
255
256
|
attention: boolean;
|
|
256
257
|
discontinued: boolean;
|
|
257
258
|
id: number;
|
|
259
|
+
material?: ModelMaterial | null;
|
|
258
260
|
};
|
|
259
261
|
detalIdx: number;
|
|
260
262
|
calculatedCreateTime: Date;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DateMethods = void 0;
|
|
4
|
+
const methods_1 = require("./methods");
|
|
4
5
|
/**
|
|
5
6
|
* @returns date: DD.MM.YYYY
|
|
6
7
|
* @returns time: H:M.S
|
|
@@ -64,9 +65,6 @@ class DateMethods {
|
|
|
64
65
|
const end = calculatedCreateTimeDate <= planReadyTimeDate
|
|
65
66
|
? planReadyTimeDate
|
|
66
67
|
: calculatedCreateTimeDate;
|
|
67
|
-
const workDayStartHour = 5;
|
|
68
|
-
const workDayHours = 8;
|
|
69
|
-
const workDayEndHour = workDayStartHour + workDayHours;
|
|
70
68
|
const isWorkDay = (date) => {
|
|
71
69
|
var _a, _b;
|
|
72
70
|
const dayOfWeek = date.getUTCDay();
|
|
@@ -93,9 +91,9 @@ class DateMethods {
|
|
|
93
91
|
continue;
|
|
94
92
|
}
|
|
95
93
|
const workStart = new Date(current);
|
|
96
|
-
workStart.setUTCHours(
|
|
94
|
+
workStart.setUTCHours(methods_1.WORK_DAY_START_HOUR, 0, 0, 0);
|
|
97
95
|
const workEnd = new Date(current);
|
|
98
|
-
workEnd.setUTCHours(
|
|
96
|
+
workEnd.setUTCHours(methods_1.WORK_DAY_END_HOUR, methods_1.WORK_DAY_END_MINUTE, 0, 0);
|
|
99
97
|
const actualStart = current > workStart ? current : workStart;
|
|
100
98
|
const actualEnd = end < workEnd ? end : workEnd;
|
|
101
99
|
if (actualStart < actualEnd) {
|
package/dist/utils/sorting.js
CHANGED
|
@@ -41,7 +41,7 @@ const compareValues = (firstValue, secondValue, desc = false) => {
|
|
|
41
41
|
if (isFirstNull || isSecondNull) {
|
|
42
42
|
if (isFirstNull && isSecondNull)
|
|
43
43
|
return 0;
|
|
44
|
-
return isFirstNull ? (desc ? 1 :
|
|
44
|
+
return isFirstNull ? (desc ? -1 : 1) : desc ? 1 : -1;
|
|
45
45
|
}
|
|
46
46
|
const normalizedFirstValue = normalizeSortValue(firstValue);
|
|
47
47
|
const normalizedSecondValue = normalizeSortValue(secondValue);
|
|
@@ -42,5 +42,6 @@ export declare enum tablesEnumConfig {
|
|
|
42
42
|
readyToComplect = "readyToComplect",
|
|
43
43
|
readyInProcent = "readyInProcent",
|
|
44
44
|
readyToAssembleQuantity = "readyToAssembleQuantity",
|
|
45
|
-
deltaTime = "deltaTime"
|
|
45
|
+
deltaTime = "deltaTime",
|
|
46
|
+
childrenCalculateNeedsTime = "childrenCalculateNeedsTime"
|
|
46
47
|
}
|
|
@@ -23,7 +23,9 @@ var tablesEnumConfig;
|
|
|
23
23
|
tablesEnumConfig["calculateAssembleTime"] = "calculateAssembleTime";
|
|
24
24
|
// заказано по ПЗ
|
|
25
25
|
tablesEnumConfig["orderedByProduction"] = "orderedByProduction";
|
|
26
|
+
// просрочка изготовления
|
|
26
27
|
tablesEnumConfig["productionDelay"] = "productionDelay";
|
|
28
|
+
// просрочка начала работ
|
|
27
29
|
tablesEnumConfig["startTimeDelay"] = "startTimeDelay";
|
|
28
30
|
// заказано
|
|
29
31
|
tablesEnumConfig["ordered"] = "ordered";
|
|
@@ -84,4 +86,6 @@ var tablesEnumConfig;
|
|
|
84
86
|
tablesEnumConfig["readyToAssembleQuantity"] = "readyToAssembleQuantity";
|
|
85
87
|
// Дельта по времени
|
|
86
88
|
tablesEnumConfig["deltaTime"] = "deltaTime";
|
|
89
|
+
// Готовность к комплектации
|
|
90
|
+
tablesEnumConfig["childrenCalculateNeedsTime"] = "childrenCalculateNeedsTime";
|
|
87
91
|
})(tablesEnumConfig || (exports.tablesEnumConfig = tablesEnumConfig = {}));
|
|
@@ -13,7 +13,6 @@ exports.metalloworkingTableConfig = [
|
|
|
13
13
|
enum_1.tablesEnumConfig.orderedByProduction,
|
|
14
14
|
enum_1.tablesEnumConfig.ordered,
|
|
15
15
|
enum_1.tablesEnumConfig.dateByUrgency,
|
|
16
|
-
enum_1.tablesEnumConfig.dateShipment,
|
|
17
16
|
enum_1.tablesEnumConfig.productionDelay,
|
|
18
17
|
enum_1.tablesEnumConfig.workpieceParameters,
|
|
19
18
|
enum_1.tablesEnumConfig.material,
|
|
@@ -37,7 +36,9 @@ exports.metalDeficitByAssembleTableConfig = [
|
|
|
37
36
|
enum_1.tablesEnumConfig.deficitByProductionTask,
|
|
38
37
|
enum_1.tablesEnumConfig.orderedByProduction,
|
|
39
38
|
enum_1.tablesEnumConfig.ordered,
|
|
39
|
+
enum_1.tablesEnumConfig.startTimeDelay,
|
|
40
40
|
enum_1.tablesEnumConfig.productionDelay,
|
|
41
|
+
enum_1.tablesEnumConfig.childrenCalculateNeedsTime,
|
|
41
42
|
enum_1.tablesEnumConfig.operationsLength,
|
|
42
43
|
enum_1.tablesEnumConfig.operationList,
|
|
43
44
|
enum_1.tablesEnumConfig.totalTimePerItem,
|
|
@@ -58,11 +59,12 @@ exports.onlineBoardProductionTableConfig = [
|
|
|
58
59
|
enum_1.tablesEnumConfig.calculatedCreateTime,
|
|
59
60
|
enum_1.tablesEnumConfig.warehouseReadinessDate,
|
|
60
61
|
enum_1.tablesEnumConfig.calculateNeedsTime,
|
|
61
|
-
enum_1.tablesEnumConfig.dateShipment,
|
|
62
62
|
enum_1.tablesEnumConfig.deficitByCurrentProductionTask,
|
|
63
63
|
enum_1.tablesEnumConfig.deficitByProductionTask,
|
|
64
64
|
enum_1.tablesEnumConfig.ordered,
|
|
65
|
+
enum_1.tablesEnumConfig.startTimeDelay,
|
|
65
66
|
enum_1.tablesEnumConfig.productionDelay,
|
|
67
|
+
enum_1.tablesEnumConfig.childrenCalculateNeedsTime,
|
|
66
68
|
enum_1.tablesEnumConfig.readyToComplect,
|
|
67
69
|
enum_1.tablesEnumConfig.operationsLength,
|
|
68
70
|
enum_1.tablesEnumConfig.operationList,
|
|
@@ -82,10 +84,11 @@ exports.onlineBoardTableConfig = [
|
|
|
82
84
|
enum_1.tablesEnumConfig.startTime,
|
|
83
85
|
enum_1.tablesEnumConfig.calculatedCreateTime,
|
|
84
86
|
enum_1.tablesEnumConfig.calculateNeedsTime,
|
|
85
|
-
enum_1.tablesEnumConfig.dateShipment,
|
|
86
87
|
enum_1.tablesEnumConfig.deficitByProductionTask,
|
|
87
88
|
enum_1.tablesEnumConfig.ordered,
|
|
89
|
+
enum_1.tablesEnumConfig.startTimeDelay,
|
|
88
90
|
enum_1.tablesEnumConfig.productionDelay,
|
|
91
|
+
enum_1.tablesEnumConfig.childrenCalculateNeedsTime,
|
|
89
92
|
enum_1.tablesEnumConfig.readyToComplect,
|
|
90
93
|
enum_1.tablesEnumConfig.operationsLength,
|
|
91
94
|
enum_1.tablesEnumConfig.operationList,
|
|
@@ -105,7 +108,6 @@ exports.assembleTableConfig = [
|
|
|
105
108
|
enum_1.tablesEnumConfig.calculatedCreateTime,
|
|
106
109
|
enum_1.tablesEnumConfig.calculateNeedsTime,
|
|
107
110
|
enum_1.tablesEnumConfig.dateByUrgency,
|
|
108
|
-
enum_1.tablesEnumConfig.dateShipment,
|
|
109
111
|
enum_1.tablesEnumConfig.productionDelay,
|
|
110
112
|
enum_1.tablesEnumConfig.operationsLength,
|
|
111
113
|
enum_1.tablesEnumConfig.readyInProcent,
|
|
@@ -153,6 +155,8 @@ exports.productionTaskByOperationTableConfig = [
|
|
|
153
155
|
enum_1.tablesEnumConfig.image,
|
|
154
156
|
enum_1.tablesEnumConfig.designation,
|
|
155
157
|
enum_1.tablesEnumConfig.name,
|
|
158
|
+
enum_1.tablesEnumConfig.workpieceParameters,
|
|
159
|
+
enum_1.tablesEnumConfig.material,
|
|
156
160
|
enum_1.tablesEnumConfig.startTime,
|
|
157
161
|
enum_1.tablesEnumConfig.calculatedCreateTime,
|
|
158
162
|
enum_1.tablesEnumConfig.calculateNeedsTime,
|
|
@@ -181,6 +185,8 @@ exports.productionTaskByEquipmentTableConfig = [
|
|
|
181
185
|
enum_1.tablesEnumConfig.image,
|
|
182
186
|
enum_1.tablesEnumConfig.designation,
|
|
183
187
|
enum_1.tablesEnumConfig.name,
|
|
188
|
+
enum_1.tablesEnumConfig.workpieceParameters,
|
|
189
|
+
enum_1.tablesEnumConfig.material,
|
|
184
190
|
enum_1.tablesEnumConfig.startTime,
|
|
185
191
|
enum_1.tablesEnumConfig.calculatedCreateTime,
|
|
186
192
|
enum_1.tablesEnumConfig.calculateNeedsTime,
|