diff --git a/server/backend/handlers/ozon_handler.py b/server/backend/handlers/ozon_handler.py index 602c6fc..246d228 100644 --- a/server/backend/handlers/ozon_handler.py +++ b/server/backend/handlers/ozon_handler.py @@ -9,16 +9,17 @@ def last_day_of_month(format: str): last_day_prev_month = first_day_current_month - datetime.timedelta(days=1) return last_day_prev_month.strftime(format) def process_sheet(df,real_arti: int,real_quantity: int,real_sum_1: int,real_sum_2: int): + # выбираем нужные колонки по индексам df = df.iloc[:, [real_arti, real_quantity, real_sum_1, real_sum_2]].copy() + # print("до группировки:", df.iloc[:, 2].sum()) df.dropna(inplace=True) - df = df[(df != 0).all(axis=1)] - + df = df[(df.iloc[:, [1]] != 0).all(axis=1)] # складываем суммы df.iloc[:, 2] += df.iloc[:, 3] df = df.iloc[:, [0, 1, 2]] df.columns = ['arti', 'counts', 'price'] - + # нормализация df['arti'] = df['arti'].replace(Translit.TRANSLIT, regex=True) df['arti'] = df['arti'].astype(str).str.upper().str.extract(f'({settings.PATTERN})') @@ -39,6 +40,11 @@ def process_sheet(df,real_arti: int,real_quantity: int,real_sum_1: int,real_sum_ return validated_rows def evaluating(dfs): validated_rows_1 = process_sheet(dfs["Отчет о реализации"], real_arti=2,real_quantity=8, real_sum_1=5,real_sum_2=6) # номера столбцов от озона - validated_rows_2 = process_sheet(dfs["Отчет о реализации"], real_arti=2,real_quantity=16, real_sum_1=13,real_sum_2=14)# + validated_rows_2 = process_sheet(dfs["Отчет о реализации"], real_arti=2,real_quantity=16, real_sum_1=14,real_sum_2=15)# + sum_1 = sum(row.price for row in validated_rows_1) + sum_2 = sum(row.price for row in validated_rows_2) + + print("Sum for 'Продажа':", sum_1) + print("Sum for 'Возврат':", sum_2) date=last_day_of_month(format=settings.TIMEFORMAT) return validated_rows_1, validated_rows_2, date \ No newline at end of file diff --git a/server/backend/services/excel.py b/server/backend/services/excel.py index 937bfa8..fef11c6 100644 --- a/server/backend/services/excel.py +++ b/server/backend/services/excel.py @@ -87,6 +87,7 @@ class OZONHandler(BaseHandler): doc_creator = DocumentCreation(URL=settings.URL_REPORT) doc_key = doc_creator.create_document( Date=validated_data[2], + ДатаВходящегоДокумента=validated_data[2], ВидОперации=settings.TYPE3, Контрагент_Key=settings.CONTRAGENT_OZON, ДоговорКонтрагента_Key=settings.CONTRACT_OZON,