@floristcloud/api-lib 1.2.170 → 1.2.172

package/build/commands/integration/one-c/get-one-c-stock-conflict-list.query.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetOneCStockConflictListContractQuery = void 0;
+const get_one_c_stock_conflict_list_request_schema_1 = require("../../../schemas/integration/one-c/get-one-c-stock-conflict-list-request.schema");
+const get_one_c_stock_conflict_list_response_schema_1 = require("../../../schemas/integration/one-c/get-one-c-stock-conflict-list-response.schema");
+var GetOneCStockConflictListContractQuery;
+(function (GetOneCStockConflictListContractQuery) {
+    GetOneCStockConflictListContractQuery.RequestSchema = get_one_c_stock_conflict_list_request_schema_1.GetOneCStockConflictListRequestSchema;
+    GetOneCStockConflictListContractQuery.ResponseSchema = get_one_c_stock_conflict_list_response_schema_1.GetOneCStockConflictListResponseSchema;
+})(GetOneCStockConflictListContractQuery || (exports.GetOneCStockConflictListContractQuery = GetOneCStockConflictListContractQuery = {}));

package/build/commands/integration/one-c/get-one-c-stock-conflict-preview.query.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetOneCStockConflictPreviewContractQuery = void 0;
+const get_one_c_stock_conflict_preview_response_schema_1 = require("../../../schemas/integration/one-c/get-one-c-stock-conflict-preview-response.schema");
+var GetOneCStockConflictPreviewContractQuery;
+(function (GetOneCStockConflictPreviewContractQuery) {
+    GetOneCStockConflictPreviewContractQuery.ResponseSchema = get_one_c_stock_conflict_preview_response_schema_1.GetOneCStockConflictPreviewResponseSchema;
+})(GetOneCStockConflictPreviewContractQuery || (exports.GetOneCStockConflictPreviewContractQuery = GetOneCStockConflictPreviewContractQuery = {}));

package/build/commands/integration/one-c/index.js

@@ -18,3 +18,6 @@ __exportStar(require("./connect-one-c.command"), exports);
 __exportStar(require("./rotate-one-c-password.command"), exports);
 __exportStar(require("./disconnect-one-c.command"), exports);
 __exportStar(require("./get-one-c-status.query"), exports);
+__exportStar(require("./get-one-c-stock-conflict-list.query"), exports);
+__exportStar(require("./get-one-c-stock-conflict-preview.query"), exports);
+__exportStar(require("./resolve-one-c-stock-conflict.command"), exports);

package/build/commands/integration/one-c/resolve-one-c-stock-conflict.command.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ResolveOneCStockConflictContractCommand = void 0;
+const resolve_one_c_stock_conflict_request_schema_1 = require("../../../schemas/integration/one-c/resolve-one-c-stock-conflict-request.schema");
+const resolve_one_c_stock_conflict_response_schema_1 = require("../../../schemas/integration/one-c/resolve-one-c-stock-conflict-response.schema");
+var ResolveOneCStockConflictContractCommand;
+(function (ResolveOneCStockConflictContractCommand) {
+    ResolveOneCStockConflictContractCommand.RequestSchema = resolve_one_c_stock_conflict_request_schema_1.ResolveOneCStockConflictRequestSchema;
+    ResolveOneCStockConflictContractCommand.ResponseSchema = resolve_one_c_stock_conflict_response_schema_1.ResolveOneCStockConflictResponseSchema;
+})(ResolveOneCStockConflictContractCommand || (exports.ResolveOneCStockConflictContractCommand = ResolveOneCStockConflictContractCommand = {}));

package/build/constant/error.js

@@ -1650,6 +1650,23 @@ exports.ERRORS = {
     ONE_C_ORDERS_EXPORT_FAILED: { code: 'OC009', message: 'Failed to export orders to 1C', httpCode: 500 },
     ONE_C_ORDERS_IMPORT_FAILED: { code: 'OC010', message: 'Failed to apply orders from 1C', httpCode: 500 },
     ONE_C_ACTOR_NOT_FOUND: { code: 'OC011', message: 'No company admin to attribute 1C changes to', httpCode: 409 },
+    ONE_C_STOCK_CONFLICT_CHECK_FAILED: { code: 'OC012', message: 'Failed to check 1C stock conflicts', httpCode: 500 },
+    ONE_C_STOCK_CONFLICT_FETCH_FAILED: { code: 'OC013', message: 'Failed to read 1C stock conflicts', httpCode: 500 },
+    ONE_C_STOCK_CONFLICT_NOTIFY_FAILED: { code: 'OC014', message: 'Failed to notify admins about 1C stock conflicts', httpCode: 500 },
+    ONE_C_STOCK_CONFLICT_NOT_FOUND: { code: 'OC015', message: '1C stock conflict not found', httpCode: 404 },
+    // Снимок остатка или строки резерва изменились после предпросмотра — сотрудник пересчитывает решение.
+    ONE_C_STOCK_CONFLICT_STALE: { code: 'OC016', message: '1C stock conflict data changed, refresh the preview', httpCode: 409 },
+    ONE_C_STOCK_CONFLICT_BUSY: { code: 'OC017', message: '1C stock conflicts are being checked, try again', httpCode: 409 },
+    ONE_C_STOCK_CONFLICT_INVALID_DECISION: { code: 'OC018', message: 'Invalid decision for a 1C stock conflict line', httpCode: 400 },
+    ONE_C_STOCK_CONFLICT_LINE_NOT_EDITABLE: { code: 'OC019', message: 'This order line cannot be changed from the panel', httpCode: 409 },
+    ONE_C_STOCK_CONFLICT_PREVIEW_FAILED: { code: 'OC020', message: 'Failed to build 1C stock conflict preview', httpCode: 500 },
+    ONE_C_STOCK_CONFLICT_RESOLVE_FAILED: { code: 'OC021', message: 'Failed to apply 1C stock conflict decision', httpCode: 500 },
+    // Строки менялись, а доступный остаток пересчитать нельзя (товар вне поставки синхронизации 1С) — решение откатывается.
+    ONE_C_STOCK_CONFLICT_BALANCE_NOT_RECOMPUTED: {
+        code: 'OC022',
+        message: 'Product stock cannot be recomputed: it is not in the 1C sync consignment',
+        httpCode: 409,
+    },
     // COMPANY INTEGRATION (общая запись интеграции компании)
     COMPANY_INTEGRATION_FETCH_FAILED: { code: 'CINT001', message: 'Failed to read company integration', httpCode: 500 },
     COMPANY_INTEGRATION_NOT_SAVED: { code: 'CINT002', message: 'Failed to save company integration', httpCode: 500 },

package/build/enum/index.js

@@ -165,3 +165,6 @@ __exportStar(require("./webshop-main-display-mode.enum"), exports);
 __exportStar(require("./webshop-mode.enum"), exports);
 __exportStar(require("./write-off-report-date-basis.enum"), exports);
 __exportStar(require("./write-off-status.enum"), exports);
+__exportStar(require("./one-c-stock-conflict-status.enum"), exports);
+__exportStar(require("./one-c-stock-conflict-line-action.enum"), exports);
+__exportStar(require("./one-c-stock-conflict-line-restriction.enum"), exports);

package/build/enum/notification-type.enum.js

@@ -14,4 +14,6 @@ var NotificationTypeEnum;
     NotificationTypeEnum["ACCOUNT_DELETION_REQUEST_CREATED"] = "ACCOUNT_DELETION_REQUEST_CREATED";
     NotificationTypeEnum["ACCOUNT_DELETION_REQUEST_APPROVED"] = "ACCOUNT_DELETION_REQUEST_APPROVED";
     NotificationTypeEnum["ACCOUNT_DELETION_REQUEST_REJECTED"] = "ACCOUNT_DELETION_REQUEST_REJECTED";
+    // Админам: подтверждён конфликт «остаток 1С меньше резерва FC» или его рост (FC-560).
+    NotificationTypeEnum["ONE_C_STOCK_CONFLICT"] = "ONE_C_STOCK_CONFLICT";
 })(NotificationTypeEnum || (exports.NotificationTypeEnum = NotificationTypeEnum = {}));

package/build/enum/one-c-stock-conflict-line-action.enum.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OneCStockConflictLineActionEnum = void 0;
+// Решение сотрудника по строке заказа в конфликте «остаток 1С меньше резерва FC» (FC-560).
+var OneCStockConflictLineActionEnum;
+(function (OneCStockConflictLineActionEnum) {
+    OneCStockConflictLineActionEnum["REDUCE"] = "REDUCE";
+    OneCStockConflictLineActionEnum["REMOVE"] = "REMOVE";
+    OneCStockConflictLineActionEnum["KEEP"] = "KEEP";
+})(OneCStockConflictLineActionEnum || (exports.OneCStockConflictLineActionEnum = OneCStockConflictLineActionEnum = {}));

package/build/enum/one-c-stock-conflict-line-restriction.enum.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OneCStockConflictLineRestrictionEnum = void 0;
+// Почему строку в конфликте остатка нельзя менять из панели.
+var OneCStockConflictLineRestrictionEnum;
+(function (OneCStockConflictLineRestrictionEnum) {
+    // Корзина покупателя (WEBSHOP_NEW): сотрудник её не правит, корзина освобождается по таймеру.
+    OneCStockConflictLineRestrictionEnum["CART"] = "CART";
+    // Заказ входит в УПД.
+    OneCStockConflictLineRestrictionEnum["TRANSFER_DOCUMENT"] = "TRANSFER_DOCUMENT";
+})(OneCStockConflictLineRestrictionEnum || (exports.OneCStockConflictLineRestrictionEnum = OneCStockConflictLineRestrictionEnum = {}));

package/build/enum/one-c-stock-conflict-status.enum.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OneCStockConflictStatusEnum = void 0;
+// Конфликт «остаток 1С меньше резерва FC» по товару (FC-560).
+var OneCStockConflictStatusEnum;
+(function (OneCStockConflictStatusEnum) {
+    // Найден одной проверкой, ещё не подтверждён: в тревожный счётчик не входит.
+    OneCStockConflictStatusEnum["DETECTED"] = "DETECTED";
+    // Подтверждён второй проверкой на свежем снимке остатка — показываем и уведомляем.
+    OneCStockConflictStatusEnum["OPEN"] = "OPEN";
+    // Сотрудник оставил недостачу как есть; рост недостачи снова проходит подтверждение.
+    OneCStockConflictStatusEnum["ACKNOWLEDGED"] = "ACKNOWLEDGED";
+    // Недостачи больше нет.
+    OneCStockConflictStatusEnum["RESOLVED"] = "RESOLVED";
+})(OneCStockConflictStatusEnum || (exports.OneCStockConflictStatusEnum = OneCStockConflictStatusEnum = {}));

package/build/schemas/integration/one-c/get-one-c-stock-conflict-list-request.schema.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetOneCStockConflictListRequestSchema = void 0;
+const zod_1 = require("zod");
+const one_c_stock_conflict_status_enum_1 = require("../../../enum/one-c-stock-conflict-status.enum");
+const pagination_request_schema_1 = require("../../pagination-request.schema");
+// По умолчанию — тревожные (OPEN); ACKNOWLEDGED и остальные — отдельным фильтром.
+exports.GetOneCStockConflictListRequestSchema = pagination_request_schema_1.PaginationRequestSchema.extend({
+    status: zod_1.z.nativeEnum(one_c_stock_conflict_status_enum_1.OneCStockConflictStatusEnum).optional().default(one_c_stock_conflict_status_enum_1.OneCStockConflictStatusEnum.OPEN),
+});

package/build/schemas/integration/one-c/get-one-c-stock-conflict-list-response.schema.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetOneCStockConflictListResponseSchema = void 0;
+const zod_1 = require("zod");
+const one_c_stock_conflict_list_schema_1 = require("./one-c-stock-conflict-list.schema");
+exports.GetOneCStockConflictListResponseSchema = zod_1.z.object({
+    message: zod_1.z.string().optional(),
+    data: one_c_stock_conflict_list_schema_1.OneCStockConflictListSchema,
+});

package/build/schemas/integration/one-c/get-one-c-stock-conflict-preview-response.schema.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetOneCStockConflictPreviewResponseSchema = void 0;
+const zod_1 = require("zod");
+const one_c_stock_conflict_preview_schema_1 = require("./one-c-stock-conflict-preview.schema");
+exports.GetOneCStockConflictPreviewResponseSchema = zod_1.z.object({
+    message: zod_1.z.string().optional(),
+    data: one_c_stock_conflict_preview_schema_1.OneCStockConflictPreviewSchema,
+});

package/build/schemas/integration/one-c/index.js

@@ -16,3 +16,14 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./get-one-c-status-response.schema"), exports);
 __exportStar(require("./one-c-status.schema"), exports);
+__exportStar(require("./get-one-c-stock-conflict-list-request.schema"), exports);
+__exportStar(require("./get-one-c-stock-conflict-list-response.schema"), exports);
+__exportStar(require("./one-c-stock-conflict-list.schema"), exports);
+__exportStar(require("./one-c-stock-conflict.schema"), exports);
+__exportStar(require("./get-one-c-stock-conflict-preview-response.schema"), exports);
+__exportStar(require("./one-c-stock-conflict-decision.schema"), exports);
+__exportStar(require("./one-c-stock-conflict-line.schema"), exports);
+__exportStar(require("./one-c-stock-conflict-preview.schema"), exports);
+__exportStar(require("./one-c-stock-conflict-resolution.schema"), exports);
+__exportStar(require("./resolve-one-c-stock-conflict-request.schema"), exports);
+__exportStar(require("./resolve-one-c-stock-conflict-response.schema"), exports);

package/build/schemas/integration/one-c/one-c-stock-conflict-decision.schema.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OneCStockConflictDecisionSchema = void 0;
+const zod_1 = require("zod");
+const one_c_stock_conflict_line_action_enum_1 = require("../../../enum/one-c-stock-conflict-line-action.enum");
+// Решение по строке: REDUCE — до quantity (меньше текущего, не меньше 1), REMOVE — удалить, KEEP — оставить.
+exports.OneCStockConflictDecisionSchema = zod_1.z
+    .object({
+    orderProductUUID: zod_1.z.string(),
+    action: zod_1.z.nativeEnum(one_c_stock_conflict_line_action_enum_1.OneCStockConflictLineActionEnum),
+    quantity: zod_1.z.number().int().min(1).optional(),
+})
+    .refine(decision => decision.action !== one_c_stock_conflict_line_action_enum_1.OneCStockConflictLineActionEnum.REDUCE || decision.quantity !== undefined, {
+    message: 'quantity is required for REDUCE',
+    path: ['quantity'],
+});

package/build/schemas/integration/one-c/one-c-stock-conflict-line.schema.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OneCStockConflictLineSchema = void 0;
+const zod_1 = require("zod");
+const one_c_stock_conflict_line_restriction_enum_1 = require("../../../enum/one-c-stock-conflict-line-restriction.enum");
+const order_status_enum_1 = require("../../../enum/order-status.enum");
+// Строка заказа, держащая резерв товара конфликта. restriction != null — менять из панели нельзя.
+exports.OneCStockConflictLineSchema = zod_1.z.object({
+    orderProductUUID: zod_1.z.string(),
+    orderUUID: zod_1.z.string(),
+    orderId: zod_1.z.number().int(),
+    orderStatus: zod_1.z.nativeEnum(order_status_enum_1.OrderStatusEnum),
+    orderCreatedAt: zod_1.z.string().datetime(),
+    clientUUID: zod_1.z.string(),
+    clientName: zod_1.z.string(),
+    quantity: zod_1.z.number().int(),
+    restriction: zod_1.z.nativeEnum(one_c_stock_conflict_line_restriction_enum_1.OneCStockConflictLineRestrictionEnum).nullable(),
+});

package/build/schemas/integration/one-c/one-c-stock-conflict-list.schema.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OneCStockConflictListSchema = void 0;
+const zod_1 = require("zod");
+const one_c_stock_conflict_schema_1 = require("./one-c-stock-conflict.schema");
+exports.OneCStockConflictListSchema = zod_1.z.object({
+    items: zod_1.z.array(one_c_stock_conflict_schema_1.OneCStockConflictSchema),
+    total: zod_1.z.number().int(),
+    // Тревожный счётчик для глобального баннера панели — всегда по OPEN, независимо от фильтра.
+    openCount: zod_1.z.number().int(),
+});

package/build/schemas/integration/one-c/one-c-stock-conflict-preview.schema.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OneCStockConflictPreviewSchema = void 0;
+const zod_1 = require("zod");
+const one_c_stock_conflict_line_schema_1 = require("./one-c-stock-conflict-line.schema");
+const one_c_stock_conflict_schema_1 = require("./one-c-stock-conflict.schema");
+// Предпросмотр решения: строки — сначала корзины, затем заказы от новых к старым. previewToken передаётся в применение:
+// если снимок остатка или строки изменились, применение ответит «пересчитайте».
+exports.OneCStockConflictPreviewSchema = zod_1.z.object({
+    conflict: one_c_stock_conflict_schema_1.OneCStockConflictSchema,
+    stockSnapshotFormedAt: zod_1.z.string().datetime().nullable(),
+    lines: zod_1.z.array(one_c_stock_conflict_line_schema_1.OneCStockConflictLineSchema),
+    previewToken: zod_1.z.string(),
+});

package/build/schemas/integration/one-c/one-c-stock-conflict-resolution.schema.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OneCStockConflictResolutionSchema = void 0;
+const zod_1 = require("zod");
+const one_c_stock_conflict_status_enum_1 = require("../../../enum/one-c-stock-conflict-status.enum");
+// Итог решения: оставшаяся недостача принята (ACKNOWLEDGED) или её нет (RESOLVED). balance — доступный остаток
+// после пересчёта; null — строки не менялись (только подтверждение недостачи), пересчёта не было.
+exports.OneCStockConflictResolutionSchema = zod_1.z.object({
+    status: zod_1.z.nativeEnum(one_c_stock_conflict_status_enum_1.OneCStockConflictStatusEnum),
+    shortage: zod_1.z.string(),
+    balance: zod_1.z.number().int().nullable(),
+    changedLines: zod_1.z.number().int(),
+});

package/build/schemas/integration/one-c/one-c-stock-conflict.schema.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OneCStockConflictSchema = void 0;
+const zod_1 = require("zod");
+const one_c_stock_conflict_status_enum_1 = require("../../../enum/one-c-stock-conflict-status.enum");
+// Конфликт «остаток 1С меньше резерва FC» по товару. Количества — десятичные строки: остаток 1С бывает дробным.
+exports.OneCStockConflictSchema = zod_1.z.object({
+    uuid: zod_1.z.string(),
+    status: zod_1.z.nativeEnum(one_c_stock_conflict_status_enum_1.OneCStockConflictStatusEnum),
+    productUUID: zod_1.z.string(),
+    productName: zod_1.z.string().nullable(),
+    article: zod_1.z.string().nullable(),
+    stock: zod_1.z.string(),
+    reserved: zod_1.z.number().int(),
+    shortage: zod_1.z.string(),
+    // Подтверждённая недостача OPEN: shortage выше неё — рост, ждущий подтверждения; null вне OPEN.
+    confirmedShortage: zod_1.z.string().nullable(),
+    acknowledgedShortage: zod_1.z.string().nullable(),
+    detectedAt: zod_1.z.string().datetime(),
+    confirmedAt: zod_1.z.string().datetime().nullable(),
+    acknowledgedAt: zod_1.z.string().datetime().nullable(),
+    resolvedAt: zod_1.z.string().datetime().nullable(),
+    updatedAt: zod_1.z.string().datetime(),
+});

package/build/schemas/integration/one-c/resolve-one-c-stock-conflict-request.schema.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ResolveOneCStockConflictRequestSchema = void 0;
+const zod_1 = require("zod");
+const one_c_stock_conflict_decision_schema_1 = require("./one-c-stock-conflict-decision.schema");
+// Строки, которых нет в decisions, остаются как есть. Пустой список — «оставить всё»: принять текущую недостачу.
+exports.ResolveOneCStockConflictRequestSchema = zod_1.z.object({
+    previewToken: zod_1.z.string().min(1),
+    decisions: zod_1.z.array(one_c_stock_conflict_decision_schema_1.OneCStockConflictDecisionSchema).max(500),
+});

package/build/schemas/integration/one-c/resolve-one-c-stock-conflict-response.schema.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ResolveOneCStockConflictResponseSchema = void 0;
+const zod_1 = require("zod");
+const one_c_stock_conflict_resolution_schema_1 = require("./one-c-stock-conflict-resolution.schema");
+exports.ResolveOneCStockConflictResponseSchema = zod_1.z.object({
+    message: zod_1.z.string().optional(),
+    data: one_c_stock_conflict_resolution_schema_1.OneCStockConflictResolutionSchema,
+});

package/commands/integration/one-c/get-one-c-stock-conflict-list.query.ts

@@ -0,0 +1,11 @@
+import type { z } from 'zod';
+import { GetOneCStockConflictListRequestSchema } from '../../../schemas/integration/one-c/get-one-c-stock-conflict-list-request.schema';
+import { GetOneCStockConflictListResponseSchema } from '../../../schemas/integration/one-c/get-one-c-stock-conflict-list-response.schema';
+
+export namespace GetOneCStockConflictListContractQuery {
+    export const RequestSchema = GetOneCStockConflictListRequestSchema;
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = GetOneCStockConflictListResponseSchema;
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/integration/one-c/get-one-c-stock-conflict-preview.query.ts

@@ -0,0 +1,7 @@
+import type { z } from 'zod';
+import { GetOneCStockConflictPreviewResponseSchema } from '../../../schemas/integration/one-c/get-one-c-stock-conflict-preview-response.schema';
+
+export namespace GetOneCStockConflictPreviewContractQuery {
+    export const ResponseSchema = GetOneCStockConflictPreviewResponseSchema;
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/integration/one-c/index.ts

@@ -2,3 +2,6 @@ export * from './connect-one-c.command';
 export * from './rotate-one-c-password.command';
 export * from './disconnect-one-c.command';
 export * from './get-one-c-status.query';
+export * from './get-one-c-stock-conflict-list.query';
+export * from './get-one-c-stock-conflict-preview.query';
+export * from './resolve-one-c-stock-conflict.command';

package/commands/integration/one-c/resolve-one-c-stock-conflict.command.ts

@@ -0,0 +1,11 @@
+import type { z } from 'zod';
+import { ResolveOneCStockConflictRequestSchema } from '../../../schemas/integration/one-c/resolve-one-c-stock-conflict-request.schema';
+import { ResolveOneCStockConflictResponseSchema } from '../../../schemas/integration/one-c/resolve-one-c-stock-conflict-response.schema';
+
+export namespace ResolveOneCStockConflictContractCommand {
+    export const RequestSchema = ResolveOneCStockConflictRequestSchema;
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = ResolveOneCStockConflictResponseSchema;
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/constant/error.ts

@@ -1717,6 +1717,23 @@ export const ERRORS = {
     ONE_C_ORDERS_EXPORT_FAILED: { code: 'OC009', message: 'Failed to export orders to 1C', httpCode: 500 },
     ONE_C_ORDERS_IMPORT_FAILED: { code: 'OC010', message: 'Failed to apply orders from 1C', httpCode: 500 },
     ONE_C_ACTOR_NOT_FOUND: { code: 'OC011', message: 'No company admin to attribute 1C changes to', httpCode: 409 },
+    ONE_C_STOCK_CONFLICT_CHECK_FAILED: { code: 'OC012', message: 'Failed to check 1C stock conflicts', httpCode: 500 },
+    ONE_C_STOCK_CONFLICT_FETCH_FAILED: { code: 'OC013', message: 'Failed to read 1C stock conflicts', httpCode: 500 },
+    ONE_C_STOCK_CONFLICT_NOTIFY_FAILED: { code: 'OC014', message: 'Failed to notify admins about 1C stock conflicts', httpCode: 500 },
+    ONE_C_STOCK_CONFLICT_NOT_FOUND: { code: 'OC015', message: '1C stock conflict not found', httpCode: 404 },
+    // Снимок остатка или строки резерва изменились после предпросмотра — сотрудник пересчитывает решение.
+    ONE_C_STOCK_CONFLICT_STALE: { code: 'OC016', message: '1C stock conflict data changed, refresh the preview', httpCode: 409 },
+    ONE_C_STOCK_CONFLICT_BUSY: { code: 'OC017', message: '1C stock conflicts are being checked, try again', httpCode: 409 },
+    ONE_C_STOCK_CONFLICT_INVALID_DECISION: { code: 'OC018', message: 'Invalid decision for a 1C stock conflict line', httpCode: 400 },
+    ONE_C_STOCK_CONFLICT_LINE_NOT_EDITABLE: { code: 'OC019', message: 'This order line cannot be changed from the panel', httpCode: 409 },
+    ONE_C_STOCK_CONFLICT_PREVIEW_FAILED: { code: 'OC020', message: 'Failed to build 1C stock conflict preview', httpCode: 500 },
+    ONE_C_STOCK_CONFLICT_RESOLVE_FAILED: { code: 'OC021', message: 'Failed to apply 1C stock conflict decision', httpCode: 500 },
+    // Строки менялись, а доступный остаток пересчитать нельзя (товар вне поставки синхронизации 1С) — решение откатывается.
+    ONE_C_STOCK_CONFLICT_BALANCE_NOT_RECOMPUTED: {
+        code: 'OC022',
+        message: 'Product stock cannot be recomputed: it is not in the 1C sync consignment',
+        httpCode: 409,
+    },
 
     // COMPANY INTEGRATION (общая запись интеграции компании)
     COMPANY_INTEGRATION_FETCH_FAILED: { code: 'CINT001', message: 'Failed to read company integration', httpCode: 500 },

package/enum/index.ts

@@ -149,3 +149,6 @@ export * from './webshop-main-display-mode.enum';
 export * from './webshop-mode.enum';
 export * from './write-off-report-date-basis.enum';
 export * from './write-off-status.enum';
+export * from './one-c-stock-conflict-status.enum';
+export * from './one-c-stock-conflict-line-action.enum';
+export * from './one-c-stock-conflict-line-restriction.enum';

package/enum/notification-type.enum.ts

@@ -10,4 +10,6 @@ export enum NotificationTypeEnum {
     ACCOUNT_DELETION_REQUEST_CREATED = 'ACCOUNT_DELETION_REQUEST_CREATED',
     ACCOUNT_DELETION_REQUEST_APPROVED = 'ACCOUNT_DELETION_REQUEST_APPROVED',
     ACCOUNT_DELETION_REQUEST_REJECTED = 'ACCOUNT_DELETION_REQUEST_REJECTED',
+    // Админам: подтверждён конфликт «остаток 1С меньше резерва FC» или его рост (FC-560).
+    ONE_C_STOCK_CONFLICT = 'ONE_C_STOCK_CONFLICT',
 }

package/enum/one-c-stock-conflict-line-action.enum.ts

@@ -0,0 +1,6 @@
+// Решение сотрудника по строке заказа в конфликте «остаток 1С меньше резерва FC» (FC-560).
+export enum OneCStockConflictLineActionEnum {
+    REDUCE = 'REDUCE',
+    REMOVE = 'REMOVE',
+    KEEP = 'KEEP',
+}

package/enum/one-c-stock-conflict-line-restriction.enum.ts

@@ -0,0 +1,7 @@
+// Почему строку в конфликте остатка нельзя менять из панели.
+export enum OneCStockConflictLineRestrictionEnum {
+    // Корзина покупателя (WEBSHOP_NEW): сотрудник её не правит, корзина освобождается по таймеру.
+    CART = 'CART',
+    // Заказ входит в УПД.
+    TRANSFER_DOCUMENT = 'TRANSFER_DOCUMENT',
+}

package/enum/one-c-stock-conflict-status.enum.ts

@@ -0,0 +1,11 @@
+// Конфликт «остаток 1С меньше резерва FC» по товару (FC-560).
+export enum OneCStockConflictStatusEnum {
+    // Найден одной проверкой, ещё не подтверждён: в тревожный счётчик не входит.
+    DETECTED = 'DETECTED',
+    // Подтверждён второй проверкой на свежем снимке остатка — показываем и уведомляем.
+    OPEN = 'OPEN',
+    // Сотрудник оставил недостачу как есть; рост недостачи снова проходит подтверждение.
+    ACKNOWLEDGED = 'ACKNOWLEDGED',
+    // Недостачи больше нет.
+    RESOLVED = 'RESOLVED',
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@floristcloud/api-lib",
-    "version": "1.2.170",
+    "version": "1.2.172",
     "description": "",
     "main": "./build/index.js",
     "scripts": {

package/schemas/integration/one-c/get-one-c-stock-conflict-list-request.schema.ts

@@ -0,0 +1,8 @@
+import { z } from 'zod';
+import { OneCStockConflictStatusEnum } from '../../../enum/one-c-stock-conflict-status.enum';
+import { PaginationRequestSchema } from '../../pagination-request.schema';
+
+// По умолчанию — тревожные (OPEN); ACKNOWLEDGED и остальные — отдельным фильтром.
+export const GetOneCStockConflictListRequestSchema = PaginationRequestSchema.extend({
+    status: z.nativeEnum(OneCStockConflictStatusEnum).optional().default(OneCStockConflictStatusEnum.OPEN),
+});

package/schemas/integration/one-c/get-one-c-stock-conflict-list-response.schema.ts

@@ -0,0 +1,7 @@
+import { z } from 'zod';
+import { OneCStockConflictListSchema } from './one-c-stock-conflict-list.schema';
+
+export const GetOneCStockConflictListResponseSchema = z.object({
+    message: z.string().optional(),
+    data: OneCStockConflictListSchema,
+});

package/schemas/integration/one-c/get-one-c-stock-conflict-preview-response.schema.ts

@@ -0,0 +1,7 @@
+import { z } from 'zod';
+import { OneCStockConflictPreviewSchema } from './one-c-stock-conflict-preview.schema';
+
+export const GetOneCStockConflictPreviewResponseSchema = z.object({
+    message: z.string().optional(),
+    data: OneCStockConflictPreviewSchema,
+});

package/schemas/integration/one-c/index.ts

@@ -1,2 +1,13 @@
 export * from './get-one-c-status-response.schema';
 export * from './one-c-status.schema';
+export * from './get-one-c-stock-conflict-list-request.schema';
+export * from './get-one-c-stock-conflict-list-response.schema';
+export * from './one-c-stock-conflict-list.schema';
+export * from './one-c-stock-conflict.schema';
+export * from './get-one-c-stock-conflict-preview-response.schema';
+export * from './one-c-stock-conflict-decision.schema';
+export * from './one-c-stock-conflict-line.schema';
+export * from './one-c-stock-conflict-preview.schema';
+export * from './one-c-stock-conflict-resolution.schema';
+export * from './resolve-one-c-stock-conflict-request.schema';
+export * from './resolve-one-c-stock-conflict-response.schema';

package/schemas/integration/one-c/one-c-stock-conflict-decision.schema.ts

@@ -0,0 +1,14 @@
+import { z } from 'zod';
+import { OneCStockConflictLineActionEnum } from '../../../enum/one-c-stock-conflict-line-action.enum';
+
+// Решение по строке: REDUCE — до quantity (меньше текущего, не меньше 1), REMOVE — удалить, KEEP — оставить.
+export const OneCStockConflictDecisionSchema = z
+    .object({
+        orderProductUUID: z.string(),
+        action: z.nativeEnum(OneCStockConflictLineActionEnum),
+        quantity: z.number().int().min(1).optional(),
+    })
+    .refine(decision => decision.action !== OneCStockConflictLineActionEnum.REDUCE || decision.quantity !== undefined, {
+        message: 'quantity is required for REDUCE',
+        path: ['quantity'],
+    });

package/schemas/integration/one-c/one-c-stock-conflict-line.schema.ts

@@ -0,0 +1,16 @@
+import { z } from 'zod';
+import { OneCStockConflictLineRestrictionEnum } from '../../../enum/one-c-stock-conflict-line-restriction.enum';
+import { OrderStatusEnum } from '../../../enum/order-status.enum';
+
+// Строка заказа, держащая резерв товара конфликта. restriction != null — менять из панели нельзя.
+export const OneCStockConflictLineSchema = z.object({
+    orderProductUUID: z.string(),
+    orderUUID: z.string(),
+    orderId: z.number().int(),
+    orderStatus: z.nativeEnum(OrderStatusEnum),
+    orderCreatedAt: z.string().datetime(),
+    clientUUID: z.string(),
+    clientName: z.string(),
+    quantity: z.number().int(),
+    restriction: z.nativeEnum(OneCStockConflictLineRestrictionEnum).nullable(),
+});

package/schemas/integration/one-c/one-c-stock-conflict-list.schema.ts

@@ -0,0 +1,9 @@
+import { z } from 'zod';
+import { OneCStockConflictSchema } from './one-c-stock-conflict.schema';
+
+export const OneCStockConflictListSchema = z.object({
+    items: z.array(OneCStockConflictSchema),
+    total: z.number().int(),
+    // Тревожный счётчик для глобального баннера панели — всегда по OPEN, независимо от фильтра.
+    openCount: z.number().int(),
+});

package/schemas/integration/one-c/one-c-stock-conflict-preview.schema.ts

@@ -0,0 +1,12 @@
+import { z } from 'zod';
+import { OneCStockConflictLineSchema } from './one-c-stock-conflict-line.schema';
+import { OneCStockConflictSchema } from './one-c-stock-conflict.schema';
+
+// Предпросмотр решения: строки — сначала корзины, затем заказы от новых к старым. previewToken передаётся в применение:
+// если снимок остатка или строки изменились, применение ответит «пересчитайте».
+export const OneCStockConflictPreviewSchema = z.object({
+    conflict: OneCStockConflictSchema,
+    stockSnapshotFormedAt: z.string().datetime().nullable(),
+    lines: z.array(OneCStockConflictLineSchema),
+    previewToken: z.string(),
+});

package/schemas/integration/one-c/one-c-stock-conflict-resolution.schema.ts

@@ -0,0 +1,11 @@
+import { z } from 'zod';
+import { OneCStockConflictStatusEnum } from '../../../enum/one-c-stock-conflict-status.enum';
+
+// Итог решения: оставшаяся недостача принята (ACKNOWLEDGED) или её нет (RESOLVED). balance — доступный остаток
+// после пересчёта; null — строки не менялись (только подтверждение недостачи), пересчёта не было.
+export const OneCStockConflictResolutionSchema = z.object({
+    status: z.nativeEnum(OneCStockConflictStatusEnum),
+    shortage: z.string(),
+    balance: z.number().int().nullable(),
+    changedLines: z.number().int(),
+});

package/schemas/integration/one-c/one-c-stock-conflict.schema.ts

@@ -0,0 +1,22 @@
+import { z } from 'zod';
+import { OneCStockConflictStatusEnum } from '../../../enum/one-c-stock-conflict-status.enum';
+
+// Конфликт «остаток 1С меньше резерва FC» по товару. Количества — десятичные строки: остаток 1С бывает дробным.
+export const OneCStockConflictSchema = z.object({
+    uuid: z.string(),
+    status: z.nativeEnum(OneCStockConflictStatusEnum),
+    productUUID: z.string(),
+    productName: z.string().nullable(),
+    article: z.string().nullable(),
+    stock: z.string(),
+    reserved: z.number().int(),
+    shortage: z.string(),
+    // Подтверждённая недостача OPEN: shortage выше неё — рост, ждущий подтверждения; null вне OPEN.
+    confirmedShortage: z.string().nullable(),
+    acknowledgedShortage: z.string().nullable(),
+    detectedAt: z.string().datetime(),
+    confirmedAt: z.string().datetime().nullable(),
+    acknowledgedAt: z.string().datetime().nullable(),
+    resolvedAt: z.string().datetime().nullable(),
+    updatedAt: z.string().datetime(),
+});

package/schemas/integration/one-c/resolve-one-c-stock-conflict-request.schema.ts

@@ -0,0 +1,8 @@
+import { z } from 'zod';
+import { OneCStockConflictDecisionSchema } from './one-c-stock-conflict-decision.schema';
+
+// Строки, которых нет в decisions, остаются как есть. Пустой список — «оставить всё»: принять текущую недостачу.
+export const ResolveOneCStockConflictRequestSchema = z.object({
+    previewToken: z.string().min(1),
+    decisions: z.array(OneCStockConflictDecisionSchema).max(500),
+});

package/schemas/integration/one-c/resolve-one-c-stock-conflict-response.schema.ts

@@ -0,0 +1,7 @@
+import { z } from 'zod';
+import { OneCStockConflictResolutionSchema } from './one-c-stock-conflict-resolution.schema';
+
+export const ResolveOneCStockConflictResponseSchema = z.object({
+    message: z.string().optional(),
+    data: OneCStockConflictResolutionSchema,
+});