1
0
forked from erp-dev/erp

fix: business cancel service merged

This commit is contained in:
2026-06-11 15:33:31 +08:00
parent 65564f772a
commit 80db7867f4
18 changed files with 574 additions and 125 deletions

View File

@@ -22,7 +22,7 @@ class CustomerBalanceView(StockChangeViewMixin, views.APIView):
except basic_models.Customer.DoesNotExist:
return self.not_found_response('客户不存在')
balance: Decimal = business_services.BalanceService.get_customer_balance(
balance: Decimal = business_services.BalanceService.get_customer_statement_balance(
merchant=merchant,
customer=customer,
)

View File

@@ -96,6 +96,8 @@ class SalesOrderView(StockChangeViewMixin, views.APIView):
order_date = data.get('order_date')
items = data.get('items', [])
remarks = data.get('remarks', '')
kind = data.get('kind')
if not customer_id:
return Response({'error': '缺少客户 ID'}, status=status.HTTP_400_BAD_REQUEST)
@@ -128,7 +130,9 @@ class SalesOrderView(StockChangeViewMixin, views.APIView):
items=items,
remarks=remarks,
created_by=request.user,
kind=kind,
)
except ValueError as exc:
return Response({'error': str(exc)}, status=status.HTTP_400_BAD_REQUEST)
@@ -199,6 +203,7 @@ class SalesOrderDetailView(StockChangeViewMixin, views.APIView):
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)
kind = data.get('kind')
try:
updated_order = business_services.update_sales_order(
@@ -208,7 +213,9 @@ class SalesOrderDetailView(StockChangeViewMixin, views.APIView):
warehouse=warehouse,
items=items,
remarks=remarks,
kind=kind,
)
except ValueError as exc:
return Response({'error': str(exc)}, status=status.HTTP_400_BAD_REQUEST)