1
0
forked from erp-dev/erp

feat: sales return order and purchase return order

This commit is contained in:
2025-12-01 16:52:59 +08:00
parent a3b4af2602
commit fae33809ac
17 changed files with 1745 additions and 6 deletions

View File

@@ -453,6 +453,242 @@ class SalesOrderAPITestCase(TestCase):
self.assertEqual(order.status, business_models.SalesOrderStatusEnum.PENDING)
@override_settings(
CELERY_TASK_ALWAYS_EAGER=True,
CELERY_TASK_EAGER_PROPAGATES=True,
)
class PurchaseReturnOrderAPITestCase(TestCase):
def setUp(self):
self.merchant = Merchant.objects.create(name='采退商户', type=MerchantTypeEnum.FACTORY)
self.supplier = Supplier.objects.create(merchant=self.merchant, name='供应商B')
self.warehouse_strict = WareHouse.objects.create(
merchant=self.merchant,
name='采退严进仓',
mode=WareHouseModeEnum.RESTRICT_IN,
)
self.warehouse_relaxed = WareHouse.objects.create(
merchant=self.merchant,
name='采退宽进仓',
mode=WareHouseModeEnum.UNRESTRICTED,
)
self.warehouse_strict_out = WareHouse.objects.create(
merchant=self.merchant,
name='采退严出仓',
mode=WareHouseModeEnum.RESTRICT_IN_OUT,
)
category = ProductCategory.objects.create(
merchant=self.merchant,
name='采退品类',
product_prefix='RET',
)
self.product = Product.objects.create(
merchant=self.merchant,
category=category,
name='采退产品',
human_id='RET-001',
unit=ProductUnitEnum.METER,
)
self.user = User.objects.create_user(username='return_user', password='pass123')
self.employee = Employee.objects.create(
merchant=self.merchant,
sys_user=self.user,
name='仓管员',
)
self.client = APIClient()
self.client.force_authenticate(user=self.user)
self.strict_payload = {
'supplier': self.supplier.id,
'warehouse': self.warehouse_strict.id,
'return_date': '2025-11-26',
'items': [
{
'product_id': self.product.id,
'numbers': [5, 3],
'price': '11.5',
'unit': '',
}
],
'remarks': '采退测试',
}
self.strict_out_payload = {
'supplier': self.supplier.id,
'warehouse': self.warehouse_strict_out.id,
'return_date': '2025-11-26',
'items': [
{
'product_id': self.product.id,
'consume_detail_ids': [201, 202],
'quantity': 20,
'price': '11.2',
'unit': '',
}
],
}
def _create_purchase_return_order(self, payload):
body = copy.deepcopy(payload)
response = self.client.post('/api/v1/purchase-return-orders/', body, format='json')
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
return response.data['id']
def test_create_purchase_return_order_success(self):
response = self.client.post('/api/v1/purchase-return-orders/', self.strict_payload, format='json')
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
self.assertIn('id', response.data)
self.assertEqual(response.data['status'], business_models.PurchaseReturnStatusEnum.PENDING)
def test_create_purchase_return_requires_consume_ids_in_strict_out(self):
payload = copy.deepcopy(self.strict_out_payload)
payload['items'][0].pop('consume_detail_ids')
response = self.client.post('/api/v1/purchase-return-orders/', payload, format='json')
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn('consume_detail_ids', response.data['error'])
def test_review_purchase_return_order_approve(self):
order_id = self._create_purchase_return_order(self.strict_payload)
response = self.client.post(
f'/api/v1/purchase-return-orders/{order_id}/review/',
{'action': 'approve'},
format='json',
)
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['status'], business_models.PurchaseReturnStatusEnum.APPROVED)
def test_purchase_return_cancel_blocked_after_stock_exists(self):
order_id = self._create_purchase_return_order(self.strict_payload)
stock_models.StockChangeRecord.objects.create(
merchant=self.merchant,
type=stock_models.StockChangeTypeEnum.REMOVE,
warehouse=self.warehouse_strict,
source_type=stock_models.StockChangeSourceEnum.PURCHASE_RETURN,
source_id=order_id,
)
response = self.client.post(
f'/api/v1/purchase-return-orders/{order_id}/review/',
{'action': 'cancel'},
format='json',
)
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
order = business_models.PurchaseReturnOrder.objects.get(id=order_id)
self.assertEqual(order.status, business_models.PurchaseReturnStatusEnum.PENDING)
@override_settings(
CELERY_TASK_ALWAYS_EAGER=True,
CELERY_TASK_EAGER_PROPAGATES=True,
)
class SalesReturnOrderAPITestCase(TestCase):
def setUp(self):
self.merchant = Merchant.objects.create(name='销退商户', type=MerchantTypeEnum.FACTORY)
self.customer = Customer.objects.create(
merchant=self.merchant,
name='销退客户',
mobile='13900000000',
created_by=None,
)
self.warehouse_strict = WareHouse.objects.create(
merchant=self.merchant,
name='销退严进仓',
mode=WareHouseModeEnum.RESTRICT_IN,
)
self.warehouse_relaxed = WareHouse.objects.create(
merchant=self.merchant,
name='销退宽进仓',
mode=WareHouseModeEnum.UNRESTRICTED,
)
category = ProductCategory.objects.create(
merchant=self.merchant,
name='销退品类',
product_prefix='SR',
)
self.product = Product.objects.create(
merchant=self.merchant,
category=category,
name='销退产品',
human_id='SR-001',
unit=ProductUnitEnum.METER,
)
self.user = User.objects.create_user(username='sales_return_user', password='pass123')
self.employee = Employee.objects.create(
merchant=self.merchant,
sys_user=self.user,
name='销退员',
)
self.client = APIClient()
self.client.force_authenticate(user=self.user)
self.strict_payload = {
'customer': self.customer.id,
'warehouse': self.warehouse_strict.id,
'return_date': '2025-11-26',
'items': [
{
'product_id': self.product.id,
'numbers': [7, 3],
'price': '14.5',
'unit': '',
}
],
}
self.relaxed_payload = {
'customer': self.customer.id,
'warehouse': self.warehouse_relaxed.id,
'return_date': '2025-11-26',
'items': [
{
'product_id': self.product.id,
'quantity': 60,
'num_of_rolls': 2,
'price': '13.8',
}
],
'remarks': '销退备注',
}
def _create_sales_return_order(self, payload):
body = copy.deepcopy(payload)
response = self.client.post('/api/v1/sales-return-orders/', body, format='json')
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
return response.data['id']
def test_create_sales_return_order_success(self):
response = self.client.post('/api/v1/sales-return-orders/', self.strict_payload, format='json')
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
self.assertEqual(response.data['status'], business_models.SalesReturnStatusEnum.PENDING)
def test_create_sales_return_order_invalid_customer(self):
payload = {**self.strict_payload, 'customer': 999}
response = self.client.post('/api/v1/sales-return-orders/', payload, format='json')
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
def test_review_sales_return_order_approve(self):
order_id = self._create_sales_return_order(self.relaxed_payload)
response = self.client.post(
f'/api/v1/sales-return-orders/{order_id}/review/',
{'action': 'approve'},
format='json',
)
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['status'], business_models.SalesReturnStatusEnum.APPROVED)
def test_sales_return_cancel_blocked_after_stock_exists(self):
order_id = self._create_sales_return_order(self.strict_payload)
stock_models.StockChangeRecord.objects.create(
merchant=self.merchant,
type=stock_models.StockChangeTypeEnum.ADD,
warehouse=self.warehouse_strict,
source_type=stock_models.StockChangeSourceEnum.SALES_RETURN,
source_id=order_id,
)
response = self.client.post(
f'/api/v1/sales-return-orders/{order_id}/review/',
{'action': 'cancel'},
format='json',
)
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
order = business_models.SalesReturnOrder.objects.get(id=order_id)
self.assertEqual(order.status, business_models.SalesReturnStatusEnum.PENDING)
class PaymentOrderAPITestCase(TestCase):
def setUp(self):
self.merchant = Merchant.objects.create(name='付款商户', type=MerchantTypeEnum.FACTORY)

View File

@@ -15,6 +15,8 @@ from .views.business.sales import views as sales_views
from .views.business.payment import views as payment_views
from .views.business.receipt import views as receipt_views
from .views.business.balance import views as balance_views
from .views.business.purchase_return import views as purchase_return_views
from .views.business.sales_return import views as sales_return_views
from .views.stock_change_views.snapshot import StockSnapshotListView
from .views.printing.views import PrintingOrderViewSet, PrintingJobViewSet, PlateOrderViewSet
from .views.upload import UploadFileViewSet
@@ -64,8 +66,12 @@ urlpatterns = [
path('inventory/', inventory.InventoryAPIView.as_view(), name='inventory'),
path('purchase-orders/', purchase_views.PurchaseOrderView.as_view(), name='purchase_orders'),
path('purchase-orders/<int:pk>/review/', purchase_views.PurchaseOrderReviewView.as_view(), name='purchase_order_review'),
path('purchase-return-orders/', purchase_return_views.PurchaseReturnOrderView.as_view(), name='purchase_return_orders'),
path('purchase-return-orders/<int:pk>/review/', purchase_return_views.PurchaseReturnOrderReviewView.as_view(), name='purchase_return_order_review'),
path('sales-orders/', sales_views.SalesOrderView.as_view(), name='sales_orders'),
path('sales-orders/<int:pk>/review/', sales_views.SalesOrderReviewView.as_view(), name='sales_order_review'),
path('sales-return-orders/', sales_return_views.SalesReturnOrderView.as_view(), name='sales_return_orders'),
path('sales-return-orders/<int:pk>/review/', sales_return_views.SalesReturnOrderReviewView.as_view(), name='sales_return_order_review'),
path('payment-orders/', payment_views.PaymentOrderView.as_view(), name='payment_orders'),
path('payment-orders/<int:pk>/review/', payment_views.PaymentOrderReviewView.as_view(), name='payment_order_review'),
path('receipt-orders/', receipt_views.ReceiptOrderView.as_view(), name='receipt_orders'),

View File

@@ -0,0 +1,2 @@

View File

@@ -0,0 +1,181 @@
from rest_framework import status, views, serializers, pagination
from rest_framework.permissions import IsAuthenticated
from rest_framework.response import Response
from basic_info import models as basic_models
from business import services as business_services
from business import models as business_models
from api_v1.views.stock_change_views.mixins import StockChangeViewMixin
class PurchaseReturnOrderItemSerializer(serializers.ModelSerializer):
class Meta:
model = business_models.PurchaseReturnOrderItem
fields = [
'id', 'product', 'price', 'color', 'quantity', 'unit',
'empty_diff_percent', 'quantity_of_rolls', 'num_of_rolls',
'consume_detail_ids', 'batch_number', 'remarks',
'created_at', 'updated_at', 'spec',
]
read_only_fields = [
'id', 'created_at', 'updated_at',
'total_amount', 'diff_quantity', 'real_quantity',
]
class PurchaseReturnOrderSerializer(serializers.ModelSerializer):
total_amount = serializers.SerializerMethodField(read_only=True)
diff_quantity = serializers.SerializerMethodField(read_only=True)
total_quantity = serializers.SerializerMethodField(read_only=True)
supplier_name = serializers.CharField(source='supplier.name', read_only=True)
operator_name = serializers.CharField(source='operator.name', read_only=True)
warehouse_name = serializers.CharField(source='warehouse.name', read_only=True)
items = PurchaseReturnOrderItemSerializer(many=True, read_only=True)
def get_total_amount(self, obj: business_models.PurchaseReturnOrder):
return obj.get_total_amount()
def get_diff_quantity(self, obj: business_models.PurchaseReturnOrder):
return obj.get_total_diff_quantity()
def get_total_quantity(self, obj: business_models.PurchaseReturnOrder):
return obj.get_total_quantity()
class Meta:
model = business_models.PurchaseReturnOrder
fields = [
'id', 'supplier', 'supplier_name', 'purchase_order', 'return_date',
'total_amount', 'diff_quantity', 'total_quantity',
'operator', 'operator_name', 'warehouse', 'warehouse_name',
'status', 'remarks', 'created_at', 'updated_at', 'items',
]
read_only_fields = [
'id', 'created_at', 'updated_at', 'items',
'supplier_name', 'operator_name', 'warehouse_name',
]
class PurchaseReturnOrderPagination(pagination.LimitOffsetPagination):
default_limit = 20
max_limit = 100
class PurchaseReturnOrderView(StockChangeViewMixin, views.APIView):
permission_classes = [IsAuthenticated]
pagination_class = PurchaseReturnOrderPagination
def get(self, request):
if not self.check_employee_permission(request):
return self.permission_error_response('无权限访问')
merchant = request.user.employee.merchant
queryset = business_models.PurchaseReturnOrder.objects.filter(merchant=merchant).prefetch_related(
'items', 'supplier', 'operator', 'warehouse'
)
paginator = self.pagination_class()
page = paginator.paginate_queryset(queryset.order_by('-created_at'), request, view=self)
serializer = PurchaseReturnOrderSerializer(page, many=True)
return paginator.get_paginated_response(serializer.data)
def post(self, request):
if not self.check_employee_permission(request):
return self.permission_error_response('无权限访问')
merchant = request.user.employee.merchant
data = request.data or {}
supplier_id = data.get('supplier')
warehouse_id = data.get('warehouse_id') or data.get('warehouse')
return_date = data.get('return_date')
items = data.get('items', [])
remarks = data.get('remarks', '')
purchase_order_id = data.get('purchase_order')
if not supplier_id:
return Response({'error': '缺少供应商 ID'}, status=status.HTTP_400_BAD_REQUEST)
if not warehouse_id:
return Response({'error': '缺少仓库 ID'}, status=status.HTTP_400_BAD_REQUEST)
if not return_date:
return Response({'error': '缺少 return_date'}, status=status.HTTP_400_BAD_REQUEST)
if not isinstance(items, list) or not items:
return Response({'error': 'items 需要为非空数组'}, status=status.HTTP_400_BAD_REQUEST)
try:
supplier = basic_models.Supplier.objects.get(id=supplier_id, merchant=merchant)
except basic_models.Supplier.DoesNotExist:
return Response({'error': f'供应商 {supplier_id} 不存在'}, status=status.HTTP_400_BAD_REQUEST)
try:
warehouse = basic_models.WareHouse.objects.get(id=warehouse_id, merchant=merchant)
except basic_models.WareHouse.DoesNotExist:
return Response({'error': f'仓库 {warehouse_id} 不存在'}, status=status.HTTP_400_BAD_REQUEST)
operator = request.user.employee
try:
purchase_return = business_services.create_purchase_return_order(
merchant=merchant,
supplier=supplier,
return_date=return_date,
warehouse=warehouse,
operator=operator,
items=items,
remarks=remarks,
purchase_order_id=purchase_order_id,
created_by=request.user,
)
except ValueError as exc:
return Response({'error': str(exc)}, status=status.HTTP_400_BAD_REQUEST)
return Response(
{
'id': purchase_return.id,
'status': purchase_return.status,
'message': '采购退货单创建成功,等待审批',
},
status=status.HTTP_201_CREATED,
)
class PurchaseReturnOrderReviewSerializer(serializers.Serializer):
action = serializers.ChoiceField(choices=[('approve', '审批通过'), ('cancel', '作废')])
class PurchaseReturnOrderReviewView(StockChangeViewMixin, views.APIView):
permission_classes = [IsAuthenticated]
ACTION_STATUS_MAP = {
'approve': business_models.PurchaseReturnStatusEnum.APPROVED,
'cancel': business_models.PurchaseReturnStatusEnum.CANCELLED,
}
def post(self, request, pk: int):
if not self.check_employee_permission(request):
return self.permission_error_response('无权限访问')
merchant = request.user.employee.merchant
try:
purchase_return_order = business_models.PurchaseReturnOrder.objects.select_related(
'supplier', 'operator', 'warehouse'
).prefetch_related('items').get(id=pk, merchant=merchant)
except business_models.PurchaseReturnOrder.DoesNotExist:
return self.not_found_response('采购退货单不存在')
serializer = PurchaseReturnOrderReviewSerializer(data=request.data or {})
serializer.is_valid(raise_exception=True)
action = serializer.validated_data['action']
target_status = self.ACTION_STATUS_MAP[action]
try:
business_services.review_purchase_return_order(
purchase_return_order=purchase_return_order,
target_status=target_status,
reviewed_by=request.user,
)
except ValueError as exc:
return Response({'error': str(exc)}, status=status.HTTP_400_BAD_REQUEST)
refreshed_order = business_models.PurchaseReturnOrder.objects.select_related(
'supplier', 'operator', 'warehouse'
).prefetch_related('items').get(id=purchase_return_order.id)
return Response(PurchaseReturnOrderSerializer(refreshed_order).data, status=status.HTTP_200_OK)

View File

@@ -0,0 +1,2 @@

View File

@@ -0,0 +1,180 @@
from rest_framework import status, views, serializers, pagination
from rest_framework.permissions import IsAuthenticated
from rest_framework.response import Response
from basic_info import models as basic_models
from business import services as business_services
from business import models as business_models
from api_v1.views.stock_change_views.mixins import StockChangeViewMixin
class SalesReturnOrderItemSerializer(serializers.ModelSerializer):
class Meta:
model = business_models.SalesReturnOrderItem
fields = [
'id', 'product', 'price', 'color', 'quantity', 'unit',
'empty_diff_percent', 'quantity_of_rolls', 'num_of_rolls',
'batch_number', 'remarks', 'created_at', 'updated_at', 'spec',
]
read_only_fields = [
'id', 'created_at', 'updated_at',
'total_amount', 'diff_quantity', 'real_quantity',
]
class SalesReturnOrderSerializer(serializers.ModelSerializer):
total_amount = serializers.SerializerMethodField(read_only=True)
diff_quantity = serializers.SerializerMethodField(read_only=True)
total_quantity = serializers.SerializerMethodField(read_only=True)
customer_name = serializers.CharField(source='customer.name', read_only=True)
operator_name = serializers.CharField(source='operator.name', read_only=True)
warehouse_name = serializers.CharField(source='warehouse.name', read_only=True)
items = SalesReturnOrderItemSerializer(many=True, read_only=True)
def get_total_amount(self, obj: business_models.SalesReturnOrder):
return obj.get_total_amount()
def get_diff_quantity(self, obj: business_models.SalesReturnOrder):
return obj.get_total_diff_quantity()
def get_total_quantity(self, obj: business_models.SalesReturnOrder):
return obj.get_total_quantity()
class Meta:
model = business_models.SalesReturnOrder
fields = [
'id', 'customer', 'customer_name', 'sales_order', 'return_date',
'total_amount', 'diff_quantity', 'total_quantity',
'operator', 'operator_name', 'warehouse', 'warehouse_name',
'status', 'remarks', 'created_at', 'updated_at', 'items',
]
read_only_fields = [
'id', 'created_at', 'updated_at', 'items',
'customer_name', 'operator_name', 'warehouse_name',
]
class SalesReturnOrderPagination(pagination.LimitOffsetPagination):
default_limit = 20
max_limit = 100
class SalesReturnOrderView(StockChangeViewMixin, views.APIView):
permission_classes = [IsAuthenticated]
pagination_class = SalesReturnOrderPagination
def get(self, request):
if not self.check_employee_permission(request):
return self.permission_error_response('无权限访问')
merchant = request.user.employee.merchant
queryset = business_models.SalesReturnOrder.objects.filter(merchant=merchant).prefetch_related(
'items', 'customer', 'operator', 'warehouse'
)
paginator = self.pagination_class()
page = paginator.paginate_queryset(queryset.order_by('-created_at'), request, view=self)
serializer = SalesReturnOrderSerializer(page, many=True)
return paginator.get_paginated_response(serializer.data)
def post(self, request):
if not self.check_employee_permission(request):
return self.permission_error_response('无权限访问')
merchant = request.user.employee.merchant
data = request.data or {}
customer_id = data.get('customer')
warehouse_id = data.get('warehouse_id') or data.get('warehouse')
return_date = data.get('return_date')
items = data.get('items', [])
remarks = data.get('remarks', '')
sales_order_id = data.get('sales_order')
if not customer_id:
return Response({'error': '缺少客户 ID'}, status=status.HTTP_400_BAD_REQUEST)
if not warehouse_id:
return Response({'error': '缺少仓库 ID'}, status=status.HTTP_400_BAD_REQUEST)
if not return_date:
return Response({'error': '缺少 return_date'}, status=status.HTTP_400_BAD_REQUEST)
if not isinstance(items, list) or not items:
return Response({'error': 'items 需要为非空数组'}, status=status.HTTP_400_BAD_REQUEST)
try:
customer = basic_models.Customer.objects.get(id=customer_id, merchant=merchant)
except basic_models.Customer.DoesNotExist:
return Response({'error': f'客户 {customer_id} 不存在'}, status=status.HTTP_400_BAD_REQUEST)
try:
warehouse = basic_models.WareHouse.objects.get(id=warehouse_id, merchant=merchant)
except basic_models.WareHouse.DoesNotExist:
return Response({'error': f'仓库 {warehouse_id} 不存在'}, status=status.HTTP_400_BAD_REQUEST)
operator = request.user.employee
try:
sales_return = business_services.create_sales_return_order(
merchant=merchant,
customer=customer,
return_date=return_date,
warehouse=warehouse,
operator=operator,
items=items,
remarks=remarks,
sales_order_id=sales_order_id,
created_by=request.user,
)
except ValueError as exc:
return Response({'error': str(exc)}, status=status.HTTP_400_BAD_REQUEST)
return Response(
{
'id': sales_return.id,
'status': sales_return.status,
'message': '销售退货单创建成功,等待审批',
},
status=status.HTTP_201_CREATED,
)
class SalesReturnOrderReviewSerializer(serializers.Serializer):
action = serializers.ChoiceField(choices=[('approve', '审批通过'), ('cancel', '作废')])
class SalesReturnOrderReviewView(StockChangeViewMixin, views.APIView):
permission_classes = [IsAuthenticated]
ACTION_STATUS_MAP = {
'approve': business_models.SalesReturnStatusEnum.APPROVED,
'cancel': business_models.SalesReturnStatusEnum.CANCELLED,
}
def post(self, request, pk: int):
if not self.check_employee_permission(request):
return self.permission_error_response('无权限访问')
merchant = request.user.employee.merchant
try:
sales_return_order = business_models.SalesReturnOrder.objects.select_related(
'customer', 'operator', 'warehouse'
).prefetch_related('items').get(id=pk, merchant=merchant)
except business_models.SalesReturnOrder.DoesNotExist:
return self.not_found_response('销售退货单不存在')
serializer = SalesReturnOrderReviewSerializer(data=request.data or {})
serializer.is_valid(raise_exception=True)
action = serializer.validated_data['action']
target_status = self.ACTION_STATUS_MAP[action]
try:
business_services.review_sales_return_order(
sales_return_order=sales_return_order,
target_status=target_status,
reviewed_by=request.user,
)
except ValueError as exc:
return Response({'error': str(exc)}, status=status.HTTP_400_BAD_REQUEST)
refreshed_order = business_models.SalesReturnOrder.objects.select_related(
'customer', 'operator', 'warehouse'
).prefetch_related('items').get(id=sales_return_order.id)
return Response(SalesReturnOrderSerializer(refreshed_order).data, status=status.HTTP_200_OK)