merge: resolve conflict

This commit is contained in:
rstubryan
2025-10-16 10:59:36 +07:00
16 changed files with 1154 additions and 120 deletions
+20 -9
View File
@@ -1,12 +1,23 @@
import { BaseApiService } from '@/services/api/base';
import {
CreateMovementPayload,
Movement,
UpdateMovementPayload,
} from "@/types/api/inventory/movement";
import {BaseApiService} from "@/services/api/base";
CreateMovementPayload,
Movement,
UpdateMovementPayload,
} from '@/types/api/inventory/movement';
import {
CreateInventoryAdjustmentPayload,
InventoryAdjustment,
UpdateInventoryAdjustmentPayload,
} from '@/types/api/inventory/adjustment';
export const MovementApi = new BaseApiService<
Movement,
CreateMovementPayload,
UpdateMovementPayload
>('/inventory/movements');
Movement,
CreateMovementPayload,
UpdateMovementPayload
>('/inventory/movements');
export const inventoryAdjustmentApi = new BaseApiService<
InventoryAdjustment,
CreateInventoryAdjustmentPayload,
UpdateInventoryAdjustmentPayload
>('/inventory/adjustments');