diff --git a/app.py b/app.py index a9a1023..46c0768 100644 --- a/app.py +++ b/app.py @@ -430,11 +430,14 @@ def inbound(): if qty <= 0: flash("入库数量必须大于 0", "error") else: + dlv = request.form.get("delivery_date", "").strip() + delivery_date = _date(dlv) if dlv else None rec = Inbound( material_id=mid, batch_no=request.form.get("batch_no", ""), qty=qty, operator=request.form.get("operator", ""), source=request.form.get("source", ""), occur_date=_date(request.form.get("occur_date")), + delivery_date=delivery_date, remark=request.form.get("remark", "")) db.session.add(rec) db.session.commit() @@ -1009,6 +1012,15 @@ def api_import_boms_commit(): def seed_admin(): with app.app_context(): db.create_all() + # 兼容旧库: 给 inbound 表补充 delivery_date 列(幂等) + try: + cols = [r[1] for r in db.session.execute( + db.text("PRAGMA table_info(inbound)")).fetchall()] + if "delivery_date" not in cols: + db.session.execute(db.text("ALTER TABLE inbound ADD COLUMN delivery_date DATE")) + db.session.commit() + except Exception: + db.session.rollback() if not db.session.scalar(db.select(User).where(User.username == "admin")): db.session.add(User(username="admin", password=sha256("admin123"), role="admin", display_name="管理员")) diff --git a/models.py b/models.py index ea5fe99..33bb717 100644 --- a/models.py +++ b/models.py @@ -49,6 +49,7 @@ class Inbound(db.Model): operator = db.Column(db.String(64), default="") # 经手人 source = db.Column(db.String(255), default="") # 来源 / 供应商 occur_date = db.Column(db.Date, default=date.today) + delivery_date = db.Column(db.Date, default=None) # 送货日期(供应商到货日, 可空) remark = db.Column(db.String(255), default="") created_at = db.Column(db.DateTime, default=datetime.now) diff --git a/templates/material_detail.html b/templates/material_detail.html index 5f04668..4b8cd4e 100644 --- a/templates/material_detail.html +++ b/templates/material_detail.html @@ -29,11 +29,12 @@
| 入库日期 | 录入时间 | 数量 | 批次号 | 来源 / 供应商 | 经手人 | 备注 | |
|---|---|---|---|---|---|---|---|
| 入库日期 | 送货日期 | 录入时间 | 数量 | 批次号 | 来源 / 供应商 | 经手人 | 备注 |
| {{ r.occur_date }} | +{{ r.delivery_date or '-' }} | {{ r.created_at.strftime('%Y-%m-%d %H:%M') if r.created_at else '-' }} | {{ '%.2f'|format(r.qty) }} | {{ r.batch_no or '-' }} | @@ -42,7 +43,7 @@{{ r.remark or '-' }} | ||
| 暂无入库记录 | |||||||
| 暂无入库记录 | |||||||