fakz9/Fulfillment-Backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: generation of modules from the server, moved modules fields from the general tab

Browse Source
This commit is contained in:
AlexSserb
2025-03-05 16:54:42 +04:00
parent f8d0f430ac
commit 487174c4ff
8 changed files with 121 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/barcode.py
View File

@@ -135,7 +135,7 @@ class BarcodeService(BaseService):
"barcode_image_url": uploader.get_abs_path(card_product.product.barcode_image.filename),
"num_duplicates": card_product.quantity
})
else:
elif len(card_product.product.barcodes) > 0:
product_request = GetProductBarcodeRequest(
product_id=card_product.product_id,
barcode="",
@@ -148,6 +148,8 @@ class BarcodeService(BaseService):
"template": barcode_template,
"num_duplicates": card_product.quantity
})
else:
print("jaja")
default_generator = DefaultBarcodeGenerator()
filename = f'{card.id}_deal_barcodes.pdf'

49
services/card.py
View File

@@ -368,14 +368,6 @@ class CardsService(BaseService):
card.board_id = request.data.board_id
await self.change_status(card, request.data.status_id, user)
# Updating shipping warehouse
shipping_warehouse_service = ShippingWarehouseService(self.session)
shipping_warehouse = await shipping_warehouse_service.get_by_name(request.data.shipping_warehouse)
if not shipping_warehouse and request.data.shipping_warehouse:
shipping_warehouse = await shipping_warehouse_service.create_by_name(request.data.shipping_warehouse)
card.shipping_warehouse = shipping_warehouse
# Updating manager
if request.data.manager:
card.manager_id = request.data.manager.id
@@ -391,6 +383,47 @@ class CardsService(BaseService):
await self.session.rollback()
return CardUpdateGeneralInfoResponse(ok=False, message=str(e))
async def update_products_and_services_general_info(self, request: ProductsAndServicesGeneralInfoRequest) -> (
ProductsAndServicesGeneralInfoResponse
):
card: Optional[Card] = await self.session.get(Card, request.card_id)
if not card:
raise HTTPException(status_code=404, detail='Карточка не найдена')
# Updating shipping warehouse
shipping_warehouse_service = ShippingWarehouseService(self.session)
shipping_warehouse = await shipping_warehouse_service.get_by_name(request.data.shipping_warehouse)
if not shipping_warehouse and request.data.shipping_warehouse:
shipping_warehouse = await shipping_warehouse_service.create_by_name(request.data.shipping_warehouse)
if card.group:
for card in card.group.cards:
card.is_services_profit_accounted = request.data.is_services_profit_accounted
else:
card.is_services_profit_accounted = request.data.is_services_profit_accounted
card.shipping_warehouse = shipping_warehouse
await self.session.commit()
return ProductsAndServicesGeneralInfoResponse(ok=True, message='Данные карточки успешно обновлены')
async def update_card_manager(self, request: UpdateCardManagerRequest) -> UpdateCardManagerResponse:
card: Optional[Card] = await self.session.get(Card, request.card_id)
if not card:
raise HTTPException(status_code=404, detail='Карточка не найдена')
card.manager_id = request.manager_id
await self.session.commit()
return UpdateCardManagerResponse(ok=True, message='Данные карточки успешно обновлены')
async def update_card_client(self, request: UpdateCardClientRequest) -> UpdateCardClientResponse:
card: Optional[Card] = await self.session.get(Card, request.card_id)
if not card:
raise HTTPException(status_code=404, detail='Карточка не найдена')
card.client_id = request.client_id
await self.session.commit()
return UpdateCardClientResponse(ok=True, message='Данные карточки успешно обновлены')
async def reorder(self, request: CardSummaryReorderRequest, user: User) -> CardSummaryResponse:
card: Card = await self.session.scalar(select(Card).where(Card.id == request.card_id))
if request.index == 1: