Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d85ede7d11 |
@@ -247,6 +247,7 @@ _V26_DDL = [
|
|||||||
physical_qty NUMERIC(18,6),
|
physical_qty NUMERIC(18,6),
|
||||||
transfer_pair_id UUID,
|
transfer_pair_id UUID,
|
||||||
performed_by TEXT,
|
performed_by TEXT,
|
||||||
|
delivered_to TEXT,
|
||||||
transaction_date TIMESTAMPTZ NOT NULL DEFAULT now(),
|
transaction_date TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
note TEXT,
|
note TEXT,
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
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)
|
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.
|
# suppliers.categories JSONB (v2.4 runtime) is replaced by suppliers.category_id — drop it.
|
||||||
"""
|
"""
|
||||||
ALTER TABLE suppliers DROP COLUMN IF EXISTS categories
|
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.
|
# 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))
|
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)
|
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(
|
transaction_date: Mapped[datetime] = mapped_column(
|
||||||
DateTime(timezone=True), nullable=False, server_default=func.now()
|
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,
|
"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,
|
"transfer_pair_id": str(tx.transfer_pair_id) if tx.transfer_pair_id else None,
|
||||||
"performed_by": tx.performed_by,
|
"performed_by": tx.performed_by,
|
||||||
|
"delivered_to": tx.delivered_to,
|
||||||
"transaction_date": to_iso(tx.transaction_date),
|
"transaction_date": to_iso(tx.transaction_date),
|
||||||
"note": tx.note,
|
"note": tx.note,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ class InventoryTransactionCreate(APIModel):
|
|||||||
unit_id: int | None = None
|
unit_id: int | None = None
|
||||||
specs: dict | None = None
|
specs: dict | None = None
|
||||||
note: str | None = None
|
note: str | None = None
|
||||||
|
delivered_to: str | None = None
|
||||||
transaction_date: datetime | None = None
|
transaction_date: datetime | None = None
|
||||||
|
|
||||||
@model_validator(mode="after")
|
@model_validator(mode="after")
|
||||||
|
|||||||
@@ -290,6 +290,7 @@ async def apply_transaction(
|
|||||||
transaction_type=t,
|
transaction_type=t,
|
||||||
quantity=quantity,
|
quantity=quantity,
|
||||||
performed_by=performed_by,
|
performed_by=performed_by,
|
||||||
|
delivered_to=payload.delivered_to,
|
||||||
transaction_date=payload.transaction_date,
|
transaction_date=payload.transaction_date,
|
||||||
note=payload.note,
|
note=payload.note,
|
||||||
)
|
)
|
||||||
@@ -319,6 +320,7 @@ async def apply_transaction(
|
|||||||
transaction_type=t,
|
transaction_type=t,
|
||||||
quantity=-quantity,
|
quantity=-quantity,
|
||||||
performed_by=performed_by,
|
performed_by=performed_by,
|
||||||
|
delivered_to=payload.delivered_to,
|
||||||
transaction_date=payload.transaction_date,
|
transaction_date=payload.transaction_date,
|
||||||
note=payload.note,
|
note=payload.note,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1678,7 +1678,7 @@ export const apiV26 = {
|
|||||||
transaction_type: TransactionType; warehouse_id: string; dest_warehouse_id?: string | null;
|
transaction_type: TransactionType; warehouse_id: string; dest_warehouse_id?: string | null;
|
||||||
material_id: string; brand_id?: string | null; quantity?: number | null;
|
material_id: string; brand_id?: string | null; quantity?: number | null;
|
||||||
physical_qty?: number | null; unit_id?: number | null; specs?: Record<string, string> | 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[]> => {
|
}): Promise<InventoryTransaction[]> => {
|
||||||
return postData<InventoryTransaction[]>(`/inventory/transactions${projectQuery()}`, body);
|
return postData<InventoryTransaction[]>(`/inventory/transactions${projectQuery()}`, body);
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -163,6 +163,7 @@ export interface InventoryTransaction {
|
|||||||
physical_qty?: number | null;
|
physical_qty?: number | null;
|
||||||
transfer_pair_id?: string | null;
|
transfer_pair_id?: string | null;
|
||||||
performed_by?: string | null;
|
performed_by?: string | null;
|
||||||
|
delivered_to?: string | null;
|
||||||
transaction_date: string;
|
transaction_date: string;
|
||||||
note?: string | null;
|
note?: string | null;
|
||||||
material?: { id: string; name: string } | null;
|
material?: { id: string; name: string } | null;
|
||||||
|
|||||||
@@ -62,6 +62,7 @@ export function ChangeInventoryPage() {
|
|||||||
const [dateInput, setDateInput] = useState<string>(() => new Date().toISOString());
|
const [dateInput, setDateInput] = useState<string>(() => new Date().toISOString());
|
||||||
const [specsChips, setSpecsChips] = useState<string[]>([]);
|
const [specsChips, setSpecsChips] = useState<string[]>([]);
|
||||||
const [note, setNote] = useState("");
|
const [note, setNote] = useState("");
|
||||||
|
const [deliveredTo, setDeliveredTo] = useState("");
|
||||||
const [rows, setRows] = useState<RowDraft[]>([]);
|
const [rows, setRows] = useState<RowDraft[]>([]);
|
||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
|
|
||||||
@@ -86,10 +87,20 @@ export function ChangeInventoryPage() {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const formRecords = useMemo(() => {
|
const formRecords = useMemo(() => {
|
||||||
const txt = matTxt.trim();
|
const txt = matTxt.trim().toLowerCase();
|
||||||
const wid = type === "TRANSFER" ? fromId : whId;
|
const wid = type === "TRANSFER" ? fromId : whId;
|
||||||
return data.inventory.filter((r) => {
|
return data.inventory.filter((r) => {
|
||||||
if (r.warehouse?.id !== wid) return false;
|
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;
|
if (txt && !r.material.name.includes(txt)) return false;
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
@@ -186,6 +197,7 @@ export function ChangeInventoryPage() {
|
|||||||
setQty("");
|
setQty("");
|
||||||
setSpecsChips([]);
|
setSpecsChips([]);
|
||||||
setNote("");
|
setNote("");
|
||||||
|
setDeliveredTo("");
|
||||||
await data.refresh();
|
await data.refresh();
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
toast.error(err instanceof Error ? err.message : "خطا در ثبت");
|
toast.error(err instanceof Error ? err.message : "خطا در ثبت");
|
||||||
@@ -235,6 +247,9 @@ export function ChangeInventoryPage() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const submitList = async (t: TransactionType) => {
|
const submitList = async (t: TransactionType) => {
|
||||||
|
if (t === "WITHDRAWAL" && !deliveredTo.trim()) {
|
||||||
|
return toast.error("نام تحویلگیرنده اقلام الزامی است");
|
||||||
|
}
|
||||||
const ops: Record<string, unknown>[] = rows
|
const ops: Record<string, unknown>[] = rows
|
||||||
.map((r, i): Record<string, unknown> | null => {
|
.map((r, i): Record<string, unknown> | null => {
|
||||||
const n = parseNum(r.qty);
|
const n = parseNum(r.qty);
|
||||||
@@ -244,7 +259,18 @@ export function ChangeInventoryPage() {
|
|||||||
if (t === "STOCK_COUNT") {
|
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: "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);
|
.filter((x): x is Record<string, unknown> => x !== null);
|
||||||
if (!ops.length) return toast.error("هیچ ردیفی پر نشده است");
|
if (!ops.length) return toast.error("هیچ ردیفی پر نشده است");
|
||||||
@@ -370,6 +396,9 @@ export function ChangeInventoryPage() {
|
|||||||
if (type === "PURCHASE") {
|
if (type === "PURCHASE") {
|
||||||
return !!(whId && matTxt.trim() && brandTxt.trim() && unitTxt.trim() && parseNum(qty) > 0 && specsComplete);
|
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 === "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 === "RETURN") return !!(whId && matTxt.trim() && rows.some((r) => parseNum(r.qty) > 0));
|
||||||
if (type === "FOUND") {
|
if (type === "FOUND") {
|
||||||
@@ -486,7 +515,36 @@ export function ChangeInventoryPage() {
|
|||||||
</div>
|
</div>
|
||||||
</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">
|
<div className="field">
|
||||||
<label className="text-xs font-semibold text-muted">{type === "FOUND" ? "متریال (خالی = همه مفقودیها)" : "متریال *"}</label>
|
<label className="text-xs font-semibold text-muted">{type === "FOUND" ? "متریال (خالی = همه مفقودیها)" : "متریال *"}</label>
|
||||||
<input
|
<input
|
||||||
@@ -653,10 +711,11 @@ export function ChangeInventoryPage() {
|
|||||||
setRows={setRows}
|
setRows={setRows}
|
||||||
records={formRecords}
|
records={formRecords}
|
||||||
unitNameFn={(id) => unitName(data.lookup.units, id)}
|
unitNameFn={(id) => unitName(data.lookup.units, id)}
|
||||||
|
showMaterial={type === "WITHDRAWAL" || !matTxt.trim()}
|
||||||
emptyMsg={
|
emptyMsg={
|
||||||
!whId ? "برای نمایش رکوردها، ابتدا انبار را انتخاب کنید."
|
!whId ? "برای نمایش رکوردها، ابتدا انبار را انتخاب کنید."
|
||||||
: !matTxt.trim() ? "نام متریال را تایپ کنید تا همه مدلهای آن (با برند و مشخصه متفاوت) نمایش داده شود."
|
: (type !== "WITHDRAWAL" && !matTxt.trim()) ? "نام متریال را تایپ کنید تا همه مدلهای آن (با برند و مشخصه متفاوت) نمایش داده شود."
|
||||||
: !formRecords.length ? "برای این نام متریال در انبار انتخابی رکوردی وجود ندارد. ابتدا «موجودی اولیه» ثبت کنید."
|
: !formRecords.length ? (matTxt.trim() ? "برای این عبارت در انبار انتخابی رکوردی یافت نشد." : "هیچ کالای دارای موجودی در این انبار یافت نشد.")
|
||||||
: ""
|
: ""
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
@@ -673,6 +732,7 @@ export function ChangeInventoryPage() {
|
|||||||
setRows={setRows}
|
setRows={setRows}
|
||||||
records={formRecords}
|
records={formRecords}
|
||||||
unitNameFn={(id) => unitName(data.lookup.units, id)}
|
unitNameFn={(id) => unitName(data.lookup.units, id)}
|
||||||
|
showMaterial={!matTxt.trim()}
|
||||||
emptyMsg={
|
emptyMsg={
|
||||||
!fromId || !toId ? "برای نمایش موجودیها، انبار مبدأ، مقصد و نام متریال را وارد کنید."
|
!fromId || !toId ? "برای نمایش موجودیها، انبار مبدأ، مقصد و نام متریال را وارد کنید."
|
||||||
: !matTxt.trim() ? "نام متریال را تایپ کنید…"
|
: !matTxt.trim() ? "نام متریال را تایپ کنید…"
|
||||||
@@ -778,57 +838,69 @@ export function ChangeInventoryPage() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function RowTable({ isCount, rows, setRows, records, unitNameFn, emptyMsg }: {
|
function RowTable({ isCount, rows, setRows, records, unitNameFn, emptyMsg, showMaterial = true }: {
|
||||||
isCount: boolean;
|
isCount: boolean;
|
||||||
rows: RowDraft[];
|
rows: RowDraft[];
|
||||||
setRows: (r: RowDraft[]) => void;
|
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;
|
unitNameFn: (id: number | null | undefined) => string;
|
||||||
emptyMsg: 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>;
|
if (emptyMsg) return <div className="rounded-lg border border-dashed border-line p-4 text-[12.5px] text-muted">{emptyMsg}</div>;
|
||||||
return (
|
return (
|
||||||
<div className="overflow-x-auto">
|
<div>
|
||||||
<table className="w-full text-[12.5px] min-w-[500px]">
|
<div className="overflow-x-auto max-h-[420px] overflow-y-auto border border-line rounded-lg">
|
||||||
<thead>
|
<table className="w-full text-[12.5px] min-w-[560px]">
|
||||||
<tr className="border-b border-line text-right text-muted">
|
<thead className="sticky top-0 bg-panel z-10 shadow-2xs border-b border-line">
|
||||||
<th className="py-2 pe-3">مشخصهها</th>
|
<tr className="text-right text-muted">
|
||||||
<th className="py-2 pe-3">برند</th>
|
{showMaterial && <th className="py-2.5 px-3">متریال</th>}
|
||||||
<th className="py-2 pe-3">واحد</th>
|
<th className="py-2.5 px-3">مشخصهها</th>
|
||||||
<th className="py-2 pe-3">موجودی فعلی</th>
|
<th className="py-2.5 px-3">برند</th>
|
||||||
<th className="py-2 pe-3">{isCount ? "شمارششده" : "تعداد"}</th>
|
<th className="py-2.5 px-3">واحد</th>
|
||||||
<th className="py-2">یادداشت</th>
|
<th className="py-2.5 px-3">موجودی فعلی</th>
|
||||||
</tr>
|
<th className="py-2.5 px-3">{isCount ? "شمارششده" : "تعداد"}</th>
|
||||||
</thead>
|
<th className="py-2.5 px-3">یادداشت</th>
|
||||||
<tbody>
|
|
||||||
{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">
|
|
||||||
<input
|
|
||||||
inputMode="decimal"
|
|
||||||
className="h-8 w-24 rounded-lg border border-line bg-panel px-2 text-sm ltr"
|
|
||||||
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">
|
|
||||||
<input
|
|
||||||
className="h-8 w-32 rounded-lg border border-line bg-panel px-2 text-sm"
|
|
||||||
placeholder="توضیح (اختیاری)"
|
|
||||||
value={rows[i]?.note || ""}
|
|
||||||
onChange={(e) => setRows(rows.map((x, xi) => (xi === i ? { ...x, note: e.target.value } : x)))}
|
|
||||||
/>
|
|
||||||
</td>
|
|
||||||
</tr>
|
</tr>
|
||||||
))}
|
</thead>
|
||||||
</tbody>
|
<tbody className="divide-y divide-line/40">
|
||||||
</table>
|
{records.map((r, i) => (
|
||||||
<div className="mt-2 text-[11px] text-muted">ستون «موجودی فعلی» مقدار موجود هر رکورد است. برای هر ردیف تعداد و یادداشت وارد کنید.</div>
|
<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 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 px-3">
|
||||||
|
<input
|
||||||
|
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)))}
|
||||||
|
/>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
))}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<div className="mt-2 flex items-center justify-between text-[11px] text-muted">
|
||||||
|
<span>ستون «موجودی فعلی» مقدار موجود هر رکورد است. برای هر ردیف تعداد و یادداشت وارد کنید.</span>
|
||||||
|
<span>{faNum(records.length)} قلم کالا</span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -129,9 +129,10 @@ export function DailyControlPage() {
|
|||||||
const wGroups = useMemo(() => {
|
const wGroups = useMemo(() => {
|
||||||
const gmap = new Map<string, { recId: string; q: number; last: string; tx: InventoryTransaction }>();
|
const gmap = new Map<string, { recId: string; q: number; last: string; tx: InventoryTransaction }>();
|
||||||
withdrawals.forEach((t) => {
|
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) {
|
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 {
|
} else {
|
||||||
g.q += Math.abs(t.quantity_number || 0);
|
g.q += Math.abs(t.quantity_number || 0);
|
||||||
if (t.transaction_date > g.last) g.last = t.transaction_date;
|
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)
|
whName(data.warehouses, g.tx.warehouse_id)
|
||||||
].filter(Boolean).join(" · ")}
|
].filter(Boolean).join(" · ")}
|
||||||
</span>
|
</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>
|
||||||
<span className="text-xs font-bold text-rose-600 tabular-nums">
|
<span className="text-xs font-bold text-rose-600 tabular-nums">
|
||||||
{faNum(g.q)} {unitName(data.lookup.units, g.tx.unit?.id)}
|
{faNum(g.q)} {unitName(data.lookup.units, g.tx.unit?.id)}
|
||||||
|
|||||||
@@ -455,6 +455,7 @@ CREATE TABLE inventory_transactions (
|
|||||||
physical_qty NUMERIC(18,6),
|
physical_qty NUMERIC(18,6),
|
||||||
transfer_pair_id UUID,
|
transfer_pair_id UUID,
|
||||||
performed_by TEXT,
|
performed_by TEXT,
|
||||||
|
delivered_to TEXT,
|
||||||
transaction_date TIMESTAMPTZ NOT NULL DEFAULT now(),
|
transaction_date TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
note TEXT,
|
note TEXT,
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
|||||||
Reference in New Issue
Block a user