zuowei/erpnew
1
0
Fork 0
forked from erp-dev/erp
Code Pull Requests Activity

feat: added area field into shipments model

Browse Source
This commit is contained in:
colaftc
2026-01-16 17:58:17 +08:00
parent 2e0b7dc335
commit c73014f69c
7 changed files with 123 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
api_v1/views/shipment/serializers.py
View File

@@ -27,7 +27,7 @@ class ShipmentSerializer(serializers.ModelSerializer):
model = Shipment
fields = [
'id', 'merchant_id', 'merchant_name',
'customer', 'customer_name', 'shipment_date', 'remark',
'customer', 'customer_name', 'shipment_date', 'area', 'remark',
'status', 'status_display',
'external_id',
'cancelled_at', 'cancelled_by_id', 'cancelled_by_name',
@@ -114,6 +114,7 @@ class ShipmentCreateNormalSerializer(serializers.Serializer):
"""
customer = serializers.IntegerField(help_text='客户ID')
shipment_date = serializers.DateField(help_text='出货日期')
area = serializers.CharField(max_length=30, required=False, default='', allow_blank=True, help_text='出货地区（可选）')
remark = serializers.CharField(required=False, default='', allow_blank=True, help_text='备注')
sales_items = serializers.ListField(
child=serializers.IntegerField(),
@@ -144,6 +145,7 @@ class ShipmentCreateExternalSerializer(serializers.Serializer):
"""
customer = serializers.IntegerField(help_text='客户ID')
shipment_date = serializers.DateField(help_text='出货日期')
area = serializers.CharField(max_length=30, required=False, default='', allow_blank=True, help_text='出货地区（可选）')
remark = serializers.CharField(required=False, default='', allow_blank=True, help_text='备注')
external_id = serializers.CharField(max_length=120, help_text='外部订单号（必填）')
external_finished_products = serializers.ListField(
@@ -164,6 +166,19 @@ class ShipmentCreateExternalSerializer(serializers.Serializer):
return value
class ShipmentUpdateSerializer(serializers.Serializer):
"""
出货单更新序列化器（PATCH/PUT）
说明：本次新增字段 area，需要保证更新入口可写入并回显。
"""
customer = serializers.IntegerField(required=False, help_text='客户ID（可选）')
shipment_date = serializers.DateField(required=False, help_text='出货日期（可选）')
area = serializers.CharField(max_length=30, required=False, allow_blank=True, help_text='出货地区（可选）')
remark = serializers.CharField(required=False, allow_blank=True, help_text='备注（可选）')
external_id = serializers.CharField(max_length=120, required=False, allow_blank=True, allow_null=True, help_text='外部订单号（可选）')
class SalesItemSerializer(serializers.Serializer):
"""
销售品序列化器（只读）