Numerum/API_logistics
Numerum/API_logistics
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

._.

Browse Source
This commit is contained in:
Андрей Дувакин 2024-10-08 08:26:56 +05:00
parent 030e4eac24
commit 56bfadd3ed
5 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/core/entities/delivery_accessory.py
View File

@ -6,6 +6,7 @@ class DeliveryAccessoryEntity(BaseModel):
id: Optional[int] = None id: Optional[int] = None
queue: int queue: int
count: int count: int
accessory_volume: Optional[float] = None
accessory_id: Optional[int] = None accessory_id: Optional[int] = None
accessory_name: Optional[str] = None accessory_name: Optional[str] = None
city_name: Optional[str] = None city_name: Optional[str] = None

1
app/core/entities/delivery_order.py
View File

@ -12,6 +12,7 @@ class DeliveryOrderEntity(BaseModel):
estimated_route_time_in_minutes: Optional[int] = None estimated_route_time_in_minutes: Optional[int] = None
route: Optional[List[List[float]]] = None route: Optional[List[List[float]]] = None
truck_name: Optional[str] = None truck_name: Optional[str] = None
truck_capacity: Optional[float] = None
truck_id: Optional[int] = None truck_id: Optional[int] = None
total_order_id: Optional[int] = None total_order_id: Optional[int] = None

1
app/core/usecases/delivery_accessory_service.py
View File

@ -31,6 +31,7 @@ class DeliveryAccessoriesService:
id=da.id, id=da.id,
queue=da.queue, queue=da.queue,
count=da.count, count=da.count,
accessory_volume=da.accessory.volume,
accessory_id=da.accessory_id, accessory_id=da.accessory_id,
delivery_order_id=da.delivery_order_id, delivery_order_id=da.delivery_order_id,
accessory_name=da.accessory.name, accessory_name=da.accessory.name,

3
app/core/usecases/delivery_order_service.py
View File

@ -22,6 +22,7 @@ class DeliveryOrdersService:
price=round(o.price, 2), price=round(o.price, 2),
truck_id=o.truck_id, truck_id=o.truck_id,
truck_name=o.truck.name, truck_name=o.truck.name,
truck_capacity=o.truck.capacity,
total_order_id=o.total_order_id, total_order_id=o.total_order_id,
estimated_route_time_in_minutes=o.estimated_route_time_in_minutes, estimated_route_time_in_minutes=o.estimated_route_time_in_minutes,
) )
@ -39,6 +40,7 @@ class DeliveryOrdersService:
price=o.price, price=o.price,
truck_id=o.truck_id, truck_id=o.truck_id,
truck_name=o.truck.name, truck_name=o.truck.name,
truck_capacity=o.truck.capacity,
total_order_id=o.total_order_id, total_order_id=o.total_order_id,
estimated_route_time_in_minutes=o.estimated_route_time_in_minutes, estimated_route_time_in_minutes=o.estimated_route_time_in_minutes,
route=o.route, route=o.route,
@ -57,6 +59,7 @@ class DeliveryOrdersService:
price=delivery_order.price, price=delivery_order.price,
truck_id=delivery_order.truck_id, truck_id=delivery_order.truck_id,
truck_name=delivery_order.truck.name, truck_name=delivery_order.truck.name,
truck_capacity=delivery_order.truck.capacity,
total_order_id=delivery_order.total_order_id, total_order_id=delivery_order.total_order_id,
estimated_route_time_in_minutes=delivery_order.estimated_route_time_in_minutes, estimated_route_time_in_minutes=delivery_order.estimated_route_time_in_minutes,
route=delivery_order.route, route=delivery_order.route,

2
app/core/usecases/new_total_order_service.py
View File

@ -85,7 +85,7 @@ class NewTotalOrderService:
new_delivery_accessory = DeliveryAccessory( new_delivery_accessory = DeliveryAccessory(
queue=point_index + 1, queue=point_index + 1,
count=accessory.count, count=round(accessory.count * self.robotsCount / 100),
accessory_id=accessory.id, accessory_id=accessory.id,
delivery_order_id=new_delivery_order.id, delivery_order_id=new_delivery_order.id,
) )