From b184dbb234058d0326ac8ee782ba7d27fa917bb9 Mon Sep 17 00:00:00 2001 From: "MH.Dmitrii" Date: Tue, 6 Jan 2026 15:57:12 +0300 Subject: [PATCH] date 1.2 --- server/backend/handlers/wb_purchases_handler.py | 4 +--- server/backend/schemas/pydantic.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/server/backend/handlers/wb_purchases_handler.py b/server/backend/handlers/wb_purchases_handler.py index 1c58ebb..1452ba4 100644 --- a/server/backend/handlers/wb_purchases_handler.py +++ b/server/backend/handlers/wb_purchases_handler.py @@ -14,9 +14,7 @@ def process_sheet(df, real_arti:str, real_quantity:str, real_sum_1:str): df = df.iloc[2:].reset_index(drop=True) #Выборка df = df.iloc[:, [real_arti, real_quantity, real_sum_1]].copy().dropna() - #df = df[[real_arti, real_quantity, real_sum_1]].copy().dropna() #copy and drop all NA values df = df[(df != 0).all(axis=1)] #drop all 0 values - #df = df[[real_arti, real_quantity, real_sum_1]] df.rename(columns={"Unnamed: 1": 'arti', "Unnamed: 3": 'counts', "Unnamed: 4": 'price'}, inplace=True) #переименовываем для pydantic #Нормализация df['arti'] = df['arti'].astype(str).str.upper().str.extract(f'({settings.PATTERN})') #arti под regex @@ -26,7 +24,7 @@ def process_sheet(df, real_arti:str, real_quantity:str, real_sum_1:str): #Группировка df = df.groupby('arti', as_index=False).agg({'counts': 'sum', 'price': 'sum'}) #groupping - #df = processing(df) #vlookup for ref_keys + df = processing(df) #vlookup for ref_keys validated_rows, errors = [], [] for i, row in df.iterrows(): #проходит построчно по df, где i - индекс строки, row - данные строки try: diff --git a/server/backend/schemas/pydantic.py b/server/backend/schemas/pydantic.py index 3ada5e7..ac6b70b 100644 --- a/server/backend/schemas/pydantic.py +++ b/server/backend/schemas/pydantic.py @@ -4,7 +4,7 @@ class ExcelInfo(BaseModel): arti:str = Field(..., min_length=5, max_length=12, description="arti of the clothes") counts:int = Field(..., gt=0, description="the quantity of the clothes") price:float = Field(..., gt=0, description="the price of the clothes") - #ref_key:str = Field(..., description="reffering key from db") + ref_key:str = Field(..., description="reffering key from db") class ExcelRealization(BaseModel): pass class ExcelReturning(BaseModel):