diff --git a/backend-py/app/main.py b/backend-py/app/main.py
index 02c1d07..a07c091 100644
--- a/backend-py/app/main.py
+++ b/backend-py/app/main.py
@@ -859,6 +859,7 @@ def _handle_me(body: dict[str, Any]) -> dict[str, Any]:
"measurer": has_measurer,
"assembler": has_assembler,
"expeditor": has_expeditor,
+ "dispatcher": sheets.has_role(user, "dispatcher"),
},
"equipment": equipment_list,
"equipment_ok": equipment_ok,
@@ -1530,6 +1531,237 @@ def _handle_act4_save_signature(body):
return {"ok": True, "signed": True, "signed_by_name": name}
+def _handle_dispatcher_inbox(body):
+ cfg = get_config()
+ auth = verify_init_data(body.get("initData") or "", cfg.bot_token)
+ if not auth or not auth.get("user"):
+ unsafe = body.get("initDataUnsafe") or {}
+ if isinstance(unsafe, dict) and unsafe.get("user", {}).get("id"):
+ auth = {"user": unsafe["user"]}
+ else:
+ return {"error": "invalid_init_data"}
+ tg_id = auth["user"]["id"]
+ user = sheets.find_user(tg_id)
+ if not user:
+ return {"error": "user_not_found"}
+ is_disp = sheets.has_role(user, "dispatcher")
+ is_mgr = sheets.has_role(user, "manager")
+ if not (is_disp or is_mgr):
+ return {"error": "forbidden"}
+
+ _ensure_assemblies_sheet()
+ try:
+ ws = sheets.sheet("Assemblies")
+ rows = ws.get_all_values()
+ except Exception:
+ return {"ok": True, "assemblies": []}
+ if not rows or len(rows) < 2:
+ return {"ok": True, "assemblies": []}
+
+ headers = rows[0]
+ STATUS_ORDER = {"created": 0, "shipped": 1, "arrived": 2, "scheduled": 3,
+ "in_progress": 4, "completed": 5, "cancelled": 9}
+ out = []
+ for r in rows[1:]:
+ row = dict(zip(headers, r + [""] * max(0, len(headers) - len(r))))
+ if row.get("archived_at"):
+ continue
+ st = row.get("status", "created")
+ if st == "cancelled":
+ continue
+ out.append({
+ "id": row.get("id", ""),
+ "client_name": row.get("client_name", ""),
+ "client_phone": row.get("client_phone", ""),
+ "address": row.get("address", ""),
+ "scope_of_work": row.get("scope_of_work", ""),
+ "status": st,
+ "scheduled_at": row.get("scheduled_at", ""),
+ "shipment_date": row.get("shipment_date", ""),
+ "packages_count": row.get("packages_count", ""),
+ "arrival_date": row.get("arrival_date", ""),
+ "arrival_packages_count": row.get("arrival_packages_count", ""),
+ "expeditor_tg_id": row.get("expeditor_tg_id", ""),
+ "manager_note": row.get("manager_note", ""),
+ "ts": row.get("ts", ""),
+ })
+ out.sort(key=lambda x: (STATUS_ORDER.get(x["status"], 9), x.get("ts", "")))
+ return {"ok": True, "assemblies": out}
+
+
+def _handle_assembly_set_shipment(body):
+ cfg = get_config()
+ auth = verify_init_data(body.get("initData") or "", cfg.bot_token)
+ if not auth or not auth.get("user"):
+ unsafe = body.get("initDataUnsafe") or {}
+ if isinstance(unsafe, dict) and unsafe.get("user", {}).get("id"):
+ auth = {"user": unsafe["user"]}
+ else:
+ return {"error": "invalid_init_data"}
+ tg_id = auth["user"]["id"]
+ user = sheets.find_user(tg_id)
+ if not user:
+ return {"error": "user_not_found"}
+ if not (sheets.has_role(user, "dispatcher") or sheets.has_role(user, "manager")):
+ return {"error": "forbidden"}
+
+ assembly_id = (body.get("assembly_id") or "").strip()
+ shipment_date = (body.get("shipment_date") or "").strip()
+ packages_count = str(body.get("packages_count") or "").strip()
+ if not assembly_id or not shipment_date:
+ return {"error": "missing_fields"}
+
+ _ensure_assemblies_sheet()
+ asm = sheets.find_row("Assemblies", "id", assembly_id)
+ if not asm:
+ return {"error": "assembly_not_found"}
+
+ sheets.update_cell_by_key("Assemblies", "id", assembly_id, "shipment_date", shipment_date)
+ sheets.update_cell_by_key("Assemblies", "id", assembly_id, "packages_count", packages_count)
+ sheets.update_cell_by_key("Assemblies", "id", assembly_id, "status", "shipped")
+
+ # Уведомить менеджера
+ try:
+ mgr_id = asm.get("manager_tg_id")
+ if mgr_id:
+ tg.send_message(int(mgr_id),
+ f"🚚 Отгрузка с фабрики зафиксирована\n"
+ f"Клиент: {asm.get('client_name','')}\n"
+ f"Дата отгрузки: {shipment_date}\n"
+ f"Упаковок: {packages_count or '—'}")
+ except Exception as e:
+ log.warning("dispatcher notify error: %s", e)
+
+ return {"ok": True, "status": "shipped"}
+
+
+def _handle_assembly_set_arrival(body):
+ cfg = get_config()
+ auth = verify_init_data(body.get("initData") or "", cfg.bot_token)
+ if not auth or not auth.get("user"):
+ unsafe = body.get("initDataUnsafe") or {}
+ if isinstance(unsafe, dict) and unsafe.get("user", {}).get("id"):
+ auth = {"user": unsafe["user"]}
+ else:
+ return {"error": "invalid_init_data"}
+ tg_id = auth["user"]["id"]
+ user = sheets.find_user(tg_id)
+ if not user:
+ return {"error": "user_not_found"}
+ if not (sheets.has_role(user, "dispatcher") or sheets.has_role(user, "manager")):
+ return {"error": "forbidden"}
+
+ assembly_id = (body.get("assembly_id") or "").strip()
+ arrival_date = (body.get("arrival_date") or "").strip()
+ arrival_packages_count = str(body.get("arrival_packages_count") or "").strip()
+ if not assembly_id or not arrival_date:
+ return {"error": "missing_fields"}
+
+ _ensure_assemblies_sheet()
+ asm = sheets.find_row("Assemblies", "id", assembly_id)
+ if not asm:
+ return {"error": "assembly_not_found"}
+
+ sheets.update_cell_by_key("Assemblies", "id", assembly_id, "arrival_date", arrival_date)
+ sheets.update_cell_by_key("Assemblies", "id", assembly_id, "arrival_packages_count", arrival_packages_count)
+ sheets.update_cell_by_key("Assemblies", "id", assembly_id, "arrival_confirmed_by_tg_id", str(tg_id))
+ sheets.update_cell_by_key("Assemblies", "id", assembly_id, "status", "arrived")
+
+ # Проверяем расхождение упаковок
+ try:
+ expected = int(asm.get("packages_count") or 0)
+ actual = int(arrival_packages_count or 0)
+ if expected > 0 and actual != expected:
+ mgr_id = asm.get("manager_tg_id")
+ if mgr_id:
+ tg.send_message(int(mgr_id),
+ f"⚠️ Расхождение упаковок на складе\n"
+ f"Клиент: {asm.get('client_name','')}\n"
+ f"Ожидалось: {expected} · Принято: {actual}")
+ except Exception as e:
+ log.warning("arrival check error: %s", e)
+
+ return {"ok": True, "status": "arrived"}
+
+
+def _handle_assembly_assign_dispatch(body):
+ cfg = get_config()
+ auth = verify_init_data(body.get("initData") or "", cfg.bot_token)
+ if not auth or not auth.get("user"):
+ unsafe = body.get("initDataUnsafe") or {}
+ if isinstance(unsafe, dict) and unsafe.get("user", {}).get("id"):
+ auth = {"user": unsafe["user"]}
+ else:
+ return {"error": "invalid_init_data"}
+ tg_id = auth["user"]["id"]
+ user = sheets.find_user(tg_id)
+ if not user:
+ return {"error": "user_not_found"}
+ if not (sheets.has_role(user, "dispatcher") or sheets.has_role(user, "manager")):
+ return {"error": "forbidden"}
+
+ assembly_id = (body.get("assembly_id") or "").strip()
+ scheduled_at = (body.get("scheduled_at") or "").strip()
+ expeditor_tg_id = str(body.get("expeditor_tg_id") or "").strip()
+ if not assembly_id or not scheduled_at:
+ return {"error": "missing_fields"}
+
+ _ensure_assemblies_sheet()
+ asm = sheets.find_row("Assemblies", "id", assembly_id)
+ if not asm:
+ return {"error": "assembly_not_found"}
+
+ sheets.update_cell_by_key("Assemblies", "id", assembly_id, "scheduled_at", scheduled_at)
+ if expeditor_tg_id:
+ sheets.update_cell_by_key("Assemblies", "id", assembly_id, "expeditor_tg_id", expeditor_tg_id)
+ sheets.update_cell_by_key("Assemblies", "id", assembly_id, "status", "scheduled")
+
+ # Уведомить экспедитора
+ try:
+ exp_id = int(expeditor_tg_id) if expeditor_tg_id else None
+ if exp_id:
+ tg.send_message(exp_id,
+ f"📋 Назначена сборка\n"
+ f"Клиент: {asm.get('client_name','')}\n"
+ f"Адрес: {asm.get('address','')}\n"
+ f"Дата: {scheduled_at[:10]}")
+ mgr_id = asm.get("manager_tg_id")
+ if mgr_id:
+ tg.send_message(int(mgr_id),
+ f"✅ Сборка назначена\n"
+ f"Клиент: {asm.get('client_name','')}\n"
+ f"Дата: {scheduled_at[:10]}\n"
+ f"Экспедитор: tg:{expeditor_tg_id or '—'}")
+ except Exception as e:
+ log.warning("dispatch notify error: %s", e)
+
+ return {"ok": True, "status": "scheduled"}
+
+
+@app.post("/api/dispatcher_inbox")
+async def api_dispatcher_inbox(request: Request):
+ body = await _safe_json(request)
+ return JSONResponse(_handle_dispatcher_inbox(body))
+
+
+@app.post("/api/assembly_set_shipment")
+async def api_assembly_set_shipment(request: Request):
+ body = await _safe_json(request)
+ return JSONResponse(_handle_assembly_set_shipment(body))
+
+
+@app.post("/api/assembly_set_arrival")
+async def api_assembly_set_arrival(request: Request):
+ body = await _safe_json(request)
+ return JSONResponse(_handle_assembly_set_arrival(body))
+
+
+@app.post("/api/assembly_assign_dispatch")
+async def api_assembly_assign_dispatch(request: Request):
+ body = await _safe_json(request)
+ return JSONResponse(_handle_assembly_assign_dispatch(body))
+
+
@app.post("/api/expeditor_inbox")
async def api_expeditor_inbox(request: Request):
body = await _safe_json(request)
@@ -4721,6 +4953,9 @@ def _assembly_columns() -> list[str]:
# Обратная связь
"client_feedback_at", # ISO — когда клиент оставил оценку
"archived_at",
+ # Логистика (диспетчер)
+ "shipment_date", "packages_count",
+ "arrival_date", "arrival_packages_count", "arrival_confirmed_by_tg_id",
]
diff --git a/miniapp/assets/app.js b/miniapp/assets/app.js
index f76c3d1..f087c9c 100644
--- a/miniapp/assets/app.js
+++ b/miniapp/assets/app.js
@@ -890,9 +890,14 @@ async function renderStaff(me) {
if (caps.measurer) labels.push("замерщик");
if (caps.assembler) labels.push("сборщик");
if (caps.expeditor) labels.push("экспедитор");
+ if (caps.dispatcher) labels.push("диспетчер");
const subtitle = labels.length ? labels.join(" · ") : "сотрудник";
// Экспедитор — отдельный экран
+ if (caps.dispatcher && !caps.measurer && !caps.assembler && !caps.expeditor) {
+ location.hash = "#/dispatcher";
+ return;
+ }
if (caps.expeditor && !caps.measurer && !caps.assembler) {
_renderExpeditorScreen(app, me);
return;
@@ -1960,6 +1965,9 @@ function routeByHash() {
} else if (location.hash === "#/expeditor") {
if (typeof ExpeditorDashboard !== "undefined") ExpeditorDashboard.mount(app);
else init();
+ } else if (location.hash === "#/dispatcher") {
+ if (typeof DispatcherDashboard !== "undefined") DispatcherDashboard.mount(app);
+ else init();
} else if (location.hash.startsWith("#/expeditor/act/")) {
const asmId = location.hash.replace("#/expeditor/act/", "").split("?")[0];
if (typeof ExpeditorDashboard !== "undefined") ExpeditorDashboard.mountAct(app, asmId);
diff --git a/miniapp/assets/dispatcher_dashboard.js b/miniapp/assets/dispatcher_dashboard.js
new file mode 100644
index 0000000..1de979f
--- /dev/null
+++ b/miniapp/assets/dispatcher_dashboard.js
@@ -0,0 +1,301 @@
+// dispatcher_dashboard.js v=20260521a
+const DispatcherDashboard = (function () {
+ "use strict";
+
+ const STATUS_LABEL = {
+ created: "Новая",
+ shipped: "В пути",
+ arrived: "На складе",
+ scheduled: "Назначена",
+ in_progress: "В работе",
+ completed: "Завершена",
+ };
+ const STATUS_COLOR = {
+ created: "#FFF3CD",
+ shipped: "#CCE5FF",
+ arrived: "#D4EDDA",
+ scheduled: "#E2D9F3",
+ in_progress: "#FFE0B2",
+ completed: "#E8F5E9",
+ };
+ const STATUS_TEXT_COLOR = {
+ created: "#856404",
+ shipped: "#004085",
+ arrived: "#155724",
+ scheduled: "#4A235A",
+ in_progress: "#E65100",
+ completed: "#1B5E20",
+ };
+
+ function fmt(iso) {
+ if (!iso) return "—";
+ const d = iso.slice(0, 10).split("-");
+ return d[2] + "." + d[1] + "." + d[0];
+ }
+
+ function el(html) {
+ const t = document.createElement("div");
+ t.innerHTML = html.trim();
+ return t.firstChild;
+ }
+
+ function badge(status) {
+ return `${STATUS_LABEL[status] || status}`;
+ }
+
+ function showError(container, msg) {
+ container.innerHTML = `${msg}
`;
+ }
+
+ // ─── MAIN LIST ────────────────────────────────────────────────
+ async function mount(container) {
+ container.innerHTML = `
+
+
+ 📦 Диспетчер
+
+ `;
+
+ const body = container.querySelector("#disp-body");
+ body.innerHTML = `Загрузка…
`;
+
+ let data;
+ try {
+ data = await _api("/api/dispatcher_inbox", {});
+ } catch (e) {
+ showError(body, "Ошибка сети: " + e.message);
+ return;
+ }
+ if (data.error) { showError(body, data.error); return; }
+
+ const items = data.assemblies || [];
+ if (!items.length) {
+ body.innerHTML = `Нет сборок
`;
+ return;
+ }
+
+ // Group by status
+ const GROUPS = ["created","shipped","arrived","scheduled","in_progress","completed"];
+ const grouped = {};
+ GROUPS.forEach(s => { grouped[s] = []; });
+ items.forEach(a => { (grouped[a.status] || (grouped["created"])).push(a); });
+
+ body.innerHTML = "";
+ GROUPS.forEach(status => {
+ const list = grouped[status];
+ if (!list.length) return;
+ const section = el(`
+
${STATUS_LABEL[status]} (${list.length})
+
+
+ ${a.client_name || "—"}
+ ${badge(a.status)}
+
+
📍 ${a.address || "—"}
+ ${a.shipment_date ? `
🚚 Отгружено: ${fmt(a.shipment_date)} · ${a.packages_count || "?"} уп.
` : ""}
+ ${a.arrival_date ? `
🏭 Принято: ${fmt(a.arrival_date)} · ${a.arrival_packages_count || "?"} уп.
` : ""}
+ ${a.scheduled_at ? `
📅 Назначено: ${fmt(a.scheduled_at)}
` : ""}
+
+
+ ${a.client_name}
+ ${badge(a.status)}
+
+ `;
+
+ container.querySelector("#back-btn").addEventListener("click", () => mount(container));
+ const body = container.querySelector("#detail-body");
+
+ // Info block
+ body.appendChild(el(`
+
📍 ${a.address || "—"}
+ ${a.scope_of_work ? `
📝 ${a.scope_of_work}
` : ""}
+ ${a.client_phone ? `
📞 ${a.client_phone}
` : ""}
+ ${a.manager_note ? `
💬 ${a.manager_note}
` : ""}
+
+
+ ${done ? "✅" : "1️⃣"}
+ Отгрузка с фабрики
+
+ ${done ? `
Дата: ${fmt(a.shipment_date)} · Упаковок: ${a.packages_count || "—"}
` : ""}
+
+
+
+
+
+
+
+
+
+
+
+
+ ${done ? "✅" : "2️⃣"}
+ Приёмка на склад
+
+ ${done ? `
Дата: ${fmt(a.arrival_date)} · Принято: ${a.arrival_packages_count || "—"} уп.
` : ""}
+
+
+
+
+
+
+
+
+
+
+
+
+ ${done ? "✅" : "3️⃣"}
+ Назначить дату и экспедитора
+
+ ${done ? `
Дата: ${fmt(a.scheduled_at)}${a.expeditor_tg_id ? " · Экспедитор: tg:" + a.expeditor_tg_id : ""}
` : ""}
+
+
+
+
+
+
+
+
Загрузка…
+
+
+
Нет экспедиторов
`;
+ return;
+ }
+ const opts = users.map(u => ``).join("");
+ container.innerHTML = `
+ `;
+ } catch (e) {
+ container.innerHTML = `
+ `;
+ }
+ }
+
+ return { mount, mountDetail };
+})();
diff --git a/miniapp/index.html b/miniapp/index.html
index 0d5f542..ec3e3ed 100644
--- a/miniapp/index.html
+++ b/miniapp/index.html
@@ -67,6 +67,7 @@
+