v0.2.0: CRM/ERP 系统升级 - 清理 .gitignore 并移除误提交的 venv/env/db 文件
- 更新 .gitignore:全面覆盖环境变量、数据库、日志、缓存、上传文件 - 移除误跟踪的 server/venv/、crm_data.db、.env 文件 - 新增 server/.env.example 模板 - 新增合同管理、利润核算、AI教练等功能模块 - 新增 Playwright e2e 测试套件 - 前后端多项功能升级和 bug 修复
This commit is contained in:
@@ -33,6 +33,9 @@ class FinInvoicePool(Base):
|
||||
uploader_id: Mapped[uuid.UUID | None] = mapped_column(
|
||||
UUID(as_uuid=True), ForeignKey("sys_users.id"), nullable=True
|
||||
)
|
||||
company_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True), ForeignKey("sys_companies.id"), nullable=False, index=True
|
||||
)
|
||||
file_url: Mapped[str | None] = mapped_column(String(500), nullable=True)
|
||||
merchant_name: Mapped[str | None] = mapped_column(String(200), nullable=True)
|
||||
amount: Mapped[float] = mapped_column(Numeric(14, 2), default=0)
|
||||
@@ -59,6 +62,9 @@ class FinExpenseRecord(Base):
|
||||
applicant_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True), ForeignKey("sys_users.id"), nullable=False
|
||||
)
|
||||
company_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True), ForeignKey("sys_companies.id"), nullable=False, index=True
|
||||
)
|
||||
total_amount: Mapped[float] = mapped_column(Numeric(14, 2), default=0)
|
||||
status: Mapped[str] = mapped_column(String(20), nullable=False, default="draft")
|
||||
remark: Mapped[str | None] = mapped_column(Text, nullable=True)
|
||||
@@ -134,9 +140,23 @@ class FinSalesInvoice(Base):
|
||||
payment_date: Mapped[date | None] = mapped_column(Date, nullable=True)
|
||||
payment_amount: Mapped[float] = mapped_column(Numeric(14, 2), default=0)
|
||||
remark: Mapped[str | None] = mapped_column(Text, nullable=True)
|
||||
order_id: Mapped[uuid.UUID | None] = mapped_column(
|
||||
UUID(as_uuid=True), ForeignKey("erp_orders.id"), nullable=True,
|
||||
comment="关联订单"
|
||||
)
|
||||
shipping_record_id: Mapped[uuid.UUID | None] = mapped_column(
|
||||
UUID(as_uuid=True), ForeignKey("erp_shipping_records.id"), nullable=True,
|
||||
comment="关联发货单"
|
||||
)
|
||||
payment_due_date: Mapped[date | None] = mapped_column(
|
||||
Date, nullable=True, comment="回款截止日(根据合同付款条件自动推算)"
|
||||
)
|
||||
created_by: Mapped[uuid.UUID | None] = mapped_column(
|
||||
UUID(as_uuid=True), ForeignKey("sys_users.id"), nullable=True
|
||||
)
|
||||
company_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True), ForeignKey("sys_companies.id"), nullable=False, index=True
|
||||
)
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now())
|
||||
updated_at: Mapped[datetime] = mapped_column(
|
||||
DateTime, server_default=func.now(), onupdate=func.now()
|
||||
@@ -150,3 +170,43 @@ class FinSalesInvoice(Base):
|
||||
creator: Mapped["SysUser | None"] = relationship( # noqa: F821
|
||||
"SysUser", lazy="selectin"
|
||||
)
|
||||
|
||||
|
||||
class FinOcrTask(Base):
|
||||
"""OCR 处理任务队列 — 持久化排队"""
|
||||
__tablename__ = "fin_ocr_tasks"
|
||||
|
||||
id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True), primary_key=True, default=uuid.uuid4
|
||||
)
|
||||
file_url: Mapped[str] = mapped_column(String(500), nullable=False)
|
||||
file_ext: Mapped[str] = mapped_column(String(10), nullable=False, comment=".pdf/.png/.jpg")
|
||||
original_name: Mapped[str] = mapped_column(String(200), nullable=False, default="")
|
||||
status: Mapped[str] = mapped_column(
|
||||
String(20), nullable=False, default="pending",
|
||||
comment="pending/processing/success/failed/manual",
|
||||
)
|
||||
priority: Mapped[int] = mapped_column(default=100, comment="值越小越优先")
|
||||
ocr_result: Mapped[dict | None] = mapped_column(JSONB, nullable=True)
|
||||
error_message: Mapped[str | None] = mapped_column(Text, nullable=True)
|
||||
retry_count: Mapped[int] = mapped_column(default=0)
|
||||
max_retries: Mapped[int] = mapped_column(default=3)
|
||||
invoice_pool_id: Mapped[uuid.UUID | None] = mapped_column(
|
||||
UUID(as_uuid=True), ForeignKey("fin_invoice_pool.id"), nullable=True,
|
||||
comment="成功入池后关联的发票 ID",
|
||||
)
|
||||
uploader_id: Mapped[uuid.UUID | None] = mapped_column(
|
||||
UUID(as_uuid=True), ForeignKey("sys_users.id"), nullable=True,
|
||||
)
|
||||
company_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True), ForeignKey("sys_companies.id"), nullable=False, index=True,
|
||||
)
|
||||
inv_type: Mapped[str] = mapped_column(String(30), nullable=False, default="expense")
|
||||
scheduled_after: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now())
|
||||
updated_at: Mapped[datetime] = mapped_column(
|
||||
DateTime, server_default=func.now(), onupdate=func.now()
|
||||
)
|
||||
is_deleted: Mapped[bool] = mapped_column(Boolean, default=False)
|
||||
|
||||
uploader: Mapped["SysUser | None"] = relationship("SysUser", lazy="selectin") # noqa: F821
|
||||
|
||||
Reference in New Issue
Block a user