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:
@@ -12,11 +12,13 @@ from sqlalchemy import (
|
||||
Boolean,
|
||||
DateTime,
|
||||
ForeignKey,
|
||||
Index,
|
||||
Integer,
|
||||
Numeric,
|
||||
SmallInteger,
|
||||
String,
|
||||
Text,
|
||||
UniqueConstraint,
|
||||
func,
|
||||
)
|
||||
from sqlalchemy.dialects.postgresql import UUID
|
||||
@@ -56,8 +58,6 @@ class ProductSku(Base):
|
||||
name: Mapped[str] = mapped_column(String(200), nullable=False)
|
||||
spec: Mapped[str | None] = mapped_column(String(100), nullable=True)
|
||||
standard_price: Mapped[float] = mapped_column(Numeric(12, 2), default=0)
|
||||
stock_qty: Mapped[float] = mapped_column(Numeric(12, 2), default=0)
|
||||
warning_threshold: Mapped[float] = mapped_column(Numeric(12, 2), default=0)
|
||||
unit: Mapped[str] = mapped_column(String(20), default="桶")
|
||||
status: Mapped[int] = mapped_column(SmallInteger, default=1)
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now())
|
||||
@@ -80,9 +80,18 @@ class InventoryFlow(Base):
|
||||
sku_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True), ForeignKey("erp_product_skus.id"), nullable=False
|
||||
)
|
||||
company_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True), ForeignKey("sys_companies.id"), nullable=False, index=True
|
||||
)
|
||||
change_qty: Mapped[float] = mapped_column(Numeric(12, 2), nullable=False)
|
||||
reason: Mapped[str] = mapped_column(String(50), nullable=False)
|
||||
remark: Mapped[str | None] = mapped_column(Text, nullable=True)
|
||||
purchase_unit_price: Mapped[float] = mapped_column(
|
||||
Numeric(12, 2), default=0, comment="入库采购单价"
|
||||
)
|
||||
is_special_zero_cost: Mapped[bool] = mapped_column(
|
||||
Boolean, default=False, comment="特殊零元入库标识,不参与 MWA 计算"
|
||||
)
|
||||
operator_id: Mapped[uuid.UUID | None] = mapped_column(
|
||||
UUID(as_uuid=True), ForeignKey("sys_users.id"), nullable=True
|
||||
)
|
||||
@@ -94,3 +103,34 @@ class InventoryFlow(Base):
|
||||
|
||||
sku: Mapped[ProductSku | None] = relationship("ProductSku", lazy="selectin")
|
||||
operator: Mapped["SysUser | None"] = relationship("SysUser", lazy="selectin") # noqa: F821
|
||||
|
||||
|
||||
class ErpSkuInventory(Base):
|
||||
"""SKU 分公司库存表 —— 同一 SKU 在不同公司有独立库存"""
|
||||
__tablename__ = "erp_sku_inventory"
|
||||
|
||||
id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True), primary_key=True, default=uuid.uuid4
|
||||
)
|
||||
sku_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True), ForeignKey("erp_product_skus.id"), nullable=False
|
||||
)
|
||||
company_id: Mapped[uuid.UUID] = mapped_column(
|
||||
UUID(as_uuid=True), ForeignKey("sys_companies.id"), nullable=False, index=True
|
||||
)
|
||||
stock_qty: Mapped[float] = mapped_column(Numeric(12, 2), default=0)
|
||||
warning_threshold: Mapped[float] = mapped_column(Numeric(12, 2), default=0)
|
||||
mwa_unit_cost: Mapped[float] = mapped_column(
|
||||
Numeric(12, 4), default=0,
|
||||
comment="移动加权均价 (Moving Weighted Average)"
|
||||
)
|
||||
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()
|
||||
)
|
||||
|
||||
__table_args__ = (
|
||||
UniqueConstraint("sku_id", "company_id", name="uq_sku_company"),
|
||||
)
|
||||
|
||||
sku: Mapped[ProductSku | None] = relationship("ProductSku", lazy="selectin")
|
||||
|
||||
Reference in New Issue
Block a user