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 11:20:56 +05:00
parent 56bfadd3ed
commit 67dccea2b8
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,8 +5,8 @@ from typing import Optional
class DeliveryAccessoryEntity(BaseModel): class DeliveryAccessoryEntity(BaseModel):
id: Optional[int] = None id: Optional[int] = None
queue: int queue: int
count: int
accessory_volume: Optional[float] = None accessory_volume: Optional[float] = None
accessory_weight: 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

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

@ -17,7 +17,6 @@ class DeliveryAccessoriesService:
DeliveryAccessoryEntity( DeliveryAccessoryEntity(
id=da.id, id=da.id,
queue=da.queue, queue=da.queue,
count=da.count,
accessory_id=da.accessory_id, accessory_id=da.accessory_id,
delivery_order_id=da.delivery_order_id delivery_order_id=da.delivery_order_id
) )
@ -30,8 +29,8 @@ class DeliveryAccessoriesService:
DeliveryAccessoryEntity( DeliveryAccessoryEntity(
id=da.id, id=da.id,
queue=da.queue, queue=da.queue,
count=da.count,
accessory_volume=da.accessory.volume, accessory_volume=da.accessory.volume,
accessory_weight=da.accessory.weight,
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,
@ -48,7 +47,6 @@ class DeliveryAccessoriesService:
return DeliveryAccessoryEntity( return DeliveryAccessoryEntity(
id=delivery_accessory.id, id=delivery_accessory.id,
queue=delivery_accessory.queue, queue=delivery_accessory.queue,
count=delivery_accessory.count,
accessory_id=delivery_accessory.accessory_id, accessory_id=delivery_accessory.accessory_id,
delivery_order_id=delivery_accessory.delivery_order_id delivery_order_id=delivery_accessory.delivery_order_id
) )
@ -65,7 +63,6 @@ class DeliveryAccessoriesService:
return DeliveryAccessoryEntity( return DeliveryAccessoryEntity(
id=created_delivery_accessory.id, id=created_delivery_accessory.id,
queue=created_delivery_accessory.queue, queue=created_delivery_accessory.queue,
count=created_delivery_accessory.count,
accessory_id=created_delivery_accessory.accessory_id, accessory_id=created_delivery_accessory.accessory_id,
delivery_order_id=created_delivery_accessory.delivery_order_id delivery_order_id=created_delivery_accessory.delivery_order_id
) )
@ -82,7 +79,6 @@ class DeliveryAccessoriesService:
return DeliveryAccessoryEntity( return DeliveryAccessoryEntity(
id=delivery_accessory_model.id, id=delivery_accessory_model.id,
queue=delivery_accessory_model.queue, queue=delivery_accessory_model.queue,
count=delivery_accessory_model.count,
accessory_id=delivery_accessory_model.accessory_id, accessory_id=delivery_accessory_model.accessory_id,
delivery_order_id=delivery_accessory_model.delivery_order_id delivery_order_id=delivery_accessory_model.delivery_order_id
) )

1
app/infrastructure/database/models/delivery_accessories.py
View File

@ -9,7 +9,6 @@ class DeliveryAccessory(Base):
id = Column(Integer, primary_key=True, autoincrement=True) id = Column(Integer, primary_key=True, autoincrement=True)
queue = Column(Integer, nullable=False) queue = Column(Integer, nullable=False)
count = Column(Integer, nullable=False)
accessory_id = Column(Integer, ForeignKey('accessories.id')) accessory_id = Column(Integer, ForeignKey('accessories.id'))
delivery_order_id = Column(Integer, ForeignKey('delivery_orders.id')) delivery_order_id = Column(Integer, ForeignKey('delivery_orders.id'))