change order apis
This commit is contained in:
@@ -2,7 +2,7 @@ from django.db import transaction
|
||||
|
||||
from rest_framework import serializers
|
||||
|
||||
from core.apps.orders.models import Order, OrderApplication
|
||||
from core.apps.orders.models import Order
|
||||
# products
|
||||
from core.apps.products.models import Product, Unity
|
||||
from core.apps.products.serializers.product import ProductListSerializer
|
||||
@@ -35,7 +35,7 @@ class OrderCreateSerializer(serializers.Serializer):
|
||||
wherehouse = WhereHouse.objects.get(id=data['wherehouse_id'])
|
||||
project = Project.objects.get(id=data['project_id'])
|
||||
if data.get('project_department_id'):
|
||||
project_department = ProjectDepartment.objects.get(
|
||||
ProjectDepartment.objects.get(
|
||||
id=data['project_department_id']
|
||||
)
|
||||
except Product.DoesNotExist:
|
||||
@@ -57,7 +57,20 @@ class OrderCreateSerializer(serializers.Serializer):
|
||||
data['wherehouse'] = wherehouse
|
||||
data['project'] = project
|
||||
return data
|
||||
|
||||
|
||||
def create(self, validated_data):
|
||||
with transaction.atomic():
|
||||
order = Order.objects.create(
|
||||
product=validated_data.get('product'),
|
||||
unity=validated_data.get('unity'),
|
||||
wherehouse=validated_data.get('wherehouse'),
|
||||
project=validated_data.get('project'),
|
||||
project_department=validated_data.get('project_department'),
|
||||
quantity=validated_data.get('quantity'),
|
||||
date=validated_data.get('date')
|
||||
)
|
||||
return order
|
||||
|
||||
|
||||
class OrderListSerializer(serializers.ModelSerializer):
|
||||
product = ProductListSerializer()
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
from rest_framework import serializers
|
||||
|
||||
from core.apps.orders.models import OrderApplication, Order
|
||||
from core.apps.orders.serializers.order import OrderCreateSerializer, OrderListSerializer
|
||||
|
||||
|
||||
class OrderApplicationCreateSerializer(serializers.Serializer):
|
||||
orders = serializers.ListSerializer(child=OrderCreateSerializer())
|
||||
|
||||
def create(self, validated_data):
|
||||
employee = self.context.get('user')
|
||||
orders_data = validated_data.pop('orders')
|
||||
application = OrderApplication.objects.create(
|
||||
employee=employee, status="NEW"
|
||||
)
|
||||
|
||||
order_objs = []
|
||||
for order_data in orders_data:
|
||||
order_objs.append(Order(
|
||||
product=order_data['product'],
|
||||
unity=order_data['unity'],
|
||||
quantity=order_data['quantity'],
|
||||
wherehouse=order_data['wherehouse'],
|
||||
project=order_data['project'],
|
||||
project_department=order_data.get('project_department'),
|
||||
date=order_data['date']
|
||||
))
|
||||
|
||||
created_orders = Order.objects.bulk_create(order_objs)
|
||||
application.orders.add(*created_orders)
|
||||
return application
|
||||
|
||||
|
||||
class OrderApplicationListSerializer(serializers.ModelSerializer):
|
||||
orders = OrderListSerializer(many=True)
|
||||
|
||||
class Meta:
|
||||
model = OrderApplication
|
||||
fields = [
|
||||
'id', 'employee', 'status', 'orders'
|
||||
]
|
||||
Reference in New Issue
Block a user