1
0
forked from erp-dev/erp

feat: stock module

This commit is contained in:
2025-11-04 18:04:27 +08:00
parent 9fde654e2f
commit d88bf367f8
27 changed files with 2238 additions and 561 deletions

View File

@@ -1,5 +1,6 @@
from django.contrib import admin
from . import models
from django.contrib.admin import action
from . import models, services
@admin.register(models.PurchaseOrder)
@@ -24,7 +25,82 @@ class InventoryAdmin(admin.ModelAdmin):
)
search_fields = ('product__name', 'warehouse__name')
list_filter = ('warehouse',)
ordering = ('-updated_at',)
@admin.display(description='颜色')
def product_color(self, obj):
return obj.product.color
@admin.register(models.StockSnapshot)
class StockSnapshotAdmin(admin.ModelAdmin):
list_display = (
'id',
'product__name',
'warehouse__name',
'delta',
'quantity_before',
'quantity_after',
'stock_change_record',
'created_at',
)
search_fields = ('product__name', 'warehouse__name', 'stock_change_record__id')
list_filter = ('stock_change_record__type',)
ordering = ('-created_at', )
def has_add_permission(self, request):
# 禁止通过admin界面添加库存快照
return False
def has_change_permission(self, request, obj = ...):
# 禁止通过admin界面修改库存快照
return False
def has_delete_permission(self, request, obj = ...):
# 禁止通过admin界面删除库存快照
return False
def get_readonly_fields(self, request, obj = ...):
# 所有字段均为只读
return [field.name for field in self.model._meta.fields]
@admin.register(models.StockChangeRecord)
class StockChangeRecordAdmin(admin.ModelAdmin):
list_display = (
'id',
'type',
'product',
'warehouse',
'quantity',
'source_type',
'source_id',
'is_finished',
'finished_at',
'created_by',
'created_at',
)
search_fields = ('product__name', 'warehouse__name', 'source_id')
list_filter = ('type', 'source_type', 'type', 'is_finished', 'created_at')
ordering = ('-created_at', '-updated_at')
readonly_fields = ('created_by', 'is_finished', 'finished_at')
def save_model(self, request, obj: models.StockChangeRecord, form, change):
if not change:
if obj.is_finished is True:
# Prevent setting is_finished to True on creation
obj.is_finished = False
if not obj.created_by:
# 新建记录时,设置创建人
obj.created_by = request.user
return super().save_model(request, obj, form, change)
@action(description='标记选中的库存变动记录为已完成')
def make_selected_stock_changes_completed(self, request, queryset):
if queryset.count() > 1:
self.message_user(request, '一次只能处理一条库存变动记录。', level='error')
return
record = queryset.first()
services.make_stock_change_completed(record)
actions = [make_selected_stock_changes_completed]

View File

@@ -0,0 +1,18 @@
# Generated by Django 5.2.7 on 2025-11-04 05:18
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('basic_info', '0017_product_image'),
('stock', '0018_remove_inventory_unit'),
]
operations = [
migrations.AlterUniqueTogether(
name='inventory',
unique_together={('product', 'warehouse')},
),
]

View File

@@ -0,0 +1,28 @@
# Generated by Django 5.2.7 on 2025-11-04 05:51
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('stock', '0019_alter_inventory_unique_together'),
]
operations = [
migrations.CreateModel(
name='StockChangeRecord',
fields=[
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
('updated_at', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
('id', models.BigAutoField(primary_key=True, serialize=False)),
('type', models.IntegerField(choices=[(1, '入库'), (2, '出库')], verbose_name='变动类型')),
('source_type', models.IntegerField(choices=[(1, '采购'), (2, '销退'), (3, '调入'), (4, '盘盈'), (5, '销售'), (6, '采购退货'), (7, '调出'), (8, '盘亏')], verbose_name='变动来源')),
('remarks', models.TextField(blank=True, null=True, verbose_name='备注')),
],
options={
'verbose_name': '出入库记录',
'verbose_name_plural': '出入库记录',
},
),
]

View File

@@ -0,0 +1,37 @@
# Generated by Django 5.2.7 on 2025-11-04 05:57
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('basic_info', '0017_product_image'),
('stock', '0020_stockchangerecord'),
]
operations = [
migrations.AddField(
model_name='stockchangerecord',
name='is_finished',
field=models.BooleanField(default=False, verbose_name='完成出入库'),
),
migrations.AddField(
model_name='stockchangerecord',
name='product',
field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.PROTECT, related_name='stock_change_records', to='basic_info.product', verbose_name='产品'),
preserve_default=False,
),
migrations.AddField(
model_name='stockchangerecord',
name='source_id',
field=models.BigIntegerField(blank=True, null=True, verbose_name='来源单据ID'),
),
migrations.AddField(
model_name='stockchangerecord',
name='warehouse',
field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.PROTECT, related_name='stock_change_records', to='basic_info.warehouse', verbose_name='仓库'),
preserve_default=False,
),
]

View File

@@ -0,0 +1,25 @@
# Generated by Django 5.2.7 on 2025-11-04 06:05
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('stock', '0021_stockchangerecord_is_finished_and_more'),
]
operations = [
migrations.AddField(
model_name='stockchangerecord',
name='quantity',
field=models.IntegerField(default=1, verbose_name='数量'),
preserve_default=False,
),
migrations.AddField(
model_name='stockchangerecord',
name='unit',
field=models.IntegerField(choices=[(1, ''), (2, ''), (3, '公斤')], default=1, verbose_name='单位'),
preserve_default=False,
),
]

View File

@@ -0,0 +1,18 @@
# Generated by Django 5.2.7 on 2025-11-04 06:21
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('stock', '0022_stockchangerecord_quantity_stockchangerecord_unit'),
]
operations = [
migrations.AddField(
model_name='stockchangerecord',
name='num_of_rolls',
field=models.IntegerField(blank=True, null=True, verbose_name='匹数'),
),
]

View File

@@ -0,0 +1,21 @@
# Generated by Django 5.2.7 on 2025-11-04 06:35
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('stock', '0023_stockchangerecord_num_of_rolls'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.AddField(
model_name='stockchangerecord',
name='created_by',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, verbose_name='创建人'),
),
]

View File

@@ -0,0 +1,21 @@
# Generated by Django 5.2.7 on 2025-11-04 06:35
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('stock', '0024_stockchangerecord_created_by'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.AlterField(
model_name='stockchangerecord',
name='created_by',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, verbose_name='操作人'),
),
]

View File

@@ -0,0 +1,18 @@
# Generated by Django 5.2.7 on 2025-11-04 06:44
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('stock', '0025_alter_stockchangerecord_created_by'),
]
operations = [
migrations.AddField(
model_name='stockchangerecord',
name='finished_at',
field=models.DateTimeField(blank=True, null=True, verbose_name='完成时间'),
),
]

View File

@@ -0,0 +1,23 @@
# Generated by Django 5.2.7 on 2025-11-04 07:09
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('stock', '0026_stockchangerecord_finished_at'),
]
operations = [
migrations.AlterField(
model_name='inventory',
name='num_of_rolls',
field=models.IntegerField(default=1, verbose_name='匹数'),
),
migrations.AlterField(
model_name='stockchangerecord',
name='num_of_rolls',
field=models.IntegerField(default=1, verbose_name='匹数'),
),
]

View File

@@ -0,0 +1,40 @@
# Generated by Django 5.2.7 on 2025-11-04 07:53
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('basic_info', '0017_product_image'),
('stock', '0027_alter_inventory_num_of_rolls_and_more'),
]
operations = [
migrations.CreateModel(
name='StockSnapshot',
fields=[
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
('updated_at', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
('id', models.BigAutoField(primary_key=True, serialize=False)),
('delta', models.IntegerField(verbose_name='库存数量')),
('quantity_before', models.IntegerField(verbose_name='变动前库存数量')),
('quantity_after', models.IntegerField(verbose_name='变动后库存数量')),
('unit', models.IntegerField(choices=[(1, ''), (2, ''), (3, '公斤')], verbose_name='单位')),
('num_of_rolls', models.IntegerField(default=1, verbose_name='匹数')),
('offset_to', models.BigIntegerField(blank=True, null=True, verbose_name='冲抵目标ID')),
('offset_at', models.DateTimeField(blank=True, null=True, verbose_name='冲抵时间')),
('cancelled', models.BooleanField(default=False, verbose_name='已取消')),
('cancelled_at', models.DateTimeField(blank=True, null=True, verbose_name='取消时间')),
('offset_id', models.BigIntegerField(blank=True, null=True, verbose_name='冲抵记录ID')),
('product', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='stock_snapshots', to='basic_info.product', verbose_name='产品')),
('stock_change_record', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='stock_snapshots', to='stock.stockchangerecord', verbose_name='关联的库存变动记录')),
('warehouse', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='stock_snapshots', to='basic_info.warehouse', verbose_name='仓库')),
],
options={
'verbose_name': '库存快照',
'verbose_name_plural': '库存快照',
},
),
]

View File

@@ -0,0 +1,38 @@
# Generated by Django 5.2.7 on 2025-11-04 08:53
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('stock', '0028_stocksnapshot'),
]
operations = [
migrations.AlterField(
model_name='inventory',
name='quantity',
field=models.DecimalField(decimal_places=2, max_digits=10, verbose_name='库存数量'),
),
migrations.AlterField(
model_name='stockchangerecord',
name='quantity',
field=models.DecimalField(decimal_places=2, max_digits=10, verbose_name='数量'),
),
migrations.AlterField(
model_name='stocksnapshot',
name='delta',
field=models.DecimalField(decimal_places=2, max_digits=10, verbose_name='库存数量'),
),
migrations.AlterField(
model_name='stocksnapshot',
name='quantity_after',
field=models.DecimalField(decimal_places=2, max_digits=10, verbose_name='变动后库存数量'),
),
migrations.AlterField(
model_name='stocksnapshot',
name='quantity_before',
field=models.DecimalField(decimal_places=2, max_digits=10, verbose_name='变动前库存数量'),
),
]

View File

@@ -0,0 +1,18 @@
# Generated by Django 5.2.7 on 2025-11-04 09:50
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('stock', '0029_alter_inventory_quantity_and_more'),
]
operations = [
migrations.AlterField(
model_name='stocksnapshot',
name='delta',
field=models.DecimalField(decimal_places=2, max_digits=10, verbose_name='库存变动数量'),
),
]

View File

@@ -1,9 +1,13 @@
from django.db import models
from django.core.exceptions import ValidationError
from flower.common import ModelBase
from basic_info import models as basic_info_models
import decimal
class PurchaseOrder(ModelBase):
"""采购单模型"""
id = models.BigAutoField(primary_key=True)
supplier = models.ForeignKey(basic_info_models.Supplier, on_delete=models.PROTECT, related_name='purchase_orders', verbose_name='供应商')
order_date = models.DateField(verbose_name='订单日期')
@@ -18,7 +22,114 @@ class PurchaseOrder(ModelBase):
verbose_name_plural = '采购单'
class StockChangeSourceEnum(models.IntegerChoices):
"""库存变动来源类型"""
PURCHASE = 1, '采购'
SALES_RETURN = 2, '销退'
TRANSPORT_IN = 3, '调入'
RECHECK_ADD = 4, '盘盈'
SALES = 5, '销售'
PURCHASE_RETURN = 6, '采购退货'
TRANSPORT_OUT = 7, '调出'
RECHECK_REMOVE = 8, '盘亏'
class StockChangeTypeEnum(models.IntegerChoices):
"""库存变动类型"""
ADD = 1, '入库'
REMOVE = 2, '出库'
class StockChangeRecord(ModelBase):
"""库存变动记录模型"""
id = models.BigAutoField(primary_key=True)
type = models.IntegerField(choices=StockChangeTypeEnum.choices, verbose_name='变动类型')
product = models.ForeignKey(
basic_info_models.Product,
on_delete=models.PROTECT,
related_name='stock_change_records',
verbose_name='产品',
)
warehouse = models.ForeignKey(
basic_info_models.WareHouse,
on_delete=models.PROTECT,
related_name='stock_change_records',
verbose_name='仓库',
)
source_type = models.IntegerField(
choices=StockChangeSourceEnum.choices,
verbose_name='变动来源',
)
unit = models.IntegerField(
verbose_name='单位',
choices=basic_info_models.ProductUnitEnum.choices,
)
num_of_rolls = models.IntegerField(
default=1,
verbose_name='匹数',
)
created_by = models.ForeignKey(
'auth.User',
on_delete=models.PROTECT,
null=True,
blank=True,
verbose_name='操作人',
)
quantity = models.DecimalField(max_digits=10, decimal_places=2, verbose_name='数量')
source_id = models.BigIntegerField(null=True, blank=True, verbose_name='来源单据ID')
is_finished = models.BooleanField(default=False, verbose_name='完成出入库')
finished_at = models.DateTimeField(null=True, blank=True, verbose_name='完成时间')
remarks = models.TextField(blank=True, null=True, verbose_name='备注')
def __str__(self):
return f'出入库记录 {self.id} - 仓库:{self.warehouse.name} - 产品: {self.product.name}'
class Meta:
verbose_name = '出入库记录'
verbose_name_plural = '出入库记录'
def clean(self):
if self.type == StockChangeTypeEnum.ADD:
if self.source_type > 4:
raise ValidationError('入库记录的来源类型无效')
elif self.type == StockChangeTypeEnum.REMOVE:
if self.source_type < 5:
raise ValidationError('出库记录的来源类型无效')
def save(self, *args, **kwargs):
self.full_clean()
super().save(*args, **kwargs)
@property
def is_incoming(self) -> bool:
"""判断是否为入库记录"""
return self.type == StockChangeTypeEnum.ADD
@property
def is_outgoing(self) -> bool:
"""判断是否为出库记录"""
return self.type == StockChangeTypeEnum.REMOVE
@property
def delta(self) -> decimal.Decimal:
"""计算库存变动的数量增减"""
# 入库为正,出库为负
if self.type == StockChangeTypeEnum.ADD:
return self.quantity
elif self.type == StockChangeTypeEnum.REMOVE:
return -self.quantity
else:
raise ValueError("未知的库存变动类型")
class Inventory(ModelBase):
"""库存模型"""
id = models.BigAutoField(primary_key=True)
product = models.ForeignKey(
basic_info_models.Product,
@@ -32,8 +143,8 @@ class Inventory(ModelBase):
related_name='inventories',
verbose_name='仓库',
)
quantity = models.IntegerField(verbose_name='库存数量')
num_of_rolls = models.IntegerField(null=True, blank=True, verbose_name='匹数')
quantity = models.DecimalField(max_digits=10, decimal_places=2, verbose_name='库存数量')
num_of_rolls = models.IntegerField(default=1, verbose_name='匹数')
minimum_quantity = models.IntegerField(null=True, blank=True, verbose_name='最低库存量')
spec = models.CharField(max_length=100, blank=True, null=True, verbose_name='规格')
description = models.TextField(blank=True, null=True, verbose_name='备注描述')
@@ -44,3 +155,70 @@ class Inventory(ModelBase):
class Meta:
verbose_name = '库存'
verbose_name_plural = '库存'
unique_together = ('product', 'warehouse')
class StockSnapshot(ModelBase):
"""库存变动快照模型"""
id = models.BigAutoField(primary_key=True)
product = models.ForeignKey(
basic_info_models.Product,
on_delete=models.PROTECT,
related_name='stock_snapshots',
verbose_name='产品',
)
warehouse = models.ForeignKey(
basic_info_models.WareHouse,
on_delete=models.PROTECT,
related_name='stock_snapshots',
verbose_name='仓库',
)
delta = models.DecimalField(max_digits=10, decimal_places=2, verbose_name='库存变动数量')
quantity_before = models.DecimalField(max_digits=10, decimal_places=2, verbose_name='变动前库存数量')
quantity_after = models.DecimalField(max_digits=10, decimal_places=2, verbose_name='变动后库存数量')
stock_change_record = models.ForeignKey(
StockChangeRecord,
on_delete=models.PROTECT,
related_name='stock_snapshots',
verbose_name='关联的库存变动记录',
)
unit = models.IntegerField(
verbose_name='单位',
choices=basic_info_models.ProductUnitEnum.choices,
)
num_of_rolls = models.IntegerField(default=1, verbose_name='匹数')
# offset_to表示该快照被冲抵到的目标快照ID
# 当offset_to不为空时cancelled不可为True 及 offset_id只能为空
# 因为该记录是冲抵记录无法再取消,也不可能冲抵的同时被冲抵
offset_to = models.BigIntegerField(
null=True,
blank=True,
verbose_name='冲抵目标ID',
)
offset_at = models.DateTimeField(
null=True,
blank=True,
verbose_name='冲抵时间',
)
# 当cancelled为True时offset_id不可为空表示该快照已被冲抵
cancelled = models.BooleanField(default=False, verbose_name='已取消')
cancelled_at = models.DateTimeField(
null=True,
blank=True,
verbose_name='取消时间',
)
offset_id = models.BigIntegerField(
null=True,
blank=True,
verbose_name='冲抵记录ID',
)
def __str__(self):
return f'库存快照 {self.id} - 日期: {self.snapshot_date} - 产品: {self.product.name}'
class Meta:
verbose_name = '库存快照'
verbose_name_plural = '库存快照'

104
stock/services.py Normal file
View File

@@ -0,0 +1,104 @@
from . import models
from django.utils import timezone
import logging
logger = logging.getLogger(__name__)
def find_inventory(product_id: int, warehouse_id: int) -> models.Inventory | None:
"""根据产品ID和仓库ID查找库存记录"""
try:
inventory = models.Inventory.objects.get(
product_id=product_id,
warehouse_id=warehouse_id,
)
return inventory
except models.Inventory.DoesNotExist:
return None
def create_stock_snapshot(stock_change_record: models.StockChangeRecord, inventory: models.Inventory) -> models.StockSnapshot:
"""创建库存快照记录"""
if not stock_change_record or stock_change_record.id is None:
raise ValueError("无效的库存变动记录")
delta = stock_change_record.delta
# 必须在库存变动发生后创建快照
snapshot = models.StockSnapshot(
product_id=inventory.product_id,
warehouse_id=inventory.warehouse_id,
delta=delta,
quantity_before=inventory.quantity - delta,
quantity_after=inventory.quantity,
stock_change_record_id=stock_change_record.id,
unit=stock_change_record.unit,
num_of_rolls=stock_change_record.num_of_rolls or 1,
)
snapshot.save()
logger.info(
f'创建库存快照库存ID: {inventory.id}, 数量: {inventory.quantity}, '
f'匹数: {inventory.num_of_rolls}'
)
return snapshot
def make_stock_change_completed(stock_change_record: models.StockChangeRecord) -> bool:
"""处理库存变动完成后的逻辑"""
# TODO: 这里可以添加事务处理以确保数据一致性
if not stock_change_record or stock_change_record.id is None:
# 无效的库存变动记录
return False
if stock_change_record.is_finished:
return True
inventory_record = find_inventory(
product_id=stock_change_record.product_id,
warehouse_id=stock_change_record.warehouse_id,
)
if not inventory_record:
logger.info(
f'库存记录未找到产品ID: {stock_change_record.product_id}, '
f'仓库ID: {stock_change_record.warehouse_id},正在创建新的库存记录。'
)
# 如果没有找到库存记录且为入库,则创建一个新的库存记录
inventory_record = models.Inventory(
product_id=stock_change_record.product_id,
warehouse_id=stock_change_record.warehouse_id,
quantity=stock_change_record.delta,
num_of_rolls=stock_change_record.num_of_rolls or 0,
minimum_quantity=0,
)
logger.info(
f'创建新的库存记录产品ID: {inventory_record.product_id}, '
f'仓库ID: {inventory_record.warehouse_id}, 数量: {inventory_record.quantity},'
f'匹数: {inventory_record.num_of_rolls}'
)
else:
# 更新现有库存记录
inventory_record.quantity += stock_change_record.delta
if stock_change_record.num_of_rolls:
inventory_record.num_of_rolls += stock_change_record.num_of_rolls
logger.info(
f'更新库存记录 {inventory_record.id},新数量: {inventory_record.quantity}, '
f'新匹数: {inventory_record.num_of_rolls}'
)
inventory_record.save()
create_stock_snapshot(stock_change_record, inventory_record)
stock_change_record.is_finished = True
stock_change_record.finished_at = timezone.now()
stock_change_record.save()
logger.info(
f'库存变动记录 {stock_change_record.id} 标记为已完成。'
)
return True