diff --git a/.gitignore b/.gitignore
index d0cb41f..afcb848 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,9 @@ request.log
# ---- 临时校验文件 ----
_check_tmp/
+# ---- 旧 EXE 备份(打包前移走, 非源码, 不入库) ----
+_backup/
+
# ---- 编辑器 ----
.vscode/
.idea/
diff --git a/app.py b/app.py
index 3fb8b8c..a9a1023 100644
--- a/app.py
+++ b/app.py
@@ -99,6 +99,15 @@ def stock_map():
return {i: inb.get(i, 0) - out.get(i, 0) for i in ids}
+def _status_of(stock, safety):
+ """库存状态: danger=负库存, warn=低于安全库存, ok=正常"""
+ if stock < 0:
+ return "danger"
+ if stock < (safety or 0):
+ return "warn"
+ return "ok"
+
+
def inbound_total_map():
"""返回 {material_id: 入库总数量}"""
rows = db.session.execute(
@@ -276,16 +285,40 @@ def dashboard():
low = 0
for m in mats:
stock = sm.get(m.id, 0)
- if stock < 0:
+ status = _status_of(stock, m.safety_stock)
+ if status == "danger":
negative += 1
- status = "danger"
- elif stock < (m.safety_stock or 0):
+ elif status == "warn":
low += 1
- status = "warn"
- else:
- status = "ok"
rows.append({"m": m, "stock": stock, "status": status})
- return render_template("dashboard.html", rows=rows, negative=negative, low=low)
+
+ # BOM 物料齐套看板(仅管理员/主管可见)
+ can_bom = bool(g.user and g.user.role in ("admin", "manager"))
+ bom_board = []
+ if can_bom:
+ boms = db.session.scalars(db.select(Bom).order_by(Bom.code)).all()
+ for b in boms:
+ items = db.session.scalars(
+ db.select(BomItem).where(BomItem.bom_id == b.id).order_by(BomItem.id)
+ ).all()
+ item_rows = []
+ for it in items:
+ m = db.session.get(Material, it.material_id)
+ if not m:
+ continue
+ stock = sm.get(m.id, 0)
+ item_rows.append({"m": m, "qty": it.qty_per_unit,
+ "stock": stock, "status": _status_of(stock, m.safety_stock)})
+ if any(x["status"] == "danger" for x in item_rows):
+ bstatus = "danger"
+ elif any(x["status"] == "warn" for x in item_rows):
+ bstatus = "warn"
+ else:
+ bstatus = "ok"
+ bom_board.append({"b": b, "parts": item_rows, "status": bstatus})
+
+ return render_template("dashboard.html", rows=rows, negative=negative, low=low,
+ bom_board=bom_board, can_bom=can_bom)
# ---------------- 物料 ----------------
@@ -555,10 +588,15 @@ def bom_detail(bid):
db.select(BomItem).where(BomItem.bom_id == b.id)
.order_by(BomItem.id)
).all()
+ sm = stock_map()
rows = []
for it in items:
m = db.session.get(Material, it.material_id)
- rows.append({"m": m, "qty": it.qty_per_unit})
+ if not m:
+ continue
+ stock = sm.get(m.id, 0)
+ rows.append({"m": m, "qty": it.qty_per_unit,
+ "stock": stock, "status": _status_of(stock, m.safety_stock)})
return render_template("bom_detail.html", b=b, rows=rows)
diff --git a/static/style.css b/static/style.css
index 451bfcd..6935248 100644
--- a/static/style.css
+++ b/static/style.css
@@ -63,6 +63,16 @@ button:hover, .btn:hover { filter: brightness(.96); }
.small { font-size: 12px; }
.txn-form { max-width: 520px; margin-bottom: 22px; }
+/* 看板标签切换 */
+.tabs { display: flex; gap: 8px; margin-bottom: 14px; flex-wrap: wrap; }
+.tabs .tab {
+ background: #eef1f5; color: #44525f; border: 1px solid #d7dde5;
+ padding: 8px 16px; font-size: 14px; cursor: pointer; border-radius: 6px;
+}
+.tabs .tab.active { background: #1f3a5f; color: #fff; border-color: #1f3a5f; }
+.card-head { display: flex; align-items: center; gap: 10px; margin-bottom: 10px; font-size: 15px; }
+.card-head strong { font-size: 16px; }
+
/* 批量导入窗口(模态) */
.modal-mask {
position: fixed; inset: 0; background: rgba(15,23,35,.5);
diff --git a/templates/bom_detail.html b/templates/bom_detail.html
index cdf8e88..e648fb5 100644
--- a/templates/bom_detail.html
+++ b/templates/bom_detail.html
@@ -2,7 +2,12 @@
{% block title %}BOM 明细 {{ b.code }}{% endblock %}
{% block content %}
-库存预警看板
-
-
- | 物料编号 | 型号 / 规格 | 单位 | 在库 | 安全库存 | 状态 |
|---|
-
-
- {% for r in rows %}
-
- | {{ r.m.part_number }} |
- {{ r.m.manufacturer or '-' }} |
- {{ r.m.unit }} |
- {{ '%.2f'|format(r.stock) }} |
- {{ '%.2f'|format(r.m.safety_stock or 0) }} |
-
- {% if r.status=='danger' %}缺料
- {% elif r.status=='warn' %}偏低
- {% else %}正常{% endif %}
- |
-
- {% else %}
- | 暂无物料, 请先到"物料"页面添加 |
- {% endfor %}
-
-
+
+
+ {% if can_bom %}{% endif %}
+
+
+
+
+
+
+ | 物料编号 | 型号 / 规格 | 单位 | 在库 | 安全库存 | 状态 |
|---|
+
+
+ {% for r in rows %}
+
+ | {{ r.m.part_number }} |
+ {{ r.m.manufacturer or '-' }} |
+ {{ r.m.unit }} |
+ {{ '%.2f'|format(r.stock) }} |
+ {{ '%.2f'|format(r.m.safety_stock or 0) }} |
+
+ {% if r.status=='danger' %}缺料
+ {% elif r.status=='warn' %}偏低
+ {% else %}正常{% endif %}
+ |
+
+ {% else %}
+ | 暂无物料, 请先到"物料"页面添加 |
+ {% endfor %}
+
+
+
+ {% for bb in bom_board %}
+
+
+ {{ bb.b.code }}
+ {{ bb.b.name or '' }}
+ {% if bb.status=='danger' %}缺料
+ {% elif bb.status=='warn' %}部分偏低
+ {% else %}齐套{% endif %}
+
+
+
+ | 物料编号 | 型号 / 规格 | 单位 | 单套用量 | 当前在库 | 状态 |
|---|
+
+
+ {% for it in bb.parts %}
+
+ | {{ it.m.part_number }} |
+ {{ it.m.manufacturer or '-' }} |
+ {{ it.m.unit }} |
+ {{ '%.4g'|format(it.qty) }} |
+ {{ '%.2f'|format(it.stock) }} |
+
+ {% if it.status=='danger' %}缺料
+ {% elif it.status=='warn' %}偏低
+ {% else %}正常{% endif %}
+ |
+
+ {% else %}
+ | 该 BOM 暂无组成物料 |
+ {% endfor %}
+
+
+
+ {% else %}
+
暂无 BOM，请先到 BOM 页面导入或新建。
+ {% endfor %}
+