feat(inventory): display all warehouse items on selection and track withdrawal recipient

- Show all available inventory items immediately when selecting a warehouse in withdrawal form - Add vertical scrolling container with max height to prevent layout overflow for large item lists - Add Material column to the inventory rows table for clear item identification - Add required 'delivered_to' recipient field in withdrawal form with frontend validation - Track delivered_to in database, models, schemas, and API - Display recipient badge on withdrawal cards in daily control page - Group daily control withdrawals by inventory ID and recipient
2026-09-28 22:54:02 +03:30
14 changed files with 269 additions and 130 deletions
@@ -247,6 +247,7 @@ _V26_DDL = [
        physical_qty          NUMERIC(18,6),
        transfer_pair_id      UUID,
        performed_by          TEXT,
+        delivered_to          TEXT,
        transaction_date      TIMESTAMPTZ                  NOT NULL DEFAULT now(),
        note                  TEXT,
        created_at            TIMESTAMPTZ                  NOT NULL DEFAULT now()
@@ -258,6 +259,9 @@ _V26_DDL = [
    """
    CREATE INDEX IF NOT EXISTS idx_inventory_tx_warehouse_date ON inventory_transactions (warehouse_id, transaction_date)
    """,
+    """
+    ALTER TABLE inventory_transactions ADD COLUMN IF NOT EXISTS delivered_to TEXT
+    """,
    # suppliers.categories JSONB (v2.4 runtime) is replaced by suppliers.category_id — drop it.
    """
    ALTER TABLE suppliers DROP COLUMN IF EXISTS categories
@@ -156,6 +156,7 @@ class InventoryTransaction(Base):
    # NULL for a standalone entry; links TRANSFER_OUT to its TRANSFER_IN row.
    transfer_pair_id: Mapped[uuid.UUID | None] = mapped_column(Uuid(as_uuid=True))
    performed_by: Mapped[str | None] = mapped_column(Text)  # user display name (dev placeholder)
+    delivered_to: Mapped[str | None] = mapped_column(Text)
    transaction_date: Mapped[datetime] = mapped_column(
        DateTime(timezone=True), nullable=False, server_default=func.now()
    )
@@ -197,6 +197,7 @@ def transaction_to_dict(tx: InventoryTransaction, wh: Warehouse | None = None) -
        "physical_qty": float(tx.physical_qty) if tx.physical_qty is not None else None,
        "transfer_pair_id": str(tx.transfer_pair_id) if tx.transfer_pair_id else None,
        "performed_by": tx.performed_by,
+        "delivered_to": tx.delivered_to,
        "transaction_date": to_iso(tx.transaction_date),
        "note": tx.note,
    }
@@ -64,6 +64,7 @@ class InventoryTransactionCreate(APIModel):
    unit_id: int | None = None
    specs: dict | None = None
    note: str | None = None
+    delivered_to: str | None = None
    transaction_date: datetime | None = None

    @model_validator(mode="after")
@@ -290,6 +290,7 @@ async def apply_transaction(
            transaction_type=t,
            quantity=quantity,
            performed_by=performed_by,
+            delivered_to=payload.delivered_to,
            transaction_date=payload.transaction_date,
            note=payload.note,
        )
@@ -319,6 +320,7 @@ async def apply_transaction(
            transaction_type=t,
            quantity=-quantity,
            performed_by=performed_by,
+            delivered_to=payload.delivered_to,
            transaction_date=payload.transaction_date,
            note=payload.note,
        )
@@ -6,6 +6,8 @@ services:
    environment:
      POSTGRES_DB: procurement
      POSTGRES_USER: postgres
+      # Local dev default; production overrides via .env (required by the
+      # prod overlay) — never commit real passwords.
      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres}

    ports:
@@ -13,7 +15,7 @@ services:

    networks:
      - default
-      - shared
+      - shared # monitoring stack scrapes it (postgres-exporter)

    volumes:
      - postgres_data:/var/lib/postgresql
@@ -29,7 +31,15 @@ services:
    restart: unless-stopped
    mem_limit: 1g

+  # ==========================================================================
+  # Traefik v3 — public reverse proxy (replaces nginx as the edge)
+  # App is served on http://localhost (port 80) instead of :3000.
+  # Production: see docker-compose.prod.yml (real domains + HTTPS via
+  # Let's Encrypt, HTTP→HTTPS redirect).
+  # ==========================================================================
  traefik:
+    # v3.6+ required: Traefik ≤3.3 fails against Docker Engine 29.x
+    # ("Error response from daemon" — Docker API version mismatch).
    image: traefik:v3.6
    container_name: procurement-traefik
    restart: unless-stopped
@@ -37,6 +47,8 @@ services:
    command:
      - --providers.docker=true
      - --providers.docker.exposedbydefault=false
+      # Containers are on several networks; Traefik must use the dedicated
+      # proxy network IP (otherwise it may pick the default-network IP → 504).
      - --providers.docker.network=traefik_network
      - --providers.file.filename=/etc/traefik/dynamic.yml
      - --entrypoints.web.address=:80
@@ -50,6 +62,8 @@ services:
      - "80:80"
      - "443:443"
    volumes:
+      # NOTE: mounted read-write — Docker Desktop rejects read-only
+      # /var/run/docker.sock mounts ("Error response from daemon").
      - /var/run/docker.sock:/var/run/docker.sock
      - ./infra/traefik-dynamic.yml:/etc/traefik/dynamic.yml:ro
      - traefik_certs:/certs
@@ -67,21 +81,24 @@ services:
      MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD:-minioadmin}

    ports:
-      - "9000:9000"
-      - "9001:9001"
+      - "9000:9000"   # S3 API
+      - "9001:9001"   # Web console

    volumes:
      - minio_data:/data

    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.minio-api.rule=Host(`${S3_HOST:-s3.localhost}`)"
-      - "traefik.http.routers.minio-api.entrypoints=web"
-      - "traefik.http.services.minio-api-svc.loadbalancer.server.port=9000"
-      - "traefik.http.routers.minio-console.rule=Host(`${STORAGE_HOST:-storage.localhost}`)"
-      - "traefik.http.routers.minio-console.entrypoints=web"
-      - "traefik.http.routers.minio-console.service=minio-console-svc"
-      - "traefik.http.services.minio-console-svc.loadbalancer.server.port=9001"
+      - traefik.enable=true
+      # S3 API
+      - traefik.http.routers.minio-api.rule=Host(`${S3_HOST:-s3.localhost}`)
+      - traefik.http.routers.minio-api.entrypoints=web
+      - traefik.http.routers.minio-api.service=minio-api-svc
+      - traefik.http.services.minio-api-svc.loadbalancer.server.port=9000
+      # Web console
+      - traefik.http.routers.minio-console.rule=Host(`${STORAGE_HOST:-storage.localhost}`)
+      - traefik.http.routers.minio-console.entrypoints=web
+      - traefik.http.routers.minio-console.service=minio-console-svc
+      - traefik.http.services.minio-console-svc.loadbalancer.server.port=9001

    networks:
      - traefik_network
@@ -90,20 +107,39 @@ services:
    restart: unless-stopped
    mem_limit: 512m

+  # MinIO Client (mc): waits for the server, creates the bucket, exits.
+  # Use for ad-hoc ops too: docker compose run --rm minio-init ...
  minio-init:
    image: minio/mc:latest
    container_name: procurement-minio-init
+
    depends_on:
      minio:
        condition: service_started
+
    environment:
      MINIO_ENDPOINT: minio:9000
      MINIO_ROOT_USER: ${MINIO_ROOT_USER:-minioadmin}
      MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD:-minioadmin}
      MINIO_BUCKET: procurement-files
-    entrypoint: ["/bin/sh", "-c", "until mc alias set local http://$${MINIO_ENDPOINT}$${MINIO_ROOT_USER} $${MINIO_ROOT_PASSWORD}; do echo 'waiting for minio server...'; sleep 2; done; mc mb --ignore-existing local/$${MINIO_BUCKET}; echo bucket ready;"]
+
+    entrypoint: >
+      /bin/sh -c "
+      until mc alias set local http://$${MINIO_ENDPOINT} $${MINIO_ROOT_USER} $${MINIO_ROOT_PASSWORD}; do
+        echo 'waiting for minio server...'; sleep 2;
+      done;
+      mc mb --ignore-existing local/$${MINIO_BUCKET};
+      echo bucket $${MINIO_BUCKET} ready;
+      "
+
    restart: "no"

+  # ==========================================================================
+  # Scheduled logical backups of BOTH databases (procurement + casdoor).
+  # Writes pg_dump -Fc archives to a bind mount (default ./backups, point
+  # BACKUP_DIR at /srv/erp/backups on the VPS) and prunes archives older
+  # than BACKUP_KEEP_DAYS. Runs on the same postgres:18 image already pulled.
+  # ==========================================================================
  db-backup:
    image: postgres:18
    container_name: procurement-db-backup
@@ -116,9 +152,33 @@ services:
      BACKUP_KEEP_DAYS: ${BACKUP_KEEP_DAYS:-14}
    volumes:
      - ${BACKUP_DIR:-./backups}:/backups
-    entrypoint: ["/bin/sh", "-c", "while true; do STAMP=$$(date +%Y%m%d-%H%M%S); pg_dump -h postgres -U postgres -d procurement -Fc -f /backups/procurement-$${STAMP}.dump; pg_dump -h postgres -U postgres -d casdoor -Fc -f /backups/casdoor-$${STAMP}.dump; find /backups -name '*.dump' -mtime +$${BACKUP_KEEP_DAYS} -delete; sleep $${BACKUP_INTERVAL_SECONDS}; done"]
+    entrypoint: >
+      /bin/sh -c "
+      echo 'db-backup: dumping every $${BACKUP_INTERVAL_SECONDS}s, keeping $${BACKUP_KEEP_DAYS} days';
+      while true; do
+        STAMP=$$(date +%Y%m%d-%H%M%S);
+        pg_dump -h postgres -U postgres -d procurement -Fc -f /backups/procurement-$${STAMP}.dump &&
+          echo \"db-backup: procurement -> /backups/procurement-$${STAMP}.dump\";
+        pg_dump -h postgres -U postgres -d casdoor -Fc -f /backups/casdoor-$${STAMP}.dump &&
+          echo \"db-backup: casdoor -> /backups/casdoor-$${STAMP}.dump\";
+        find /backups -name '*.dump' -mtime +$${BACKUP_KEEP_DAYS} -delete;
+        sleep $${BACKUP_INTERVAL_SECONDS};
+      done
+      "
    restart: unless-stopped
    mem_limit: 256m
+
+  # ==========================================================================
+  # v2.6 — Casdoor (OIDC identity provider)
+  # Console: http://localhost:8080 (admin / 123)
+  # Application "inventory-app" (org "inventory", client inventory-app-client)
+  # is created by backend/tools/seed_casdoor.py — run it once after the
+  # first boot:
+  #   docker compose run --rm -e CASDOOR_BASE=http://casdoor:8000 api python tools/seed_casdoor.py
+  #
+  # Casdoor uses the SAME postgres instance as the app (database `casdoor`,
+  # created by sql/02-casdoor-db.sql on a fresh volume).
+  # ==========================================================================
  casdoor:
    image: casbin/casdoor:latest
    container_name: procurement-casdoor
@@ -135,10 +195,10 @@ services:
      - "8080:8000"

    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.casdoor.rule=Host(`${AUTH_HOST:-auth.localhost}`)"
-      - "traefik.http.routers.casdoor.entrypoints=web"
-      - "traefik.http.services.casdoor.loadbalancer.server.port=8000"
+      - traefik.enable=true
+      - traefik.http.routers.casdoor.rule=Host(`${AUTH_HOST:-auth.localhost}`)
+      - traefik.http.routers.casdoor.entrypoints=web
+      - traefik.http.services.casdoor.loadbalancer.server.port=8000

    networks:
      - traefik_network
@@ -160,9 +220,14 @@ services:
      PROCUREMENT_MINIO_SECRET_KEY: ${MINIO_ROOT_PASSWORD:-minioadmin}
      PROCUREMENT_MINIO_BUCKET: procurement-files
      PROCUREMENT_MINIO_SECURE: "false"
+      # "dev" enables the local defaults; "prod" turns on the fail-fast
+      # startup checks (no wildcard CORS, no default credentials).
      PROCUREMENT_ENVIRONMENT: ${ENVIRONMENT:-dev}
      PROCUREMENT_DEV_LOGIN_ENABLED: ${DEV_LOGIN_ENABLED:-false}
-      PROCUREMENT_CORS_ORIGINS: ${CORS_ORIGINS:-http://localhost,http://localhost:3000,http://localhost:5173,http://192.168.1.104}
+      # Comma-separated browser origins (JSON-free .env friendly).
+      PROCUREMENT_CORS_ORIGINS: ${CORS_ORIGINS:-http://localhost,http://localhost:3000,http://localhost:5173}
+      # Casdoor: endpoint is the in-network service URL; the issuer must match
+      # the origin Casdoor advertises to browsers (its OIDC discovery doc).
      PROCUREMENT_CASDOOR_ENDPOINT: http://casdoor:8000
      PROCUREMENT_CASDOOR_ISSUER: ${CASDOOR_ISSUER:-http://localhost:8080}
      PROCUREMENT_CASDOOR_CLIENT_ID: inventory-app-client
@@ -170,8 +235,10 @@ services:
      PROCUREMENT_CASDOOR_ORGANIZATION: inventory
      PROCUREMENT_CASDOOR_APP_NAME: inventory-app
      PROCUREMENT_CASDOOR_AUDIENCE: inventory-app-client
+      # Console admin used by POST /users/sync (identity mirroring).
      PROCUREMENT_CASDOOR_ADMIN_USER: admin
      PROCUREMENT_CASDOOR_ADMIN_PASSWORD: ${CASDOOR_ADMIN_PASSWORD:-123}
+      # Observability (Phase 2) — see monitoring/README.md
      PROCUREMENT_LOG_FORMAT: ${LOG_FORMAT:-text}
      PROCUREMENT_SENTRY_DSN: ${SENTRY_DSN_BACKEND:-}
      PROCUREMENT_OPENPANEL_API_URL: ${OPENPANEL_API_URL:-}
@@ -184,7 +251,7 @@ services:
    networks:
      - traefik_network
      - default
-      - shared
+      - shared # monitoring stack scrapes api:8000/metrics

    healthcheck:
      test: ["CMD-SHELL", "python -c \"import urllib.request as u; u.urlopen('http://127.0.0.1:8000/health', timeout=3)\""]
@@ -194,10 +261,10 @@ services:
      start_period: 40s

    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.api.rule=Host(`${API_HOST:-api.localhost}`)"
-      - "traefik.http.routers.api.entrypoints=web"
-      - "traefik.http.services.api.loadbalancer.server.port=8000"
+      - traefik.enable=true
+      - traefik.http.routers.api.rule=Host(`${API_HOST:-api.localhost}`)
+      - traefik.http.routers.api.entrypoints=web
+      - traefik.http.services.api.loadbalancer.server.port=8000

    depends_on:
      postgres:
@@ -212,19 +279,27 @@ services:
    build:
      context: ./frontend
      args:
+        # Developer Mode panel on the login page — dev-only aid. Production
+        # builds MUST leave this false (identity comes from Casdoor tokens).
        DEV_LOGIN_ENABLED: ${DEV_LOGIN_ENABLED:-false}
+        # Registry overridable for networks where npmmirror is unreachable.
        NPM_REGISTRY: ${NPM_REGISTRY:-https://registry.npmmirror.com}
+        # Observability (build-time baked; empty = disabled)
        VITE_OPENPANEL_URL: ${OPENPANEL_PUBLIC_URL:-}
        VITE_OPENPANEL_CLIENT_ID: ${OPENPANEL_CLIENT_ID:-}
        VITE_SENTRY_DSN: ${SENTRY_DSN_FRONTEND:-}
    container_name: procurement-frontend
+    # از entrypoint پیش‌فرض image nginx رد می‌شویم: آن اسکریپت `apk manifest`
+    # اجرا می‌کند و اگر دسترسی به مخزن بسته‌ها نباشد بی‌نهایت معلق می‌ماند
+    # (سرویس بالا نمی‌آید و traefik خطای 502 می‌دهد). کانفیگ ما مستقل است و
+    # نیازی به آن اسکریپت‌ها ندارد.
    entrypoint: ["nginx", "-g", "daemon off;"]

    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.frontend.rule=PathPrefix(`/`)"
-      - "traefik.http.routers.frontend.entrypoints=web"
-      - "traefik.http.services.frontend.loadbalancer.server.port=80"
+      - traefik.enable=true
+      - traefik.http.routers.frontend.rule=Host(`${APP_HOST:-localhost}`)
+      - traefik.http.routers.frontend.entrypoints=web
+      - traefik.http.services.frontend.loadbalancer.server.port=80

    networks:
      - traefik_network
@@ -237,9 +312,13 @@ services:
    mem_limit: 128m

 networks:
+  # شبکه‌ی عمومی: فقط ترافیک و سرویس‌های عمومی. postgres روی شبکه‌ی
+  # پیش‌فرض می‌ماند و از بیرون قابل دسترسی نیست.
  traefik_network:
    name: traefik_network
    driver: bridge
+  # Fixed-name network shared with the monitoring stack (monitoring compose
+  # joins it as external) — carries /metrics scrapes and postgres-exporter.
  shared:
    name: erp_shared
    driver: bridge
@@ -8,13 +8,14 @@ export interface NumberInputProps {
  placeholder?: string;
  className?: string;
  inputClassName?: string;
-  align?: "right" | "center" | "left";
-  showWords?: boolean;
+  align?: "right" | "center" | "left"; // تنظیم جهت متن و اعداد (پیش‌فرض: راست‌چین)
+  showWords?: boolean; // نمایش معادل فارسی زیر input
  inputMode?: "numeric" | "decimal" | undefined;
-  maxDecimals?: number;
+  maxDecimals?: number; // حداکثر رقم اعشار
  disabled?: boolean;
 }

+// ورودی عددی با فرمت‌دهی خودکار (groupCommas) و نمایش کلمات فارسی
 export function NumberInput({
  value,
  onChange,
@@ -27,6 +28,7 @@ export function NumberInput({
  maxDecimals,
  disabled = false,
 }: NumberInputProps) {
+  // فرمت با رعایت حداکثر اعشار (گرد کردن)
  const formatValue = (n: number): string => {
    let v = n;
    if (maxDecimals != null) {
@@ -73,7 +75,7 @@ export function NumberInput({
        type="text"
        disabled={disabled}
        className={cn(
-          "num-input h-9 w-full rounded-lg border border-line bg-panel px-3 py-1 text-xs font-normal text-ink shadow-xs transition-colors placeholder:text-xs placeholder:font-normal placeholder:text-muted/60 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent/40 disabled:cursor-not-allowed disabled:opacity-60",
+          "num-input h-9 w-full rounded-lg border border-line bg-panel px-3 py-1 text-sm text-ink shadow-xs transition-colors placeholder:text-muted focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent/40 disabled:cursor-not-allowed disabled:opacity-60",
          alignClass,
          inputClassName,
        )}
@@ -1678,7 +1678,7 @@ export const apiV26 = {
      transaction_type: TransactionType; warehouse_id: string; dest_warehouse_id?: string | null;
      material_id: string; brand_id?: string | null; quantity?: number | null;
      physical_qty?: number | null; unit_id?: number | null; specs?: Record<string, string> | null;
-      note?: string | null; transaction_date?: string | null;
+      note?: string | null; delivered_to?: string | null; transaction_date?: string | null;
    }): Promise<InventoryTransaction[]> => {
      return postData<InventoryTransaction[]>(`/inventory/transactions${projectQuery()}`, body);
    },
@@ -163,6 +163,7 @@ export interface InventoryTransaction {
  physical_qty?: number | null;
  transfer_pair_id?: string | null;
  performed_by?: string | null;
+  delivered_to?: string | null;
  transaction_date: string;
  note?: string | null;
  material?: { id: string; name: string } | null;
@@ -62,6 +62,7 @@ export function ChangeInventoryPage() {
  const [dateInput, setDateInput] = useState<string>(() => new Date().toISOString());
  const [specsChips, setSpecsChips] = useState<string[]>([]);
  const [note, setNote] = useState("");
+  const [deliveredTo, setDeliveredTo] = useState("");
  const [rows, setRows] = useState<RowDraft[]>([]);
  const [busy, setBusy] = useState(false);

@@ -86,10 +87,20 @@ export function ChangeInventoryPage() {
  );

  const formRecords = useMemo(() => {
-    const txt = matTxt.trim();
+    const txt = matTxt.trim().toLowerCase();
    const wid = type === "TRANSFER" ? fromId : whId;
    return data.inventory.filter((r) => {
      if (r.warehouse?.id !== wid) return false;
+      if (type === "WITHDRAWAL") {
+        if (r.quantity_number <= 0) return false;
+        if (txt) {
+          const mMatch = r.material.name.toLowerCase().includes(txt);
+          const bMatch = r.brand?.name?.toLowerCase().includes(txt) ?? false;
+          const sMatch = Object.values(r.specs || {}).some((v) => String(v).toLowerCase().includes(txt));
+          if (!mMatch && !bMatch && !sMatch) return false;
+        }
+        return true;
+      }
      if (txt && !r.material.name.includes(txt)) return false;
      return true;
    });
@@ -186,6 +197,7 @@ export function ChangeInventoryPage() {
      setQty("");
      setSpecsChips([]);
      setNote("");
+      setDeliveredTo("");
      await data.refresh();
    } catch (err) {
      toast.error(err instanceof Error ? err.message : "خطا در ثبت");
@@ -235,6 +247,9 @@ export function ChangeInventoryPage() {
  };

  const submitList = async (t: TransactionType) => {
+    if (t === "WITHDRAWAL" && !deliveredTo.trim()) {
+      return toast.error("نام تحویل‌گیرنده اقلام الزامی است");
+    }
    const ops: Record<string, unknown>[] = rows
      .map((r, i): Record<string, unknown> | null => {
        const n = parseNum(r.qty);
@@ -244,7 +259,18 @@ export function ChangeInventoryPage() {
        if (t === "STOCK_COUNT") {
          return { transaction_type: "STOCK_COUNT", warehouse_id: whId, material_id: rec.material.id, brand_id: rec.brand?.id || null, physical_qty: n, note: r.note, transaction_date: toServerIso() };
        }
-        return { transaction_type: t, warehouse_id: whId, material_id: rec.material.id, brand_id: rec.brand?.id || null, quantity: n, unit_id: rec.unit?.id ?? null, specs: rec.specs || {}, note: r.note, transaction_date: toServerIso() };
+        return {
+          transaction_type: t,
+          warehouse_id: whId,
+          material_id: rec.material.id,
+          brand_id: rec.brand?.id || null,
+          quantity: n,
+          unit_id: rec.unit?.id ?? null,
+          specs: rec.specs || {},
+          note: r.note,
+          delivered_to: t === "WITHDRAWAL" ? deliveredTo.trim() : undefined,
+          transaction_date: toServerIso(),
+        };
      })
      .filter((x): x is Record<string, unknown> => x !== null);
    if (!ops.length) return toast.error("هیچ ردیفی پر نشده است");
@@ -370,6 +396,9 @@ export function ChangeInventoryPage() {
    if (type === "PURCHASE") {
      return !!(whId && matTxt.trim() && brandTxt.trim() && unitTxt.trim() && parseNum(qty) > 0 && specsComplete);
    }
+    if (type === "WITHDRAWAL") {
+      return !!(whId && deliveredTo.trim() && rows.some((r) => parseNum(r.qty) > 0));
+    }
    if (type === "TRANSFER") return !!(fromId && toId && matTxt.trim() && rows.some((r) => parseNum(r.qty) > 0));
    if (type === "RETURN") return !!(whId && matTxt.trim() && rows.some((r) => parseNum(r.qty) > 0));
    if (type === "FOUND") {
@@ -486,7 +515,36 @@ export function ChangeInventoryPage() {
                </div>
              </div>

-              {(type === "WITHDRAWAL" || type === "DAMAGE" || type === "WASTE" || type === "LOSS" || type === "STOCK_COUNT" || type === "RETURN" || type === "FOUND") && (
+              {type === "WITHDRAWAL" && (
+                <div className="grid gap-3 sm:grid-cols-2">
+                  <div className="field">
+                    <label className="text-xs font-semibold text-muted">جستجو در متریال‌ها (اختیاری)</label>
+                    <input
+                      list="dl-mat"
+                      className="h-9 w-full rounded-lg border border-line bg-panel px-3 text-xs sm:text-sm"
+                      placeholder="فیلتر بر اساس نام متریال، برند یا مشخصه (خالی = نمایش همه)…"
+                      value={matTxt}
+                      onChange={(e) => { setMatTxt(e.target.value); setRows([]); }}
+                    />
+                    <datalist id="dl-mat">
+                      {data.lookup.materials.map((m) => <option key={m.id} value={m.name} />)}
+                    </datalist>
+                  </div>
+                  <div className="field">
+                    <label className="text-xs font-semibold text-muted">
+                      تحویل به (تحویل‌گیرنده) <span className="text-rose-500 font-bold">*</span>
+                    </label>
+                    <input
+                      className="h-9 w-full rounded-lg border border-line bg-panel px-3 text-xs sm:text-sm"
+                      placeholder="نام فرد، اکیپ یا پیمانکار تحویل‌گیرنده اقلام…"
+                      value={deliveredTo}
+                      onChange={(e) => setDeliveredTo(e.target.value)}
+                    />
+                  </div>
+                </div>
+              )}
+
+              {(type === "DAMAGE" || type === "WASTE" || type === "LOSS" || type === "STOCK_COUNT" || type === "RETURN" || type === "FOUND") && (
                <div className="field">
                  <label className="text-xs font-semibold text-muted">{type === "FOUND" ? "متریال (خالی = همه مفقودی‌ها)" : "متریال *"}</label>
                  <input
@@ -653,10 +711,11 @@ export function ChangeInventoryPage() {
              setRows={setRows}
              records={formRecords}
              unitNameFn={(id) => unitName(data.lookup.units, id)}
+              showMaterial={type === "WITHDRAWAL" || !matTxt.trim()}
              emptyMsg={
                !whId ? "برای نمایش رکوردها، ابتدا انبار را انتخاب کنید."
-                  : !matTxt.trim() ? "نام متریال را تایپ کنید تا همه مدل‌های آن (با برند و مشخصه متفاوت) نمایش داده شود."
-                  : !formRecords.length ? "برای این نام متریال در انبار انتخابی رکوردی وجود ندارد. ابتدا «موجودی اولیه» ثبت کنید."
+                  : (type !== "WITHDRAWAL" && !matTxt.trim()) ? "نام متریال را تایپ کنید تا همه مدل‌های آن (با برند و مشخصه متفاوت) نمایش داده شود."
+                  : !formRecords.length ? (matTxt.trim() ? "برای این عبارت در انبار انتخابی رکوردی یافت نشد." : "هیچ کالای دارای موجودی در این انبار یافت نشد.")
                  : ""
              }
            />
@@ -673,6 +732,7 @@ export function ChangeInventoryPage() {
              setRows={setRows}
              records={formRecords}
              unitNameFn={(id) => unitName(data.lookup.units, id)}
+              showMaterial={!matTxt.trim()}
              emptyMsg={
                !fromId || !toId ? "برای نمایش موجودی‌ها، انبار مبدأ، مقصد و نام متریال را وارد کنید."
                  : !matTxt.trim() ? "نام متریال را تایپ کنید…"
@@ -778,47 +838,55 @@ export function ChangeInventoryPage() {
  );
 }

-function RowTable({ isCount, rows, setRows, records, unitNameFn, emptyMsg }: {
+function RowTable({ isCount, rows, setRows, records, unitNameFn, emptyMsg, showMaterial = true }: {
  isCount: boolean;
  rows: RowDraft[];
  setRows: (r: RowDraft[]) => void;
-  records: { id: string; brand: { id: string; name: string } | null; unit: { id: number; code: string; name_fa: string | null } | null; quantity_number: number; specs: Record<string, string> }[];
+  records: { id: string; material?: { id: string; name: string }; brand: { id: string; name: string } | null; unit: { id: number; code: string; name_fa: string | null } | null; quantity_number: number; specs: Record<string, string> }[];
  unitNameFn: (id: number | null | undefined) => string;
  emptyMsg: string;
+  showMaterial?: boolean;
 }) {
  if (emptyMsg) return <div className="rounded-lg border border-dashed border-line p-4 text-[12.5px] text-muted">{emptyMsg}</div>;
  return (
-    <div className="overflow-x-auto">
-      <table className="w-full text-[12.5px] min-w-[500px]">
-        <thead>
-          <tr className="border-b border-line text-right text-muted">
-            <th className="py-2 pe-3">مشخصه‌ها</th>
-            <th className="py-2 pe-3">برند</th>
-            <th className="py-2 pe-3">واحد</th>
-            <th className="py-2 pe-3">موجودی فعلی</th>
-            <th className="py-2 pe-3">{isCount ? "شمارش‌شده" : "تعداد"}</th>
-            <th className="py-2">یادداشت</th>
+    <div>
+      <div className="overflow-x-auto max-h-[420px] overflow-y-auto border border-line rounded-lg">
+        <table className="w-full text-[12.5px] min-w-[560px]">
+          <thead className="sticky top-0 bg-panel z-10 shadow-2xs border-b border-line">
+            <tr className="text-right text-muted">
+              {showMaterial && <th className="py-2.5 px-3">متریال</th>}
+              <th className="py-2.5 px-3">مشخصه‌ها</th>
+              <th className="py-2.5 px-3">برند</th>
+              <th className="py-2.5 px-3">واحد</th>
+              <th className="py-2.5 px-3">موجودی فعلی</th>
+              <th className="py-2.5 px-3">{isCount ? "شمارش‌شده" : "تعداد"}</th>
+              <th className="py-2.5 px-3">یادداشت</th>
            </tr>
          </thead>
-        <tbody>
+          <tbody className="divide-y divide-line/40">
            {records.map((r, i) => (
-            <tr key={r.id} className="border-b border-line/50">
-              <td className="py-2 pe-3 text-muted">{Object.entries(r.specs || {}).map(([k, v]) => `${k}: ${v}`).join(" · ") || "—"}</td>
-              <td className="py-2 pe-3">{r.brand?.name || "—"}</td>
-              <td className="py-2 pe-3">{unitNameFn(r.unit?.id)}</td>
-              <td className="py-2 pe-3 font-bold">{faNum(r.quantity_number)}</td>
-              <td className="py-2 pe-3">
+              <tr key={r.id} className="hover:bg-bg/40 transition-colors">
+                {showMaterial && (
+                  <td className="py-2 px-3 font-bold text-ink">
+                    {r.material?.name || "—"}
+                  </td>
+                )}
+                <td className="py-2 px-3 text-muted">{Object.entries(r.specs || {}).map(([k, v]) => `${k}: ${v}`).join(" · ") || "—"}</td>
+                <td className="py-2 px-3">{r.brand?.name || "—"}</td>
+                <td className="py-2 px-3">{unitNameFn(r.unit?.id)}</td>
+                <td className="py-2 px-3 font-bold text-ink">{faNum(r.quantity_number)}</td>
+                <td className="py-2 px-3">
                  <input
                    inputMode="decimal"
-                  className="h-8 w-24 rounded-lg border border-line bg-panel px-2 text-sm ltr"
+                    className="h-8 w-24 rounded-lg border border-line bg-panel px-2 text-sm ltr focus:border-accent"
                    placeholder={isCount ? "شمارش‌شده" : "۰"}
                    value={isCount && rows[i]?.qty === "" ? String(r.quantity_number) : (rows[i]?.qty || "")}
                    onChange={(e) => setRows(rows.map((x, xi) => (xi === i ? { ...x, qty: e.target.value } : x)))}
                  />
                </td>
-              <td className="py-2">
+                <td className="py-2 px-3">
                  <input
-                  className="h-8 w-32 rounded-lg border border-line bg-panel px-2 text-sm"
+                    className="h-8 w-32 rounded-lg border border-line bg-panel px-2 text-sm focus:border-accent"
                    placeholder="توضیح (اختیاری)"
                    value={rows[i]?.note || ""}
                    onChange={(e) => setRows(rows.map((x, xi) => (xi === i ? { ...x, note: e.target.value } : x)))}
@@ -828,7 +896,11 @@ function RowTable({ isCount, rows, setRows, records, unitNameFn, emptyMsg }: {
            ))}
          </tbody>
        </table>
-      <div className="mt-2 text-[11px] text-muted">ستون «موجودی فعلی» مقدار موجود هر رکورد است. برای هر ردیف تعداد و یادداشت وارد کنید.</div>
+      </div>
+      <div className="mt-2 flex items-center justify-between text-[11px] text-muted">
+        <span>ستون «موجودی فعلی» مقدار موجود هر رکورد است. برای هر ردیف تعداد و یادداشت وارد کنید.</span>
+        <span>{faNum(records.length)} قلم کالا</span>
+      </div>
    </div>
  );
 }
@@ -129,9 +129,10 @@ export function DailyControlPage() {
  const wGroups = useMemo(() => {
    const gmap = new Map<string, { recId: string; q: number; last: string; tx: InventoryTransaction }>();
    withdrawals.forEach((t) => {
-      const g = gmap.get(t.inventory_id);
+      const gKey = `${t.inventory_id}__${t.delivered_to || ""}`;
+      const g = gmap.get(gKey);
      if (!g) {
-        gmap.set(t.inventory_id, { recId: t.inventory_id, q: Math.abs(t.quantity_number || 0), last: t.transaction_date, tx: t });
+        gmap.set(gKey, { recId: gKey, q: Math.abs(t.quantity_number || 0), last: t.transaction_date, tx: t });
      } else {
        g.q += Math.abs(t.quantity_number || 0);
        if (t.transaction_date > g.last) g.last = t.transaction_date;
@@ -324,6 +325,12 @@ export function DailyControlPage() {
                            whName(data.warehouses, g.tx.warehouse_id)
                          ].filter(Boolean).join(" · ")}
                        </span>
+                        {g.tx.delivered_to && (
+                          <span className="inline-flex items-center gap-1 mt-1.5 text-[11px] font-semibold text-blue-700 bg-blue-50/80 border border-blue-200/60 rounded px-1.5 py-0.5 w-fit">
+                            <span className="text-slate-500 font-normal">تحویل به:</span>
+                            <span>{g.tx.delivered_to}</span>
+                          </span>
+                        )}
                      </span>
                      <span className="text-xs font-bold text-rose-600 tabular-nums">
                        {faNum(g.q)} {unitName(data.lookup.units, g.tx.unit?.id)}
@@ -1,5 +1,5 @@
 import { useEffect, useMemo, useState } from "react";
-import { Trash2, Plus, Copy } from "lucide-react";
+import { Trash2, Plus } from "lucide-react";
 import type { Material } from "../../lib/types";
 import { normalize } from "../../lib/normalize";
 import { useMaterials } from "../../hooks";
@@ -35,6 +35,7 @@ export interface Step2Props {
  onRemember: (rec: MaterialRec) => void;
 }

+// برچسب انسانی یک قلم (برای termsheet، درگ‌اندروپ و بازبینی)
 export function itemRowLabel(it: ItemDraft): string {
  const parts = [it.cat, it.brand, it.specs.join(" - ")].filter(Boolean);
  const name = parts.length ? parts.join(" - ") : "(قلم بدون‌نام)";
@@ -42,6 +43,7 @@ export function itemRowLabel(it: ItemDraft): string {
  return qtyPart ? `${name} -- ${qtyPart}` : name;
 }

+// مقادیر مجزای name/brand/spec در کاتالوگ سراسری
 export function materialOptions(
  materials: Material[],
  _topic: string,
@@ -85,6 +87,7 @@ export function materialOptions(
  return [...base].sort((a, b) => a.localeCompare(b, "fa"));
 }

+// مرحله ۲ — مدیریت اقلام سفارش
 export function Step2LineItems({ items, onItemsChange, selectedTopic, onRemember }: Step2Props) {
  const materials = useMaterials();

@@ -148,22 +151,6 @@ export function Step2LineItems({ items, onItemsChange, selectedTopic, onRemember
    ]);
  };

-  // قابلیت تکرار قلم در ردیف بعد با کپی عمیق فیلدها و شناسه یکتا
-  const duplicate = (index: number) => {
-    const target = items[index];
-    if (!target) return;
-
-    const clonedItem: ItemDraft = {
-      ...target,
-      tempId: "it" + Date.now() + Math.random().toString(36).slice(2, 6),
-      specs: [...target.specs],
-    };
-
-    const nextItems = [...items];
-    nextItems.splice(index + 1, 0, clonedItem);
-    onItemsChange(nextItems);
-  };
-
  const rememberField = (field: "i-cat" | "i-brand" | "i-spec", it: ItemDraft) => {
    if (!selectedTopic) return;
    let rec: MaterialRec;
@@ -182,8 +169,6 @@ export function Step2LineItems({ items, onItemsChange, selectedTopic, onRemember
    onRemember(rec);
  };

-  const commonInputClass = "!h-9 !text-xs font-normal text-right placeholder:text-xs placeholder:font-normal";
-
  return (
    <div className="space-y-4">
      {/* هدر */}
@@ -223,19 +208,6 @@ export function Step2LineItems({ items, onItemsChange, selectedTopic, onRemember
                  {it.cat || "قلم جدید"} {it.brand ? `• ${it.brand}` : ""}
                </span>
              </div>
-
-              {/* اکشن‌های کارت: کپی و حذف */}
-              <div className="flex items-center gap-1">
-                <button
-                  type="button"
-                  className="inline-flex items-center gap-1 rounded-md px-2 py-0.5 text-xs text-muted hover:text-ink hover:bg-line/50 transition-colors"
-                  title="تکرار این قلم"
-                  onClick={() => duplicate(idx)}
-                >
-                  <Copy className="h-3.5 w-3.5" />
-                  <span className="text-[11px]">کپی</span>
-                </button>
-
              {items.length > 1 && (
                <button
                  type="button"
@@ -248,7 +220,6 @@ export function Step2LineItems({ items, onItemsChange, selectedTopic, onRemember
                </button>
              )}
            </div>
-            </div>

            {/* ردیف ۱: متریال و برند */}
            <div className="grid grid-cols-2 gap-2.5">
@@ -263,7 +234,7 @@ export function Step2LineItems({ items, onItemsChange, selectedTopic, onRemember
                  placeholder="نام متریال"
                  onInputChange={(v) => patch(it.tempId, { cat: v })}
                  onBlur={() => rememberField("i-cat", it)}
-                  inputClassName={commonInputClass}
+                  inputClassName="!text-xs !h-9 text-right"
                  className="min-w-0"
                />
              </div>
@@ -279,7 +250,7 @@ export function Step2LineItems({ items, onItemsChange, selectedTopic, onRemember
                  placeholder="برند"
                  onInputChange={(v) => patch(it.tempId, { brand: v })}
                  onBlur={() => rememberField("i-brand", it)}
-                  inputClassName={commonInputClass}
+                  inputClassName="!text-xs !h-9 text-right"
                  className="min-w-0"
                />
              </div>
@@ -313,7 +284,6 @@ export function Step2LineItems({ items, onItemsChange, selectedTopic, onRemember
                    }}
                    placeholder="مقدار"
                    className="!text-right text-right"
-                    inputClassName={commonInputClass}
                  />
                </div>

@@ -339,13 +309,13 @@ export function Step2LineItems({ items, onItemsChange, selectedTopic, onRemember
                        })
                        .catch(() => {});
                    }}
-                    inputClassName={commonInputClass}
+                    inputClassName="!text-xs !h-9 text-right"
                    className="min-w-0"
                  />
                </div>
              </div>

-              {/* ردیف ۴: قیمت هر واحد */}
+              {/* ردیف ۴: قیمت هر واحد (راست‌چین شده) */}
              <div className="flex flex-col gap-1 min-w-0 border-t border-line/60 pt-2.5">
                <label className="text-[10.5px] font-semibold text-muted text-right">
                  {it.unit ? `قیمت هر ${it.unit} (تومان)` : "قیمت هر واحد (تومان)"}
@@ -361,11 +331,10 @@ export function Step2LineItems({ items, onItemsChange, selectedTopic, onRemember
                  placeholder="قیمت هر واحد"
                  showWords
                  className="!text-right text-right"
-                  inputClassName={commonInputClass}
                />
              </div>

-              {/* ردیف ۵: قیمت کل قلم */}
+              {/* ردیف ۵: قیمت کل قلم (راست‌چین شده) */}
              <div className="flex flex-col gap-1 min-w-0 border-t border-line/60 pt-2.5">
                <label className="text-[10.5px] font-semibold text-muted text-right">قیمت کل این قلم (تومان)</label>
                <NumberInput
@@ -380,7 +349,6 @@ export function Step2LineItems({ items, onItemsChange, selectedTopic, onRemember
                  placeholder="قیمت کل قلم"
                  showWords
                  className="!text-right text-right"
-                  inputClassName={commonInputClass}
                />
              </div>
            </div>
@@ -455,6 +455,7 @@ CREATE TABLE inventory_transactions (
    physical_qty          NUMERIC(18,6),
    transfer_pair_id      UUID,
    performed_by          TEXT,
+    delivered_to          TEXT,
    transaction_date      TIMESTAMPTZ                  NOT NULL DEFAULT now(),
    note                  TEXT,
    created_at            TIMESTAMPTZ                  NOT NULL DEFAULT now()