date 1.3
This commit is contained in:
@@ -3,13 +3,13 @@ from server.backend.schemas.pydantic import ExcelInfo, settings,Translit
|
||||
from server.backend.api.nomenclature import processing
|
||||
import re
|
||||
import datetime
|
||||
def report_date(df, format: str):
|
||||
def report_date(df, date_format: str):
|
||||
row_text = " ".join(df.iloc[0].astype(str))
|
||||
match = re.search(r"\d{4}-\d{2}-\d{2}", row_text)
|
||||
if not match:
|
||||
return None
|
||||
raise ValueError("There is no date in ozon_purchase_handler")
|
||||
dt = datetime.datetime.strptime(match.group(0), "%Y-%m-%d")
|
||||
return dt.strftime(format)
|
||||
return dt.strftime(date_format)
|
||||
def process_sheet(df, real_arti:str, real_quantity:str, real_sum_1:str):
|
||||
df = df.iloc[2:].reset_index(drop=True)
|
||||
#Выборка
|
||||
@@ -38,5 +38,5 @@ def evaluating(dfs):
|
||||
# validated_rows_1 = process_sheet(dfs["Sheet1"], real_arti='Артикул',real_quantity="Количество", real_sum_1='''Сумма выкупа, руб.,
|
||||
# (вкл. НДС)''') # номера столбцов от озона
|
||||
validated_rows_1 = process_sheet(dfs["Sheet1"], real_arti=1,real_quantity=3, real_sum_1=4) # номера столбцов от озона
|
||||
date=report_date(dfs["Sheet1"], format=settings.TIMEFORMAT)
|
||||
date=report_date(dfs["Sheet1"], date_format=settings.TIMEFORMAT)
|
||||
return validated_rows_1, date
|
||||
Reference in New Issue
Block a user