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

feat: shipment_delivery

Browse Source
This commit is contained in:
colaftc
2026-04-03 16:55:22 +08:00
parent 371cd796e7
commit 76b30cf4f4
16 changed files with 2513 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api_v1/views/shipment/__init__.py
View File

@@ -8,6 +8,11 @@ from .views import (
SalesItemByCustomerView,
SalesItemByPrintingOrderView,
SalesItemCreateView,
ShipmentDeliveryBindShipmentsView,
ShipmentDeliveryDetailView,
ShipmentDeliveryListCreateView,
ShipmentDeliveryCancelView,
ShipmentDeliveryStatusUpdateView,
ShipmentSalesItemCustomerListView,
ShipmentListCreateView,
ShipmentDetailView,
@@ -19,6 +24,11 @@ __all__ = [
'SalesItemByCustomerView',
'SalesItemByPrintingOrderView',
'SalesItemCreateView',
'ShipmentDeliveryBindShipmentsView',
'ShipmentDeliveryDetailView',
'ShipmentDeliveryListCreateView',
'ShipmentDeliveryCancelView',
'ShipmentDeliveryStatusUpdateView',
'ShipmentSalesItemCustomerListView',
'ShipmentListCreateView',
'ShipmentDetailView',

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

@@ -4,7 +4,61 @@ Shipment API 序列化器
from rest_framework import serializers
from shipment.models import ExternalFinishedProduct, SalesItem, Shipment
from shipment.models import (
ExternalFinishedProduct,
SalesItem,
Shipment,
ShipmentDelivery,
ShipmentDeliveryStatus,
)
def _build_nested_sales_item_context(items):
customer_ids = {item.customer_id for item in items if item.customer_id}
printing_job_ids = {item.printing_job_id for item in items if item.printing_job_id}
customer_name_map = {}
if customer_ids:
from basic_info.models import Customer
customer_name_map = dict(
Customer.objects.filter(id__in=customer_ids).values_list("id", "name")
)
printing_order_map = {}
external_order_id_map = {}
product_image_map = {}
if printing_job_ids:
from printing.models import PrintingJob
printing_jobs = list(
PrintingJob.objects.filter(id__in=printing_job_ids).select_related(
"printing_order", "product"
)
)
printing_order_map = {job.id: job.printing_order_id for job in printing_jobs}
external_order_id_map = {
job.id: getattr(job.printing_order, "external_order_id", None)
for job in printing_jobs
}
for job in printing_jobs:
if not getattr(job, "product", None):
product_image_map[job.id] = None
continue
primary_url = job.product.get_primary_image_url()
if primary_url:
product_image_map[job.id] = primary_url
elif job.product.image:
product_image_map[job.id] = job.product.image.url
else:
product_image_map[job.id] = None
return {
"customer_name_map": customer_name_map,
"printing_order_map": printing_order_map,
"external_order_id_map": external_order_id_map,
"product_image_map": product_image_map,
}
class ShipmentSerializer(serializers.ModelSerializer):
@@ -42,6 +96,9 @@ class ShipmentSerializer(serializers.ModelSerializer):
"customer",
"customer_name",
"shipment_date",
"address",
"contact_name",
"contact_phone",
"area",
"remark",
"status",
@@ -100,7 +157,13 @@ class ShipmentSerializer(serializers.ModelSerializer):
# 优先使用 prefetch 的 related manager；兜底为 none()
rel = getattr(obj, "items", None)
items = list(rel.all()) if rel is not None else []
return SalesItemSerializer(items, many=True).data
serializer_context = dict(self.context)
serializer_context.update(_build_nested_sales_item_context(items))
return SalesItemDetailSerializer(
items,
many=True,
context=serializer_context,
).data
def get_external_finished_products(self, obj):
"""
@@ -150,6 +213,27 @@ class ShipmentCreateNormalSerializer(serializers.Serializer):
customer = serializers.IntegerField(help_text="客户ID")
shipment_date = serializers.DateField(help_text="出货日期")
address = serializers.CharField(
max_length=255,
required=False,
default="",
allow_blank=True,
help_text="地址（可选）",
)
contact_name = serializers.CharField(
max_length=100,
required=False,
default="",
allow_blank=True,
help_text="联系人（可选）",
)
contact_phone = serializers.CharField(
max_length=50,
required=False,
default="",
allow_blank=True,
help_text="联系电话（可选）",
)
area = serializers.CharField(
max_length=30,
required=False,
@@ -194,6 +278,27 @@ class ShipmentCreateExternalSerializer(serializers.Serializer):
customer = serializers.IntegerField(help_text="客户ID")
shipment_date = serializers.DateField(help_text="出货日期")
address = serializers.CharField(
max_length=255,
required=False,
default="",
allow_blank=True,
help_text="地址（可选）",
)
contact_name = serializers.CharField(
max_length=100,
required=False,
default="",
allow_blank=True,
help_text="联系人（可选）",
)
contact_phone = serializers.CharField(
max_length=50,
required=False,
default="",
allow_blank=True,
help_text="联系电话（可选）",
)
area = serializers.CharField(
max_length=30,
required=False,
@@ -232,6 +337,15 @@ class ShipmentUpdateSerializer(serializers.Serializer):
customer = serializers.IntegerField(required=False, help_text="客户ID（可选）")
shipment_date = serializers.DateField(required=False, help_text="出货日期（可选）")
address = serializers.CharField(
max_length=255, required=False, allow_blank=True, help_text="地址（可选）"
)
contact_name = serializers.CharField(
max_length=100, required=False, allow_blank=True, help_text="联系人（可选）"
)
contact_phone = serializers.CharField(
max_length=50, required=False, allow_blank=True, help_text="联系电话（可选）"
)
area = serializers.CharField(
max_length=30, required=False, allow_blank=True, help_text="出货地区（可选）"
)
@@ -360,6 +474,194 @@ class ShipmentSalesItemCustomerSerializer(serializers.Serializer):
unshipped_sales_items_count = serializers.IntegerField(read_only=True)
class ShipmentDeliveryShipmentSummarySerializer(serializers.ModelSerializer):
customer_name = serializers.CharField(source="customer.name", read_only=True)
status_display = serializers.CharField(source="get_status_display", read_only=True)
class Meta:
model = Shipment
fields = [
"id",
"customer",
"customer_name",
"shipment_date",
"status",
"status_display",
"external_id",
]
read_only_fields = fields
class ShipmentDeliverySerializer(serializers.ModelSerializer):
status_display = serializers.CharField(source="get_status_display", read_only=True)
merchant_id = serializers.IntegerField(source="merchant.id", read_only=True)
merchant_name = serializers.CharField(source="merchant.name", read_only=True)
created_by_id = serializers.IntegerField(
source="created_by.id", read_only=True, allow_null=True
)
created_by_name = serializers.SerializerMethodField()
operator_id = serializers.IntegerField(
source="operator.id", read_only=True, allow_null=True
)
operator_name = serializers.CharField(source="operator.name", read_only=True, allow_null=True)
cancelled_by_id = serializers.IntegerField(
source="cancelled_by.id", read_only=True, allow_null=True
)
cancelled_by_name = serializers.SerializerMethodField()
shipments_count = serializers.SerializerMethodField()
shipments = serializers.SerializerMethodField()
class Meta:
model = ShipmentDelivery
fields = [
"id",
"merchant_id",
"merchant_name",
"driver_name",
"vehicle_trip",
"contact_phone",
"vehicle_capacity",
"remark",
"internal_remark",
"status",
"status_display",
"started_at",
"delivered_at",
"cancelled_at",
"shipments_count",
"shipments",
"created_by_id",
"created_by_name",
"operator_id",
"operator_name",
"cancelled_by_id",
"cancelled_by_name",
"created_at",
"updated_at",
]
read_only_fields = fields
def get_created_by_name(self, obj):
if obj.created_by:
employee = getattr(obj.created_by, "employee", None)
if employee:
return employee.name
return obj.created_by.username
return None
def get_cancelled_by_name(self, obj):
if obj.cancelled_by:
employee = getattr(obj.cancelled_by, "employee", None)
if employee:
return employee.name
return obj.cancelled_by.username
return None
def get_shipments_count(self, obj):
return obj.shipments.count()
def get_shipments(self, obj):
return ShipmentDeliveryShipmentSummarySerializer(
obj.shipments.order_by("id"),
many=True,
).data
class ShipmentDeliveryCreateSerializer(serializers.Serializer):
driver_name = serializers.CharField(max_length=100, help_text="司机名")
vehicle_trip = serializers.CharField(max_length=100, help_text="车次")
contact_phone = serializers.CharField(
max_length=50,
required=False,
default="",
allow_blank=True,
help_text="联系电话（可选）",
)
vehicle_capacity = serializers.CharField(
max_length=100,
required=False,
default="",
allow_blank=True,
help_text="车辆容量（可选）",
)
remark = serializers.CharField(
max_length=200,
required=False,
default="",
allow_blank=True,
help_text="备注（可选）",
)
internal_remark = serializers.CharField(
max_length=200,
required=False,
default="",
allow_blank=True,
help_text="内部备注（可选）",
)
shipments = serializers.ListField(
child=serializers.IntegerField(),
required=False,
default=list,
help_text="要关联的出货单ID列表",
)
def validate_shipments(self, value):
return list(dict.fromkeys(value)) if value else []
class ShipmentDeliveryUpdateSerializer(serializers.Serializer):
driver_name = serializers.CharField(
max_length=100, required=False, allow_blank=False, help_text="司机名（可选）"
)
vehicle_trip = serializers.CharField(
max_length=100, required=False, allow_blank=False, help_text="车次（可选）"
)
contact_phone = serializers.CharField(
max_length=50, required=False, allow_blank=True, help_text="联系电话（可选）"
)
vehicle_capacity = serializers.CharField(
max_length=100, required=False, allow_blank=True, help_text="车辆容量（可选）"
)
remark = serializers.CharField(
max_length=200, required=False, allow_blank=True, help_text="备注（可选）"
)
internal_remark = serializers.CharField(
max_length=200, required=False, allow_blank=True, help_text="内部备注（可选）"
)
shipments = serializers.ListField(
child=serializers.IntegerField(),
required=False,
help_text="要绑定的出货单ID列表（可选，传入即视为替换）",
)
def validate_shipments(self, value):
return list(dict.fromkeys(value)) if value else []
class ShipmentDeliveryStatusUpdateSerializer(serializers.Serializer):
status = serializers.ChoiceField(
choices=[
(ShipmentDeliveryStatus.PENDING, ShipmentDeliveryStatus.PENDING.label),
(ShipmentDeliveryStatus.IN_TRANSIT, ShipmentDeliveryStatus.IN_TRANSIT.label),
(ShipmentDeliveryStatus.DELIVERED, ShipmentDeliveryStatus.DELIVERED.label),
],
help_text="送货单状态（1=待送货, 2=送货中, 3=已送达）",
)
class ShipmentDeliveryBindShipmentsSerializer(serializers.Serializer):
shipments = serializers.ListField(
child=serializers.IntegerField(),
required=True,
help_text="要追加绑定到当前送货单的出货单ID列表",
)
def validate_shipments(self, value):
if not value:
raise serializers.ValidationError("shipments 不能为空")
return list(dict.fromkeys(value))
class SalesItemCreateSerializer(serializers.Serializer):
"""
销售品创建序列化器

603
api_v1/views/shipment/test_api.py
View File

@@ -6,6 +6,7 @@ from decimal import Decimal
from django.test import TestCase
from django.conf import settings
from django.contrib.auth.models import Permission
from rest_framework.test import APIClient, APITestCase
from rest_framework import status
from django.contrib.auth import get_user_model
@@ -935,6 +936,9 @@ class ShipmentCreateAPITestCase(TestCase):
data = {
"customer": self.customer.id,
"shipment_date": "2026-01-14",
"address": "杭州市测试路 1 号",
"contact_name": "张三",
"contact_phone": "13800138000",
"area": "华东",
"remark": "测试备注",
"sales_items": [self.sales_item1.id, self.sales_item2.id],
@@ -950,6 +954,9 @@ class ShipmentCreateAPITestCase(TestCase):
self.assertEqual(result["customer"], self.customer.id)
self.assertEqual(result["customer_name"], self.customer.name)
self.assertEqual(result["shipment_date"], "2026-01-14")
self.assertEqual(result["address"], "杭州市测试路 1 号")
self.assertEqual(result["contact_name"], "张三")
self.assertEqual(result["contact_phone"], "13800138000")
self.assertEqual(result.get("area", ""), "华东")
self.assertEqual(result["remark"], "测试备注")
self.assertEqual(result["status"], shipment_models.ShipmentStatus.DRAFT)
@@ -1106,6 +1113,9 @@ class ShipmentExternalCreateAPITestCase(TestCase):
data = {
"customer": self.customer.id,
"shipment_date": "2026-01-14",
"address": "绍兴市仓库 2 号",
"contact_name": "李四",
"contact_phone": "13900139000",
"area": "华南",
"remark": "external 备注",
"external_id": "EXT-ORDER-001",
@@ -1123,6 +1133,9 @@ class ShipmentExternalCreateAPITestCase(TestCase):
self.assertEqual(result["customer"], self.customer.id)
self.assertEqual(result["external_id"], "EXT-ORDER-001")
self.assertEqual(result["address"], "绍兴市仓库 2 号")
self.assertEqual(result["contact_name"], "李四")
self.assertEqual(result["contact_phone"], "13900139000")
self.assertEqual(result.get("area", ""), "华南")
self.assertEqual(result["status"], shipment_models.ShipmentStatus.DRAFT)
self.assertEqual(result["status_display"], "草稿(未发布)")
@@ -1234,6 +1247,38 @@ class ShipmentQueryAPITestCase(TestCase):
merchant=self.merchant2, name="客户2", mobile="13900139011", area="B"
)
self.category1 = basic_models.ProductCategory.objects.create(
merchant=self.merchant1,
name="分类1",
)
self.product1 = basic_models.Product.objects.create(
merchant=self.merchant1,
category=self.category1,
name="产品1",
human_id="SHIPMENTQ001",
mdy_image_url="https://example.com/shipment-list-image.jpg",
)
self.state1 = stateflow_models.State.objects.create(name="查询状态")
self.process1 = stateflow_models.Process.objects.create(name="查询流程")
self.process1.replace_nodes([self.state1])
self.printing_order1 = printing_models.PrintingOrder.objects.create(
merchant=self.merchant1,
customer=self.customer1,
fabric="查询面料",
width="150cm",
process=self.process1,
created_by=self.user1,
external_order_id="QUERY-PO-001",
)
self.printing_job1 = printing_models.PrintingJob.objects.create(
merchant=self.merchant1,
printing_order=self.printing_order1,
product=self.product1,
quantity=20,
unit="米",
created_by=self.user1,
)
self.shipment1 = shipment_models.Shipment.objects.create(
merchant=self.merchant1,
customer=self.customer1,
@@ -1250,6 +1295,16 @@ class ShipmentQueryAPITestCase(TestCase):
remark="s2",
area="B1",
)
self.sales_item1 = shipment_models.SalesItem.objects.create(
merchant=self.merchant1,
shipment=self.shipment1,
name="列表销售品",
quantity=Decimal("12.00"),
unit=shipment_models.UnitChoices.METER,
printing_job_id=self.printing_job1.id,
customer_id=self.customer1.id,
created_by=self.user1,
)
self.client.force_authenticate(user=self.user1)
@@ -1267,12 +1322,16 @@ class ShipmentQueryAPITestCase(TestCase):
# 关键：列表序列化器必须稳定输出明细数组字段（即使为空）
item = next(it for it in data["results"] if it["id"] == self.shipment1.id)
self.assertIn("address", item)
self.assertIn("contact_name", item)
self.assertIn("contact_phone", item)
self.assertIn("area", item)
self.assertEqual(item["area"], "A1")
self.assertEqual(item["status"], shipment_models.ShipmentStatus.DRAFT)
self.assertEqual(item["status_display"], "草稿(未发布)")
self.assertIn("sales_items", item)
self.assertIsInstance(item["sales_items"], list)
self.assertEqual(item["sales_items"][0]["product_image_url"], "https://example.com/shipment-list-image.jpg")
self.assertIn("external_finished_products", item)
self.assertIsInstance(item["external_finished_products"], list)
@@ -1280,6 +1339,9 @@ class ShipmentQueryAPITestCase(TestCase):
resp = self.client.get(f"/api/v1/shipment/shipments/{self.shipment1.id}/")
self.assertEqual(resp.status_code, status.HTTP_200_OK)
result = resp.json()
self.assertIn("address", result)
self.assertIn("contact_name", result)
self.assertIn("contact_phone", result)
self.assertEqual(result["id"], self.shipment1.id)
self.assertIn("area", result)
self.assertEqual(result["area"], "A1")
@@ -1287,6 +1349,7 @@ class ShipmentQueryAPITestCase(TestCase):
self.assertEqual(result["status_display"], "草稿(未发布)")
self.assertIn("sales_items", result)
self.assertIsInstance(result["sales_items"], list)
self.assertEqual(result["sales_items"][0]["product_image_url"], "https://example.com/shipment-list-image.jpg")
self.assertIn("external_finished_products", result)
self.assertIsInstance(result["external_finished_products"], list)
@@ -1296,16 +1359,27 @@ class ShipmentQueryAPITestCase(TestCase):
"""
resp = self.client.patch(
f"/api/v1/shipment/shipments/{self.shipment1.id}/",
data={"area": "更新地区"},
data={
"area": "更新地区",
"address": "宁波市滨海路 9 号",
"contact_name": "王五",
"contact_phone": "13700137000",
},
format="json",
)
self.assertEqual(resp.status_code, status.HTTP_200_OK)
result = resp.json()
self.assertEqual(result["id"], self.shipment1.id)
self.assertEqual(result.get("area", ""), "更新地区")
self.assertEqual(result["address"], "宁波市滨海路 9 号")
self.assertEqual(result["contact_name"], "王五")
self.assertEqual(result["contact_phone"], "13700137000")
self.shipment1.refresh_from_db()
self.assertEqual(getattr(self.shipment1, "area", ""), "更新地区")
self.assertEqual(self.shipment1.address, "宁波市滨海路 9 号")
self.assertEqual(self.shipment1.contact_name, "王五")
self.assertEqual(self.shipment1.contact_phone, "13700137000")
def test_patch_shipment_rejects_non_draft(self):
"""
@@ -1773,3 +1847,530 @@ class SalesItemCreateAPITestCase(APITestCase):
resp = self.client.post("/api/v1/shipment/sales-items/", data, format="json")
self.assertEqual(resp.status_code, status.HTTP_401_UNAUTHORIZED)
class ShipmentDeliveryAPITestCase(APITestCase):
def setUp(self):
self.client = APIClient()
self.merchant = basic_models.Merchant.objects.create(
name="送货测试商户", type=basic_models.MerchantTypeEnum.FACTORY
)
self.other_merchant = basic_models.Merchant.objects.create(
name="其它送货商户", type=basic_models.MerchantTypeEnum.FACTORY
)
self.user = User.objects.create_user(
username="shipment_delivery_user",
password="testpass123",
)
self.employee = basic_models.Employee.objects.create(
sys_user=self.user,
merchant=self.merchant,
name="送货测试员工",
mobile="13800138111",
status=basic_models.EmployeeStatusEnum.ACTIVE,
)
self.customer = basic_models.Customer.objects.create(
merchant=self.merchant,
name="送货客户A",
mobile="13900139111",
area="杭州",
)
self.other_customer = basic_models.Customer.objects.create(
merchant=self.other_merchant,
name="送货客户B",
mobile="13900139112",
area="绍兴",
)
self.shipment1 = shipment_models.Shipment.objects.create(
merchant=self.merchant,
customer=self.customer,
shipment_date="2026-04-03",
created_by=self.user,
)
self.shipment2 = shipment_models.Shipment.objects.create(
merchant=self.merchant,
customer=self.customer,
shipment_date="2026-04-04",
created_by=self.user,
external_id="EXT-SHP-001",
)
self.shipment3 = shipment_models.Shipment.objects.create(
merchant=self.merchant,
customer=self.customer,
shipment_date="2026-04-05",
created_by=self.user,
)
self.foreign_shipment = shipment_models.Shipment.objects.create(
merchant=self.other_merchant,
customer=self.other_customer,
shipment_date="2026-04-06",
created_by=self.user,
)
self.other_delivery = shipment_models.ShipmentDelivery.objects.create(
merchant=self.merchant,
driver_name="旧司机",
vehicle_trip="TRIP-OLD",
created_by=self.user,
)
self.shipment3.delivery = self.other_delivery
self.shipment3.save(update_fields=["delivery", "updated_at"])
self.client.force_authenticate(user=self.user)
from shipment.services import modify_status
modify_status(
self.shipment1,
target_status=shipment_models.ShipmentStatus.PUBLISHED,
operator=self.user,
)
modify_status(
self.shipment1,
target_status=shipment_models.ShipmentStatus.APPROVED,
operator=self.user,
approved_by=self.user,
)
modify_status(
self.shipment2,
target_status=shipment_models.ShipmentStatus.PUBLISHED,
operator=self.user,
)
modify_status(
self.shipment2,
target_status=shipment_models.ShipmentStatus.APPROVED,
operator=self.user,
approved_by=self.user,
)
def test_create_delivery_with_shipments(self):
resp = self.client.post(
"/api/v1/shipment/deliveries/",
{
"driver_name": "张司机",
"vehicle_trip": "KD-001",
"contact_phone": "13800138000",
"vehicle_capacity": "9.6米厢车",
"remark": "先装车",
"internal_remark": "注意对账",
"shipments": [self.shipment1.id, self.shipment2.id],
},
format="json",
)
self.assertEqual(resp.status_code, status.HTTP_201_CREATED)
data = resp.json()
self.assertEqual(data["driver_name"], "张司机")
self.assertEqual(data["vehicle_trip"], "KD-001")
self.assertEqual(data["contact_phone"], "13800138000")
self.assertEqual(data["vehicle_capacity"], "9.6米厢车")
self.assertEqual(data["remark"], "先装车")
self.assertEqual(data["internal_remark"], "注意对账")
self.assertEqual(data["status"], shipment_models.ShipmentDeliveryStatus.PENDING)
self.assertEqual(data["shipments_count"], 2)
self.assertEqual(data["merchant_id"], self.merchant.id)
self.assertEqual(data["created_by_id"], self.user.id)
self.assertEqual(data["operator_id"], self.employee.id)
self.assertEqual(data["operator_name"], self.employee.name)
self.shipment1.refresh_from_db()
self.shipment2.refresh_from_db()
self.assertIsNotNone(self.shipment1.delivery_id)
self.assertEqual(self.shipment1.delivery_id, self.shipment2.delivery_id)
def test_create_delivery_rejects_shipment_bound_to_other_delivery(self):
resp = self.client.post(
"/api/v1/shipment/deliveries/",
{
"driver_name": "张司机",
"vehicle_trip": "KD-002",
"shipments": [self.shipment3.id],
},
format="json",
)
self.assertEqual(resp.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn("已关联到其他送货单", resp.json()["detail"])
def test_create_delivery_rejects_non_approved_shipment(self):
unapproved_shipment = shipment_models.Shipment.objects.create(
merchant=self.merchant,
customer=self.customer,
shipment_date="2026-04-07",
created_by=self.user,
)
resp = self.client.post(
"/api/v1/shipment/deliveries/",
{
"driver_name": "张司机",
"vehicle_trip": "KD-002-A",
"shipments": [unapproved_shipment.id],
},
format="json",
)
self.assertEqual(resp.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn("未处于已审核状态", resp.json()["detail"])
def test_create_delivery_rejects_foreign_merchant_shipment(self):
resp = self.client.post(
"/api/v1/shipment/deliveries/",
{
"driver_name": "张司机",
"vehicle_trip": "KD-003",
"shipments": [self.foreign_shipment.id],
},
format="json",
)
self.assertEqual(resp.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn("不属于当前商户", resp.json()["detail"])
def test_list_deliveries_supports_status_driver_and_vehicle_filters(self):
delivery = shipment_models.ShipmentDelivery.objects.create(
merchant=self.merchant,
driver_name="李司机",
vehicle_trip="TRIP-001",
status=shipment_models.ShipmentDeliveryStatus.IN_TRANSIT,
created_by=self.user,
)
shipment_models.ShipmentDelivery.objects.create(
merchant=self.merchant,
driver_name="王司机",
vehicle_trip="TRIP-002",
status=shipment_models.ShipmentDeliveryStatus.PENDING,
created_by=self.user,
)
resp = self.client.get(
f"/api/v1/shipment/deliveries/?status={shipment_models.ShipmentDeliveryStatus.IN_TRANSIT}&driver_name=李&vehicle_trip=001"
)
self.assertEqual(resp.status_code, status.HTTP_200_OK)
data = resp.json()
self.assertEqual(data["count"], 1)
self.assertEqual(data["results"][0]["id"], delivery.id)
def test_detail_returns_nested_shipment_summaries(self):
delivery = shipment_models.ShipmentDelivery.objects.create(
merchant=self.merchant,
driver_name="张司机",
vehicle_trip="KD-004",
created_by=self.user,
)
self.shipment1.delivery = delivery
self.shipment1.save(update_fields=["delivery", "updated_at"])
self.shipment2.delivery = delivery
self.shipment2.save(update_fields=["delivery", "updated_at"])
resp = self.client.get(f"/api/v1/shipment/deliveries/{delivery.id}/")
self.assertEqual(resp.status_code, status.HTTP_200_OK)
data = resp.json()
self.assertEqual(data["shipments_count"], 2)
shipment_ids = [item["id"] for item in data["shipments"]]
self.assertEqual(shipment_ids, [self.shipment1.id, self.shipment2.id])
def test_patch_delivery_updates_fields_and_replaces_shipments(self):
delivery = shipment_models.ShipmentDelivery.objects.create(
merchant=self.merchant,
driver_name="张司机",
vehicle_trip="KD-005",
created_by=self.user,
)
self.shipment1.delivery = delivery
self.shipment1.save(update_fields=["delivery", "updated_at"])
resp = self.client.patch(
f"/api/v1/shipment/deliveries/{delivery.id}/",
{
"driver_name": "李司机",
"vehicle_trip": "KD-005-B",
"contact_phone": "13700137000",
"vehicle_capacity": "13米高栏",
"remark": "改派车辆",
"internal_remark": "已电话确认",
"shipments": [self.shipment2.id],
},
format="json",
)
self.assertEqual(resp.status_code, status.HTTP_200_OK)
data = resp.json()
self.assertEqual(data["driver_name"], "李司机")
self.assertEqual(data["vehicle_trip"], "KD-005-B")
self.assertEqual(data["contact_phone"], "13700137000")
self.assertEqual(data["vehicle_capacity"], "13米高栏")
self.assertEqual(data["remark"], "改派车辆")
self.assertEqual(data["internal_remark"], "已电话确认")
self.assertEqual(data["operator_id"], self.employee.id)
self.assertEqual(data["shipments_count"], 1)
self.assertEqual(data["shipments"][0]["id"], self.shipment2.id)
self.shipment1.refresh_from_db()
self.shipment2.refresh_from_db()
self.assertIsNone(self.shipment1.delivery_id)
self.assertEqual(self.shipment2.delivery_id, delivery.id)
def test_modify_delivery_status_sets_timestamps(self):
delivery = shipment_models.ShipmentDelivery.objects.create(
merchant=self.merchant,
driver_name="张司机",
vehicle_trip="KD-006",
created_by=self.user,
)
resp = self.client.post(
f"/api/v1/shipment/deliveries/{delivery.id}/status/",
{"status": shipment_models.ShipmentDeliveryStatus.IN_TRANSIT},
format="json",
)
self.assertEqual(resp.status_code, status.HTTP_200_OK)
delivery.refresh_from_db()
self.assertEqual(
delivery.status, shipment_models.ShipmentDeliveryStatus.IN_TRANSIT
)
self.assertIsNotNone(delivery.started_at)
self.assertIsNone(delivery.delivered_at)
self.assertEqual(delivery.operator_id, self.employee.id)
resp = self.client.post(
f"/api/v1/shipment/deliveries/{delivery.id}/status/",
{"status": shipment_models.ShipmentDeliveryStatus.DELIVERED},
format="json",
)
self.assertEqual(resp.status_code, status.HTTP_200_OK)
delivery.refresh_from_db()
self.assertEqual(
delivery.status, shipment_models.ShipmentDeliveryStatus.DELIVERED
)
self.assertIsNotNone(delivery.delivered_at)
self.assertEqual(delivery.operator_id, self.employee.id)
def test_modify_delivery_status_rejects_invalid_transition(self):
delivery = shipment_models.ShipmentDelivery.objects.create(
merchant=self.merchant,
driver_name="张司机",
vehicle_trip="KD-007",
created_by=self.user,
)
resp = self.client.post(
f"/api/v1/shipment/deliveries/{delivery.id}/status/",
{"status": shipment_models.ShipmentDeliveryStatus.DELIVERED},
format="json",
)
self.assertEqual(resp.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn("不允许", resp.json()["detail"])
def test_modify_delivery_status_rejects_cancelled_target(self):
delivery = shipment_models.ShipmentDelivery.objects.create(
merchant=self.merchant,
driver_name="张司机",
vehicle_trip="KD-007-B",
created_by=self.user,
)
resp = self.client.post(
f"/api/v1/shipment/deliveries/{delivery.id}/status/",
{"status": shipment_models.ShipmentDeliveryStatus.CANCELLED},
format="json",
)
self.assertEqual(resp.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn("不是合法选项", str(resp.json()))
def test_cancel_delivery_requires_permission(self):
delivery = shipment_models.ShipmentDelivery.objects.create(
merchant=self.merchant,
driver_name="张司机",
vehicle_trip="KD-007-C",
created_by=self.user,
)
resp = self.client.post(
f"/api/v1/shipment/deliveries/{delivery.id}/cancel/",
{},
format="json",
)
self.assertEqual(resp.status_code, status.HTTP_403_FORBIDDEN)
self.assertIn("没有权限", resp.json()["detail"])
def test_cancel_delivery_success(self):
delivery = shipment_models.ShipmentDelivery.objects.create(
merchant=self.merchant,
driver_name="张司机",
vehicle_trip="KD-007-D",
created_by=self.user,
)
permission = Permission.objects.get(codename="cancel_shipmentdelivery")
self.user.user_permissions.add(permission)
resp = self.client.post(
f"/api/v1/shipment/deliveries/{delivery.id}/cancel/",
{},
format="json",
)
self.assertEqual(resp.status_code, status.HTTP_200_OK)
data = resp.json()
self.assertEqual(data["status"], shipment_models.ShipmentDeliveryStatus.CANCELLED)
self.assertEqual(data["status_display"], "已取消")
self.assertEqual(data["cancelled_by_id"], self.user.id)
self.assertEqual(data["cancelled_by_name"], self.employee.name)
self.assertEqual(data["operator_id"], self.employee.id)
self.assertIsNotNone(data["cancelled_at"])
delivery.refresh_from_db()
self.assertEqual(delivery.status, shipment_models.ShipmentDeliveryStatus.CANCELLED)
self.assertEqual(delivery.cancelled_by_id, self.user.id)
self.assertIsNotNone(delivery.cancelled_at)
def test_bind_shipments_to_existing_delivery_success(self):
delivery = shipment_models.ShipmentDelivery.objects.create(
merchant=self.merchant,
driver_name="张司机",
vehicle_trip="KD-007-E",
created_by=self.user,
)
resp = self.client.post(
f"/api/v1/shipment/deliveries/{delivery.id}/bind-shipments/",
{"shipments": [self.shipment1.id, self.shipment2.id]},
format="json",
)
self.assertEqual(resp.status_code, status.HTTP_200_OK)
data = resp.json()
self.assertEqual(data["shipments_count"], 2)
shipment_ids = [item["id"] for item in data["shipments"]]
self.assertEqual(shipment_ids, [self.shipment1.id, self.shipment2.id])
self.assertEqual(data["operator_id"], self.employee.id)
self.shipment1.refresh_from_db()
self.shipment2.refresh_from_db()
self.assertEqual(self.shipment1.delivery_id, delivery.id)
self.assertEqual(self.shipment2.delivery_id, delivery.id)
def test_bind_shipments_rejects_non_approved_shipment(self):
delivery = shipment_models.ShipmentDelivery.objects.create(
merchant=self.merchant,
driver_name="张司机",
vehicle_trip="KD-007-F",
created_by=self.user,
)
unapproved_shipment = shipment_models.Shipment.objects.create(
merchant=self.merchant,
customer=self.customer,
shipment_date="2026-04-08",
created_by=self.user,
)
resp = self.client.post(
f"/api/v1/shipment/deliveries/{delivery.id}/bind-shipments/",
{"shipments": [unapproved_shipment.id]},
format="json",
)
self.assertEqual(resp.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn("未处于已审核状态", resp.json()["detail"])
def test_delete_delivery_unbinds_shipments(self):
delivery = shipment_models.ShipmentDelivery.objects.create(
merchant=self.merchant,
driver_name="张司机",
vehicle_trip="KD-008",
created_by=self.user,
)
self.shipment1.delivery = delivery
self.shipment1.save(update_fields=["delivery", "updated_at"])
resp = self.client.delete(f"/api/v1/shipment/deliveries/{delivery.id}/")
self.assertEqual(resp.status_code, status.HTTP_204_NO_CONTENT)
self.shipment1.refresh_from_db()
self.assertIsNone(self.shipment1.delivery_id)
self.assertFalse(
shipment_models.ShipmentDelivery.objects.filter(id=delivery.id).exists()
)
class ShipmentDeliveryServiceTestCase(TestCase):
def setUp(self):
self.merchant = basic_models.Merchant.objects.create(
name="送货服务测试商户", type=basic_models.MerchantTypeEnum.FACTORY
)
self.user = User.objects.create_user(
username="shipment_delivery_service_user",
password="testpass123",
)
basic_models.Employee.objects.create(
sys_user=self.user,
merchant=self.merchant,
name="送货服务测试员工",
mobile="13800138112",
status=basic_models.EmployeeStatusEnum.ACTIVE,
)
self.delivery = shipment_models.ShipmentDelivery.objects.create(
merchant=self.merchant,
driver_name="服务司机",
vehicle_trip="SERVICE-001",
created_by=self.user,
)
def test_modify_status_is_idempotent(self):
from shipment.services import modify_shipment_delivery_status
result = modify_shipment_delivery_status(
self.delivery,
target_status=shipment_models.ShipmentDeliveryStatus.PENDING,
)
self.assertEqual(result.id, self.delivery.id)
self.delivery.refresh_from_db()
self.assertEqual(
self.delivery.status, shipment_models.ShipmentDeliveryStatus.PENDING
)
self.assertIsNone(self.delivery.started_at)
def test_modify_status_cannot_rollback(self):
from shipment.services import modify_shipment_delivery_status
modify_shipment_delivery_status(
self.delivery,
target_status=shipment_models.ShipmentDeliveryStatus.IN_TRANSIT,
)
with self.assertRaisesMessage(
ValueError, "不允许将送货单状态从 送货中 修改为 待送货"
):
modify_shipment_delivery_status(
self.delivery,
target_status=shipment_models.ShipmentDeliveryStatus.PENDING,
)
def test_cancel_delivery_is_idempotent(self):
from shipment.services import cancel_shipment_delivery
result = cancel_shipment_delivery(
self.delivery,
cancelled_by=self.user,
operator=self.user,
)
first_cancelled_at = result.cancelled_at
result = cancel_shipment_delivery(
self.delivery,
cancelled_by=self.user,
operator=self.user,
)
self.assertEqual(result.status, shipment_models.ShipmentDeliveryStatus.CANCELLED)
self.assertEqual(result.cancelled_by_id, self.user.id)
self.assertEqual(result.cancelled_at, first_cancelled_at)

323
api_v1/views/shipment/views.py
View File

@@ -10,11 +10,16 @@ from rest_framework.response import Response
from rest_framework.views import APIView
from flower.viewsets import LimitedLimitOffsetPagination
from shipment.models import Shipment
from shipment.models import Shipment, ShipmentDelivery
from .serializers import (
SalesItemDetailSerializer,
SalesItemSerializer,
ShipmentDeliveryBindShipmentsSerializer,
ShipmentDeliveryCreateSerializer,
ShipmentDeliverySerializer,
ShipmentDeliveryStatusUpdateSerializer,
ShipmentDeliveryUpdateSerializer,
ShipmentSerializer,
ShipmentCreateNormalSerializer,
ShipmentCreateExternalSerializer,
@@ -178,6 +183,9 @@ class ShipmentListCreateView(ListModelMixin, GenericAPIView):
shipment_date=data["shipment_date"],
sales_item_ids=data["sales_items"],
created_by=request.user,
address=data.get("address", ""),
contact_name=data.get("contact_name", ""),
contact_phone=data.get("contact_phone", ""),
remark=data.get("remark", ""),
area=data.get("area", ""),
)
@@ -246,6 +254,9 @@ class ShipmentDetailView(RetrieveModelMixin, GenericAPIView):
shipment,
customer_id=data.get("customer"),
shipment_date=data.get("shipment_date"),
address=data.get("address"),
contact_name=data.get("contact_name"),
contact_phone=data.get("contact_phone"),
area=data.get("area"),
remark=data.get("remark"),
external_id=data.get("external_id"),
@@ -263,6 +274,313 @@ class ShipmentDetailView(RetrieveModelMixin, GenericAPIView):
return self.patch(request, pk=pk)
class ShipmentDeliveryListCreateView(ListModelMixin, GenericAPIView):
"""
送货单：查询列表 / 创建
- GET /api/v1/shipment/deliveries/
- POST /api/v1/shipment/deliveries/
"""
permission_classes = [IsAuthenticated]
serializer_class = ShipmentDeliverySerializer
pagination_class = LimitedLimitOffsetPagination
def get_queryset(self):
qs = ShipmentDelivery.objects.all().select_related(
"merchant", "created_by", "operator", "cancelled_by"
).prefetch_related(
"shipments",
"shipments__customer",
)
user = self.request.user
if not getattr(user, "is_superuser", False):
emp = getattr(user, "employee", None)
merchant = getattr(emp, "merchant", None) if emp else None
if not merchant:
return ShipmentDelivery.objects.none()
qs = qs.filter(merchant=merchant)
status_val = self.request.query_params.get("status")
if status_val:
qs = qs.filter(status=status_val)
driver_name = (self.request.query_params.get("driver_name") or "").strip()
if driver_name:
qs = qs.filter(driver_name__icontains=driver_name)
vehicle_trip = (self.request.query_params.get("vehicle_trip") or "").strip()
if vehicle_trip:
qs = qs.filter(vehicle_trip__icontains=vehicle_trip)
return qs.order_by("-created_at", "-id")
def get(self, request):
return self.list(request)
def post(self, request):
serializer = ShipmentDeliveryCreateSerializer(data=request.data)
if not serializer.is_valid():
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
from shipment.services import create_shipment_delivery
try:
delivery = create_shipment_delivery(
driver_name=serializer.validated_data["driver_name"],
vehicle_trip=serializer.validated_data["vehicle_trip"],
contact_phone=serializer.validated_data.get("contact_phone", ""),
vehicle_capacity=serializer.validated_data.get("vehicle_capacity", ""),
shipment_ids=serializer.validated_data.get("shipments", []),
created_by=request.user,
remark=serializer.validated_data.get("remark", ""),
internal_remark=serializer.validated_data.get("internal_remark", ""),
)
except ValueError as e:
return Response({"detail": str(e)}, status=status.HTTP_400_BAD_REQUEST)
delivery = ShipmentDelivery.objects.select_related(
"merchant", "created_by", "operator", "cancelled_by"
).prefetch_related(
"shipments",
"shipments__customer",
).get(id=delivery.id)
return Response(
ShipmentDeliverySerializer(delivery).data,
status=status.HTTP_201_CREATED,
)
class ShipmentDeliveryDetailView(RetrieveModelMixin, GenericAPIView):
"""
送货单详情 / 修改 / 删除
- GET /api/v1/shipment/deliveries/<id>/
- PATCH /api/v1/shipment/deliveries/<id>/
- PUT /api/v1/shipment/deliveries/<id>/
- DELETE /api/v1/shipment/deliveries/<id>/
"""
permission_classes = [IsAuthenticated]
serializer_class = ShipmentDeliverySerializer
def get_queryset(self):
qs = ShipmentDelivery.objects.all().select_related(
"merchant", "created_by", "operator", "cancelled_by"
).prefetch_related(
"shipments",
"shipments__customer",
)
user = self.request.user
if getattr(user, "is_superuser", False):
return qs
emp = getattr(user, "employee", None)
merchant = getattr(emp, "merchant", None) if emp else None
if not merchant:
return ShipmentDelivery.objects.none()
return qs.filter(merchant=merchant)
def get(self, request, pk: int):
return self.retrieve(request, pk=pk)
def patch(self, request, pk: int):
delivery = self.get_object()
serializer = ShipmentDeliveryUpdateSerializer(data=request.data, partial=True)
if not serializer.is_valid():
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
from shipment.services import update_shipment_delivery
try:
delivery = update_shipment_delivery(
delivery,
driver_name=serializer.validated_data.get("driver_name"),
vehicle_trip=serializer.validated_data.get("vehicle_trip"),
contact_phone=serializer.validated_data.get("contact_phone"),
vehicle_capacity=serializer.validated_data.get("vehicle_capacity"),
shipment_ids=serializer.validated_data.get("shipments"),
remark=serializer.validated_data.get("remark"),
internal_remark=serializer.validated_data.get("internal_remark"),
operator=request.user,
)
except ValueError as e:
return Response({"detail": str(e)}, status=status.HTTP_400_BAD_REQUEST)
delivery = self.get_queryset().get(id=delivery.id)
return Response(
ShipmentDeliverySerializer(delivery).data,
status=status.HTTP_200_OK,
)
def put(self, request, pk: int):
return self.patch(request, pk=pk)
def delete(self, request, pk: int):
delivery = self.get_object()
from shipment.services import delete_shipment_delivery
delete_shipment_delivery(delivery)
return Response(status=status.HTTP_204_NO_CONTENT)
class ShipmentDeliveryStatusUpdateView(APIView):
"""
修改送货单状态
POST /api/v1/shipment/deliveries/<id>/status/
"""
permission_classes = [IsAuthenticated]
def post(self, request, pk: int):
user = request.user
queryset = ShipmentDelivery.objects.all()
if not getattr(user, "is_superuser", False):
emp = getattr(user, "employee", None)
merchant = getattr(emp, "merchant", None) if emp else None
if not merchant:
return Response({"detail": "未找到送货单"}, status=status.HTTP_404_NOT_FOUND)
queryset = queryset.filter(merchant=merchant)
delivery = queryset.filter(id=pk).first()
if delivery is None:
return Response({"detail": "未找到送货单"}, status=status.HTTP_404_NOT_FOUND)
serializer = ShipmentDeliveryStatusUpdateSerializer(data=request.data)
if not serializer.is_valid():
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
from shipment.services import modify_shipment_delivery_status
try:
delivery = modify_shipment_delivery_status(
delivery,
target_status=serializer.validated_data["status"],
operator=request.user,
)
except ValueError as e:
return Response({"detail": str(e)}, status=status.HTTP_400_BAD_REQUEST)
delivery = ShipmentDelivery.objects.select_related(
"merchant", "created_by", "operator", "cancelled_by"
).prefetch_related(
"shipments",
"shipments__customer",
).get(id=delivery.id)
return Response(
ShipmentDeliverySerializer(delivery).data,
status=status.HTTP_200_OK,
)
class ShipmentDeliveryCancelView(APIView):
"""
取消送货单
POST /api/v1/shipment/deliveries/<id>/cancel/
"""
permission_classes = [IsAuthenticated]
def post(self, request, pk: int):
if not request.user.has_perm("shipment.cancel_shipmentdelivery"):
return Response(
{"detail": "没有权限取消送货单"},
status=status.HTTP_403_FORBIDDEN,
)
user = request.user
queryset = ShipmentDelivery.objects.all()
if not getattr(user, "is_superuser", False):
emp = getattr(user, "employee", None)
merchant = getattr(emp, "merchant", None) if emp else None
if not merchant:
return Response({"detail": "未找到送货单"}, status=status.HTTP_404_NOT_FOUND)
queryset = queryset.filter(merchant=merchant)
delivery = queryset.filter(id=pk).first()
if delivery is None:
return Response({"detail": "未找到送货单"}, status=status.HTTP_404_NOT_FOUND)
from shipment.services import cancel_shipment_delivery
delivery = cancel_shipment_delivery(
delivery,
cancelled_by=request.user,
operator=request.user,
)
delivery = ShipmentDelivery.objects.select_related(
"merchant", "created_by", "operator", "cancelled_by"
).prefetch_related(
"shipments",
"shipments__customer",
).get(id=delivery.id)
return Response(
ShipmentDeliverySerializer(delivery).data,
status=status.HTTP_200_OK,
)
class ShipmentDeliveryBindShipmentsView(APIView):
"""
追加绑定出货单到现有送货单
POST /api/v1/shipment/deliveries/<id>/bind-shipments/
"""
permission_classes = [IsAuthenticated]
def post(self, request, pk: int):
user = request.user
queryset = ShipmentDelivery.objects.all()
if not getattr(user, "is_superuser", False):
emp = getattr(user, "employee", None)
merchant = getattr(emp, "merchant", None) if emp else None
if not merchant:
return Response({"detail": "未找到送货单"}, status=status.HTTP_404_NOT_FOUND)
queryset = queryset.filter(merchant=merchant)
delivery = queryset.filter(id=pk).first()
if delivery is None:
return Response({"detail": "未找到送货单"}, status=status.HTTP_404_NOT_FOUND)
serializer = ShipmentDeliveryBindShipmentsSerializer(data=request.data)
if not serializer.is_valid():
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
from shipment.services import bind_shipments_to_delivery
try:
delivery = bind_shipments_to_delivery(
delivery,
shipment_ids=serializer.validated_data["shipments"],
operator=request.user,
)
except ValueError as e:
return Response({"detail": str(e)}, status=status.HTTP_400_BAD_REQUEST)
delivery = ShipmentDelivery.objects.select_related(
"merchant", "created_by", "operator", "cancelled_by"
).prefetch_related(
"shipments",
"shipments__customer",
).get(id=delivery.id)
return Response(
ShipmentDeliverySerializer(delivery).data,
status=status.HTTP_200_OK,
)
class ShipmentExternalCreateView(APIView):
"""
创建出货单（external 版）
@@ -293,6 +611,9 @@ class ShipmentExternalCreateView(APIView):
external_id=data["external_id"],
external_finished_products=data["external_finished_products"],
created_by=request.user,
address=data.get("address", ""),
contact_name=data.get("contact_name", ""),
contact_phone=data.get("contact_phone", ""),
remark=data.get("remark", ""),
area=data.get("area", ""),
)