1
0
forked from erp-dev/erp

feat: added put/patch api to main oobject of business module

This commit is contained in:
2025-12-12 14:45:51 +08:00
parent 1a8c446365
commit 9e1f994416
14 changed files with 11611 additions and 0 deletions

View File

@@ -285,6 +285,38 @@ class PurchaseOrderAPITestCase(TestCase):
order = business_models.PurchaseOrder.objects.get(id=order_id)
self.assertEqual(order.status, business_models.PurchaseOrderStatusEnum.PENDING)
def test_update_purchase_order_success(self):
order_id = self._create_purchase_order(self.strict_payload)
payload = {
'supplier': self.supplier.id,
'warehouse': self.warehouse_relaxed.id,
'order_date': '2025-12-01',
'items': [
{
'product_id': self.product.id,
'quantity': 200,
'num_of_rolls': 4,
'price': '12.88',
}
],
'remarks': '更新采购单',
}
response = self.client.put(f'/api/v1/purchase-orders/{order_id}/', payload, format='json')
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['remarks'], '更新采购单')
def test_update_purchase_order_rejects_non_pending(self):
order_id = self._create_purchase_order(self.relaxed_payload)
self.client.post(
f'/api/v1/purchase-orders/{order_id}/review/',
{'action': 'approve'},
format='json',
)
payload = copy.deepcopy(self.relaxed_payload)
response = self.client.put(f'/api/v1/purchase-orders/{order_id}/', payload, format='json')
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn('不可修改', response.data['error'])
@override_settings(
CELERY_TASK_ALWAYS_EAGER=True,
@@ -432,6 +464,51 @@ class SalesOrderAPITestCase(TestCase):
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn('consume_detail_ids', response.data['error'])
def test_update_sales_order_success(self):
order_id = self._create_sales_order(self.strict_in_payload)
payload = {
'customer': self.customer.id,
'warehouse': self.warehouse_relaxed.id,
'order_date': '2025-12-01',
'items': [
{
'product_id': self.product.id,
'quantity': 100,
'num_of_rolls': 2,
'price': '22.5',
}
],
'remarks': '更新后的销售单',
}
response = self.client.put(f'/api/v1/sales-orders/{order_id}/', payload, format='json')
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['remarks'], '更新后的销售单')
self.assertEqual(response.data['quantity_of_rolls'], [[]])
def test_update_sales_order_rejects_non_pending(self):
order_id = self._create_sales_order(self.strict_in_payload)
self.client.post(
f'/api/v1/sales-orders/{order_id}/review/',
{'action': 'approve'},
format='json',
)
payload = {
'customer': self.customer.id,
'warehouse': self.warehouse_relaxed.id,
'order_date': '2025-12-02',
'items': [
{
'product_id': self.product.id,
'quantity': 10,
'num_of_rolls': 1,
'price': '30',
}
],
}
response = self.client.put(f'/api/v1/sales-orders/{order_id}/', payload, format='json')
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn('不可修改', response.data['error'])
def test_create_sales_order_with_printing_job_binding(self):
payload = copy.deepcopy(self.relaxed_payload)
payload['items'][0]['printing_job'] = self.printing_job_for_sales.id
@@ -598,6 +675,38 @@ class PurchaseReturnOrderAPITestCase(TestCase):
order = business_models.PurchaseReturnOrder.objects.get(id=order_id)
self.assertEqual(order.status, business_models.PurchaseReturnStatusEnum.PENDING)
def test_update_purchase_return_order_success(self):
order_id = self._create_purchase_return_order(self.strict_payload)
payload = {
'supplier': self.supplier.id,
'warehouse': self.warehouse_relaxed.id,
'return_date': '2025-12-05',
'items': [
{
'product_id': self.product.id,
'quantity': 50,
'num_of_rolls': 2,
'price': '12.0',
}
],
'remarks': '更新采退',
}
response = self.client.put(f'/api/v1/purchase-return-orders/{order_id}/', payload, format='json')
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['remarks'], '更新采退')
def test_update_purchase_return_order_rejects_non_pending(self):
order_id = self._create_purchase_return_order(self.strict_payload)
self.client.post(
f'/api/v1/purchase-return-orders/{order_id}/review/',
{'action': 'approve'},
format='json',
)
payload = copy.deepcopy(self.strict_payload)
response = self.client.put(f'/api/v1/purchase-return-orders/{order_id}/', payload, format='json')
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn('不可修改', response.data['error'])
@override_settings(
CELERY_TASK_ALWAYS_EAGER=True,
@@ -714,6 +823,50 @@ class SalesReturnOrderAPITestCase(TestCase):
order = business_models.SalesReturnOrder.objects.get(id=order_id)
self.assertEqual(order.status, business_models.SalesReturnStatusEnum.PENDING)
def test_update_sales_return_order_success(self):
order_id = self._create_sales_return_order(self.strict_payload)
payload = {
'customer': self.customer.id,
'warehouse': self.warehouse_relaxed.id,
'return_date': '2025-12-02',
'items': [
{
'product_id': self.product.id,
'quantity': 40,
'num_of_rolls': 2,
'price': '18.0',
}
],
'remarks': '更新销退',
}
response = self.client.put(f'/api/v1/sales-return-orders/{order_id}/', payload, format='json')
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['remarks'], '更新销退')
def test_update_sales_return_order_rejects_non_pending(self):
order_id = self._create_sales_return_order(self.strict_payload)
self.client.post(
f'/api/v1/sales-return-orders/{order_id}/review/',
{'action': 'approve'},
format='json',
)
payload = {
'customer': self.customer.id,
'warehouse': self.warehouse_relaxed.id,
'return_date': '2025-12-03',
'items': [
{
'product_id': self.product.id,
'quantity': 20,
'num_of_rolls': 1,
'price': '17',
}
],
}
response = self.client.put(f'/api/v1/sales-return-orders/{order_id}/', payload, format='json')
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn('不可修改', response.data['error'])
@override_settings(
CELERY_TASK_ALWAYS_EAGER=True,

View File

@@ -67,12 +67,16 @@ urlpatterns = [
# 库存查询 API
path('inventory/', inventory.InventoryAPIView.as_view(), name='inventory'),
path('purchase-orders/', purchase_views.PurchaseOrderView.as_view(), name='purchase_orders'),
path('purchase-orders/<int:pk>/', purchase_views.PurchaseOrderDetailView.as_view(), name='purchase_order_detail'),
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>/', purchase_return_views.PurchaseReturnOrderDetailView.as_view(), name='purchase_return_order_detail'),
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>/', sales_views.SalesOrderDetailView.as_view(), name='sales_order_detail'),
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>/', sales_return_views.SalesReturnOrderDetailView.as_view(), name='sales_return_order_detail'),
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'),

View File

@@ -27,6 +27,7 @@ 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)
quantity_of_rolls = serializers.SerializerMethodField(read_only=True)
def get_total_amount(self, obj: business_models.PurchaseOrder):
return obj.get_total_amount()
@@ -37,6 +38,9 @@ class PurchaseOrderSerializer(serializers.ModelSerializer):
def get_total_quantity(self, obj: business_models.PurchaseOrder):
return obj.get_total_quantity()
def get_quantity_of_rolls(self, obj: business_models.PurchaseOrder):
return [item.split_quantity_of_rolls() for item in obj.items.all()]
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)
@@ -49,6 +53,7 @@ class PurchaseOrderSerializer(serializers.ModelSerializer):
'total_amount', 'diff_quantity', 'total_quantity',
'operator', 'operator_name', 'warehouse', 'warehouse_name',
'status', 'remarks', 'created_at', 'updated_at', 'items',
'quantity_of_rolls',
]
read_only_fields = ['id', 'created_at', 'updated_at', 'items', 'supplier_name', 'operator_name', 'warehouse_name']
@@ -135,6 +140,73 @@ class PurchaseOrderView(StockChangeViewMixin, views.APIView):
)
class PurchaseOrderDetailView(StockChangeViewMixin, views.APIView):
permission_classes = [IsAuthenticated]
def _get_order(self, request, pk: int):
if not self.check_employee_permission(request):
return None, self.permission_error_response('无权限访问')
merchant = request.user.employee.merchant
try:
order = business_models.PurchaseOrder.objects.select_related(
'supplier', 'operator', 'warehouse'
).prefetch_related('items').get(id=pk, merchant=merchant)
return order, None
except business_models.PurchaseOrder.DoesNotExist:
return None, self.not_found_response('采购单不存在')
def put(self, request, pk: int):
return self._update(request, pk)
def patch(self, request, pk: int):
return self._update(request, pk)
def _update(self, request, pk: int):
purchase_order, error_response = self._get_order(request, pk)
if error_response:
return error_response
merchant = request.user.employee.merchant
data = request.data or {}
supplier = purchase_order.supplier
supplier_id = data.get('supplier')
if supplier_id:
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)
warehouse = purchase_order.warehouse
warehouse_id = data.get('warehouse_id') or data.get('warehouse')
if warehouse_id:
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)
order_date = data.get('order_date') or purchase_order.purchase_date
items = data.get('items')
if not isinstance(items, list) or not items:
return Response({'error': 'items 需要为非空数组'}, status=status.HTTP_400_BAD_REQUEST)
remarks = data.get('remarks', purchase_order.remarks)
try:
updated_order = business_services.update_purchase_order(
purchase_order=purchase_order,
supplier=supplier,
order_date=order_date,
warehouse=warehouse,
items=items,
remarks=remarks,
)
except ValueError as exc:
return Response({'error': str(exc)}, status=status.HTTP_400_BAD_REQUEST)
serializer = PurchaseOrderSerializer(updated_order)
return Response(serializer.data, status=status.HTTP_200_OK)
class PurchaseOrderReviewSerializer(serializers.Serializer):
action = serializers.ChoiceField(choices=[('approve', '审批通过'), ('cancel', '作废')])

View File

@@ -32,6 +32,7 @@ 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)
quantity_of_rolls = 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)
@@ -46,6 +47,9 @@ class PurchaseReturnOrderSerializer(serializers.ModelSerializer):
def get_total_quantity(self, obj: business_models.PurchaseReturnOrder):
return obj.get_total_quantity()
def get_quantity_of_rolls(self, obj: business_models.PurchaseReturnOrder):
return [item.split_quantity_of_rolls() for item in obj.items.all()]
class Meta:
model = business_models.PurchaseReturnOrder
fields = [
@@ -53,6 +57,7 @@ class PurchaseReturnOrderSerializer(serializers.ModelSerializer):
'total_amount', 'diff_quantity', 'total_quantity',
'operator', 'operator_name', 'warehouse', 'warehouse_name',
'status', 'remarks', 'created_at', 'updated_at', 'items',
'quantity_of_rolls',
]
read_only_fields = [
'id', 'created_at', 'updated_at', 'items',
@@ -142,6 +147,75 @@ class PurchaseReturnOrderView(StockChangeViewMixin, views.APIView):
)
class PurchaseReturnOrderDetailView(StockChangeViewMixin, views.APIView):
permission_classes = [IsAuthenticated]
def _get_order(self, request, pk: int):
if not self.check_employee_permission(request):
return None, self.permission_error_response('无权限访问')
merchant = request.user.employee.merchant
try:
order = business_models.PurchaseReturnOrder.objects.select_related(
'supplier', 'operator', 'warehouse'
).prefetch_related('items').get(id=pk, merchant=merchant)
return order, None
except business_models.PurchaseReturnOrder.DoesNotExist:
return None, self.not_found_response('采购退货单不存在')
def put(self, request, pk: int):
return self._update(request, pk)
def patch(self, request, pk: int):
return self._update(request, pk)
def _update(self, request, pk: int):
purchase_return_order, error_response = self._get_order(request, pk)
if error_response:
return error_response
merchant = request.user.employee.merchant
data = request.data or {}
supplier = purchase_return_order.supplier
supplier_id = data.get('supplier')
if supplier_id:
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)
warehouse = purchase_return_order.warehouse
warehouse_id = data.get('warehouse_id') or data.get('warehouse')
if warehouse_id:
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)
return_date = data.get('return_date') or purchase_return_order.return_date
items = data.get('items')
if not isinstance(items, list) or not items:
return Response({'error': 'items 需要为非空数组'}, status=status.HTTP_400_BAD_REQUEST)
remarks = data.get('remarks', purchase_return_order.remarks)
purchase_order_id = data.get('purchase_order')
try:
updated_order = business_services.update_purchase_return_order(
purchase_return_order=purchase_return_order,
supplier=supplier,
return_date=return_date,
warehouse=warehouse,
items=items,
remarks=remarks,
purchase_order_id=purchase_order_id,
)
except ValueError as exc:
return Response({'error': str(exc)}, status=status.HTTP_400_BAD_REQUEST)
serializer = PurchaseReturnOrderSerializer(updated_order)
return Response(serializer.data, status=status.HTTP_200_OK)
class PurchaseReturnOrderReviewSerializer(serializers.Serializer):
action = serializers.ChoiceField(choices=[('approve', '审批通过'), ('cancel', '作废')])

View File

@@ -27,6 +27,7 @@ class SalesOrderSerializer(serializers.ModelSerializer):
total_amount = serializers.SerializerMethodField(read_only=True)
diff_quantity = serializers.SerializerMethodField(read_only=True)
total_quantity = serializers.SerializerMethodField(read_only=True)
quantity_of_rolls = serializers.SerializerMethodField(read_only=True)
def get_total_amount(self, obj: business_models.SalesOrder):
return obj.get_total_amount()
@@ -37,6 +38,9 @@ class SalesOrderSerializer(serializers.ModelSerializer):
def get_total_quantity(self, obj: business_models.SalesOrder):
return obj.get_total_quantity()
def get_quantity_of_rolls(self, obj: business_models.SalesOrder):
return [item.split_quantity_of_rolls() for item in obj.items.all()]
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)
@@ -49,6 +53,7 @@ class SalesOrderSerializer(serializers.ModelSerializer):
'total_amount', 'diff_quantity', 'total_quantity',
'operator', 'operator_name', 'warehouse', 'warehouse_name',
'status', 'remarks', 'created_at', 'updated_at', 'items',
'quantity_of_rolls',
]
read_only_fields = ['id', 'created_at', 'updated_at', 'items', 'customer_name', 'operator_name', 'warehouse_name']
@@ -135,6 +140,73 @@ class SalesOrderView(StockChangeViewMixin, views.APIView):
)
class SalesOrderDetailView(StockChangeViewMixin, views.APIView):
permission_classes = [IsAuthenticated]
def _get_order(self, request, pk: int):
if not self.check_employee_permission(request):
return None, self.permission_error_response('无权限访问')
merchant = request.user.employee.merchant
try:
order = business_models.SalesOrder.objects.select_related(
'customer', 'operator', 'warehouse'
).prefetch_related('items').get(id=pk, merchant=merchant)
return order, None
except business_models.SalesOrder.DoesNotExist:
return None, self.not_found_response('销售单不存在')
def put(self, request, pk: int):
return self._update(request, pk)
def patch(self, request, pk: int):
return self._update(request, pk)
def _update(self, request, pk: int):
sales_order, error_response = self._get_order(request, pk)
if error_response:
return error_response
merchant = request.user.employee.merchant
data = request.data or {}
customer = sales_order.customer
customer_id = data.get('customer')
if customer_id:
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)
warehouse = sales_order.warehouse
warehouse_id = data.get('warehouse_id') or data.get('warehouse')
if warehouse_id:
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)
order_date = data.get('order_date') or sales_order.sales_date
items = data.get('items')
if not isinstance(items, list) or not items:
return Response({'error': 'items 需要为非空数组'}, status=status.HTTP_400_BAD_REQUEST)
remarks = data.get('remarks', sales_order.remarks)
try:
updated_order = business_services.update_sales_order(
sales_order=sales_order,
customer=customer,
order_date=order_date,
warehouse=warehouse,
items=items,
remarks=remarks,
)
except ValueError as exc:
return Response({'error': str(exc)}, status=status.HTTP_400_BAD_REQUEST)
serializer = SalesOrderSerializer(updated_order)
return Response(serializer.data, status=status.HTTP_200_OK)
class SalesOrderReviewSerializer(serializers.Serializer):
action = serializers.ChoiceField(choices=[('approve', '审批通过'), ('cancel', '作废')])

View File

@@ -31,6 +31,7 @@ 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)
quantity_of_rolls = 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)
@@ -45,6 +46,9 @@ class SalesReturnOrderSerializer(serializers.ModelSerializer):
def get_total_quantity(self, obj: business_models.SalesReturnOrder):
return obj.get_total_quantity()
def get_quantity_of_rolls(self, obj: business_models.SalesReturnOrder):
return [item.split_quantity_of_rolls() for item in obj.items.all()]
class Meta:
model = business_models.SalesReturnOrder
fields = [
@@ -141,6 +145,75 @@ class SalesReturnOrderView(StockChangeViewMixin, views.APIView):
)
class SalesReturnOrderDetailView(StockChangeViewMixin, views.APIView):
permission_classes = [IsAuthenticated]
def _get_order(self, request, pk: int):
if not self.check_employee_permission(request):
return None, self.permission_error_response('无权限访问')
merchant = request.user.employee.merchant
try:
order = business_models.SalesReturnOrder.objects.select_related(
'customer', 'operator', 'warehouse'
).prefetch_related('items').get(id=pk, merchant=merchant)
return order, None
except business_models.SalesReturnOrder.DoesNotExist:
return None, self.not_found_response('销售退货单不存在')
def put(self, request, pk: int):
return self._update(request, pk)
def patch(self, request, pk: int):
return self._update(request, pk)
def _update(self, request, pk: int):
sales_return_order, error_response = self._get_order(request, pk)
if error_response:
return error_response
merchant = request.user.employee.merchant
data = request.data or {}
customer = sales_return_order.customer
customer_id = data.get('customer')
if customer_id:
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)
warehouse = sales_return_order.warehouse
warehouse_id = data.get('warehouse_id') or data.get('warehouse')
if warehouse_id:
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)
return_date = data.get('return_date') or sales_return_order.return_date
items = data.get('items')
if not isinstance(items, list) or not items:
return Response({'error': 'items 需要为非空数组'}, status=status.HTTP_400_BAD_REQUEST)
remarks = data.get('remarks', sales_return_order.remarks)
sales_order_id = data.get('sales_order')
try:
updated_order = business_services.update_sales_return_order(
sales_return_order=sales_return_order,
customer=customer,
return_date=return_date,
warehouse=warehouse,
items=items,
remarks=remarks,
sales_order_id=sales_order_id,
)
except ValueError as exc:
return Response({'error': str(exc)}, status=status.HTTP_400_BAD_REQUEST)
serializer = SalesReturnOrderSerializer(updated_order)
return Response(serializer.data, status=status.HTTP_200_OK)
class SalesReturnOrderReviewSerializer(serializers.Serializer):
action = serializers.ChoiceField(choices=[('approve', '审批通过'), ('cancel', '作废')])