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

feat: purchase_order approve and calcel

Browse Source
This commit is contained in:
colaftc
2025-11-28 18:25:06 +08:00
parent 0c62398120
commit 4b3cd8eb75
14 changed files with 1019 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
api_v1/tests.py
View File

@@ -1,3 +1,4 @@
import copy
import shutil
import tempfile
from pathlib import Path
@@ -19,6 +20,8 @@ from basic_info.models import (
WareHouse,
WareHouseModeEnum,
)
from business import models as business_models
from stock import models as stock_models
from api_v1 import tasks
@@ -197,13 +200,22 @@ class PurchaseOrderAPITestCase(TestCase):
],
}
def _create_purchase_order(self, payload):
body = copy.deepcopy(payload)
with patch('business.services.create_purchase_order_stock_entries.delay'):
response = self.client.post('/api/v1/purchase-orders/', body, format='json')
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
return response.data['id']
def test_create_purchase_order_success_strict(self):
with patch('business.services.create_purchase_order_stock_entries.delay') as mock_delay:
response = self.client.post('/api/v1/purchase-orders/', self.strict_payload, format='json')
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
self.assertIn('id', response.data)
mock_delay.assert_called_once()
self.assertEqual(response.data['status'], 1)
self.assertIn('等待审批', response.data['message'])
mock_delay.assert_not_called()
def test_create_purchase_order_invalid_supplier(self):
payload = {**self.strict_payload, 'supplier': 999}
@@ -220,7 +232,8 @@ class PurchaseOrderAPITestCase(TestCase):
with patch('business.services.create_purchase_order_stock_entries.delay') as mock_delay:
response = self.client.post('/api/v1/purchase-orders/', self.relaxed_payload, format='json')
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
mock_delay.assert_called_once()
self.assertEqual(response.data['status'], 1)
mock_delay.assert_not_called()
def test_mode_mismatch_raises(self):
payload = {**self.relaxed_payload}
@@ -229,6 +242,42 @@ class PurchaseOrderAPITestCase(TestCase):
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn('严进模式', response.data['error'])
def test_review_purchase_order_requires_action(self):
order_id = self._create_purchase_order(self.strict_payload)
response = self.client.post(f'/api/v1/purchase-orders/{order_id}/review/', {}, format='json')
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn('action', response.data)
def test_review_purchase_order_approve_success(self):
order_id = self._create_purchase_order(self.strict_payload)
response = self.client.post(
f'/api/v1/purchase-orders/{order_id}/review/',
{'action': 'approve'},
format='json',
)
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['status'], business_models.PurchaseOrderStatusEnum.APPROVED)
order = business_models.PurchaseOrder.objects.get(id=order_id)
self.assertEqual(order.status, business_models.PurchaseOrderStatusEnum.APPROVED)
def test_review_purchase_order_cancel_blocked_after_stock_exists(self):
order_id = self._create_purchase_order(self.relaxed_payload)
stock_models.StockChangeRecord.objects.create(
merchant=self.merchant,
type=stock_models.StockChangeTypeEnum.ADD,
warehouse=self.warehouse_relaxed,
source_type=stock_models.StockChangeSourceEnum.PURCHASE,
source_id=order_id,
)
response = self.client.post(
f'/api/v1/purchase-orders/{order_id}/review/',
{'action': 'cancel'},
format='json',
)
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
order = business_models.PurchaseOrder.objects.get(id=order_id)
self.assertEqual(order.status, business_models.PurchaseOrderStatusEnum.PENDING)
@override_settings(
CELERY_TASK_ALWAYS_EAGER=True,

1
api_v1/urls.py
View File

@@ -57,6 +57,7 @@ urlpatterns = [
# 库存查询 API
path('inventory/', inventory.InventoryAPIView.as_view(), name='inventory'),
path('purchase-orders/', purchase_order.PurchaseOrderView.as_view(), name='purchase_orders'),
path('purchase-orders/<int:pk>/review/', purchase_order.PurchaseOrderReviewView.as_view(), name='purchase_order_review'),
path('health/', healthy.HealthCheckView.as_view(), name='health_check'),
path('print-count/delta/', print_count.adjust_print_count, name='print_count_delta'),

64
api_v1/views/purchase_order.py
View File

@@ -1,7 +1,6 @@
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
@@ -14,12 +13,23 @@ class PurchaseOrderItemSerializer(serializers.ModelSerializer):
fields = [
'id', 'product', 'price', 'color', 'quantity', 'unit',
'empty_diff_percent', 'quantity_of_rolls', 'num_of_rolls',
'batch_number', 'remarks', 'created_at', 'updated_at',
'batch_number', 'remarks', 'created_at', 'updated_at', 'spec',
]
read_only_fields = ['id', 'created_at', 'updated_at']
read_only_fields = ['id', 'created_at', 'updated_at', 'total_amount', 'diff_quantity', 'real_quantity']
class PurchaseOrderSerializer(serializers.ModelSerializer):
total_amount = serializers.SerializerMethodField(read_only=True)
diff_quantity = serializers.SerializerMethodField(read_only=True)
total_quantity = serializers.SerializerMethodField(read_only=True)
def get_total_amount(self, obj: business_models.PurchaseOrder):
return obj.get_total_amount()
def get_diff_quantity(self, obj: business_models.PurchaseOrder):
return obj.get_total_diff_quantity()
def get_total_quantity(self, obj: business_models.PurchaseOrder):
return obj.get_total_quantity()
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)
@@ -29,6 +39,7 @@ class PurchaseOrderSerializer(serializers.ModelSerializer):
model = business_models.PurchaseOrder
fields = [
'id', 'supplier', 'supplier_name', 'purchase_date', 'kind',
'total_amount', 'diff_quantity', 'total_quantity',
'operator', 'operator_name', 'warehouse', 'warehouse_name',
'status', 'remarks', 'created_at', 'updated_at', 'items',
]
@@ -108,8 +119,53 @@ class PurchaseOrderView(StockChangeViewMixin, views.APIView):
return Response(
{
'id': purchase_order.id,
'message': '采购单创建成功，入库任务已排队',
'status': purchase_order.status,
'message': '采购单创建成功，等待审批',
},
status=status.HTTP_201_CREATED,
)
class PurchaseOrderReviewSerializer(serializers.Serializer):
action = serializers.ChoiceField(choices=[('approve', '审批通过'), ('cancel', '作废')])
class PurchaseOrderReviewView(StockChangeViewMixin, views.APIView):
"""采购单审批 / 作废"""
permission_classes = [IsAuthenticated]
ACTION_STATUS_MAP = {
'approve': business_models.PurchaseOrderStatusEnum.APPROVED,
'cancel': business_models.PurchaseOrderStatusEnum.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_order = business_models.PurchaseOrder.objects.select_related(
'supplier', 'operator', 'warehouse'
).prefetch_related('items').get(id=pk, merchant=merchant)
except business_models.PurchaseOrder.DoesNotExist:
return self.not_found_response('采购单不存在')
serializer = PurchaseOrderReviewSerializer(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_order(
purchase_order=purchase_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.PurchaseOrder.objects.select_related(
'supplier', 'operator', 'warehouse'
).prefetch_related('items').get(id=purchase_order.id)
return Response(PurchaseOrderSerializer(refreshed_order).data, status=status.HTTP_200_OK)