merge: resolve conflict

2026-05-20 21:41:57 +00:00 · 2025-10-15 11:05:37 +07:00
parent 66e6fa84c8 212fd3b4f2
commit cf78687315
15 changed files with 1137 additions and 120 deletions
@@ -1,12 +1,22 @@
+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,
+} 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,
+  unknown
+>('/inventory/adjustments');