diff --git a/app/Filament/Resources/DelayedGoods/Schemas/DelayedGoodForm.php b/app/Filament/Resources/DelayedGoods/Schemas/DelayedGoodForm.php
index 0dc17e9..25eedb5 100644
--- a/app/Filament/Resources/DelayedGoods/Schemas/DelayedGoodForm.php
+++ b/app/Filament/Resources/DelayedGoods/Schemas/DelayedGoodForm.php
@@ -2,6 +2,7 @@
 
 namespace App\Filament\Resources\DelayedGoods\Schemas;
 
+use App\Models\Warehouse;
 use Filament\Forms\Components\DatePicker;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Textarea;
@@ -62,7 +63,7 @@ public static function configure(Schema $schema): Schema
         };
 
         return $schema->components([
-            Grid::make(2)
+            Grid::make(3)
                 ->schema([
                     DatePicker::make('stored_date')
                         ->label('Tanggal Penyimpanan')
@@ -71,6 +72,15 @@ public static function configure(Schema $schema): Schema
                         ->native(false)
                         ->displayFormat('l, d F Y'),
 
+                    Select::make('warehouse_id')
+                        ->label('Ambil Dari Gudang')
+                        ->relationship('warehouse', 'name')
+                        ->searchable()
+                        ->preload()
+                        ->native(false)
+                        ->required()
+                        ->default(fn () => Warehouse::first()?->id),
+
                     Select::make('customer_id')
                         ->label('Pelanggan')
                         ->relationship('customer', 'name')
@@ -78,7 +88,8 @@ public static function configure(Schema $schema): Schema
                         ->preload()
                         ->native(false)
                         ->required(),
-                ]),
+                ])
+                ->columnSpanFull(),
 
             Grid::make(3)
                 ->schema([
diff --git a/app/Filament/Resources/DelayedGoods/Tables/DelayedGoodsTable.php b/app/Filament/Resources/DelayedGoods/Tables/DelayedGoodsTable.php
index 20102db..4166423 100644
--- a/app/Filament/Resources/DelayedGoods/Tables/DelayedGoodsTable.php
+++ b/app/Filament/Resources/DelayedGoods/Tables/DelayedGoodsTable.php
@@ -34,6 +34,11 @@ public static function configure(Table $table): Table
                     ->searchable()
                     ->sortable(),
 
+                TextColumn::make('warehouse.name')
+                    ->label('Gudang')
+                    ->searchable()
+                    ->sortable(),
+
                 TextColumn::make('quantity')
                     ->label('Jumlah')
                     ->getStateUsing(function ($record) {
diff --git a/app/Models/DelayedGood.php b/app/Models/DelayedGood.php
index d40023f..2ceb576 100644
--- a/app/Models/DelayedGood.php
+++ b/app/Models/DelayedGood.php
@@ -21,7 +21,7 @@ protected function casts(): array
         return [
             'stored_date' => 'date',
             'payment_date' => 'date',
-            'quantity' => 'integer',
+            'quantity' => 'decimal:2',
             'unit_price' => 'integer',
             'total_amount' => 'integer',
             'paid_amount' => 'integer',
@@ -38,4 +38,9 @@ public function unit(): BelongsTo
     {
         return $this->belongsTo(Unit::class);
     }
+
+    public function warehouse(): BelongsTo
+    {
+        return $this->belongsTo(Warehouse::class);
+    }
 }
diff --git a/app/Observers/DelayedGoodObserver.php b/app/Observers/DelayedGoodObserver.php
index 5f3a6bb..88230d6 100644
--- a/app/Observers/DelayedGoodObserver.php
+++ b/app/Observers/DelayedGoodObserver.php
@@ -3,6 +3,7 @@
 namespace App\Observers;
 
 use App\Models\DelayedGood;
+use App\Models\WarehouseStock;
 
 class DelayedGoodObserver
 {
@@ -21,4 +22,59 @@ public function saving(DelayedGood $delayedGood): void
             $delayedGood->payment_date = null;
         }
     }
+
+    /**
+     * Handle the DelayedGood "created" event.
+     */
+    public function created(DelayedGood $delayedGood): void
+    {
+        if ($delayedGood->warehouse_id) {
+            WarehouseStock::adjustStock(
+                $delayedGood->warehouse_id,
+                $delayedGood->unit_id,
+                false,
+                -$delayedGood->quantity
+            );
+        }
+    }
+
+    /**
+     * Handle the DelayedGood "updated" event.
+     */
+    public function updated(DelayedGood $delayedGood): void
+    {
+        if ($delayedGood->isDirty(['warehouse_id', 'unit_id', 'quantity'])) {
+            $oldWarehouseId = $delayedGood->getOriginal('warehouse_id');
+            $oldUnitId = $delayedGood->getOriginal('unit_id');
+            $oldQuantity = $delayedGood->getOriginal('quantity');
+
+            if ($oldWarehouseId) {
+                WarehouseStock::adjustStock($oldWarehouseId, $oldUnitId, false, $oldQuantity);
+            }
+
+            if ($delayedGood->warehouse_id) {
+                WarehouseStock::adjustStock($delayedGood->warehouse_id, $delayedGood->unit_id, false, -$delayedGood->quantity);
+            }
+        }
+    }
+
+    /**
+     * Handle the DelayedGood "deleted" event.
+     */
+    public function deleted(DelayedGood $delayedGood): void
+    {
+        if (! $delayedGood->isForceDeleting() && $delayedGood->warehouse_id) {
+            WarehouseStock::adjustStock($delayedGood->warehouse_id, $delayedGood->unit_id, false, $delayedGood->quantity);
+        }
+    }
+
+    /**
+     * Handle the DelayedGood "restored" event.
+     */
+    public function restored(DelayedGood $delayedGood): void
+    {
+        if ($delayedGood->warehouse_id) {
+            WarehouseStock::adjustStock($delayedGood->warehouse_id, $delayedGood->unit_id, false, -$delayedGood->quantity);
+        }
+    }
 }
diff --git a/database/migrations/2026_02_19_021653_create_delayed_goods_table.php b/database/migrations/2026_02_19_021653_create_delayed_goods_table.php
index 040fdbd..6922aff 100644
--- a/database/migrations/2026_02_19_021653_create_delayed_goods_table.php
+++ b/database/migrations/2026_02_19_021653_create_delayed_goods_table.php
@@ -14,8 +14,9 @@ public function up(): void
         Schema::create('delayed_goods', function (Blueprint $table) {
             $table->id();
             $table->foreignId('customer_id')->nullable()->constrained()->cascadeOnDelete();
+            $table->foreignId('warehouse_id')->nullable()->constrained()->nullOnDelete();
             $table->foreignId('unit_id')->constrained()->cascadeOnDelete();
-            $table->unsignedInteger('quantity');
+            $table->decimal('quantity', 12, 2);
             $table->unsignedInteger('unit_price');
             $table->unsignedInteger('total_amount');
             $table->unsignedInteger('paid_amount')->default(0);