MNPC/RasadDam_Backend
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/MNPC-IR/Rasaddam_Backend into development

Browse Source
This commit is contained in:
Mojtaba-z
2025-12-14 14:14:46 +03:30
parent 3767bf0032 99382817c1
commit 0730cadbaa
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/warehouse/services/excel/excel_processing.py
View File

@@ -249,6 +249,7 @@ class WareHouseExcelViewSet(viewsets.ModelViewSet, ExcelDynamicSearchMixin):
"ردیف", "ردیف",
"تعاونی دامدار", "تعاونی دامدار",
"کد ملی دامدار", "کد ملی دامدار",
"نام و نام خانوادگی دامدار",
"تاریخ", "تاریخ",
"محصولات", "محصولات",
"شناسه تراکنش", "شناسه تراکنش",
@@ -308,6 +309,7 @@ class WareHouseExcelViewSet(viewsets.ModelViewSet, ExcelDynamicSearchMixin):
rancher_data = data.get('rancher') rancher_data = data.get('rancher')
national_code = rancher_data.get('national_code', '-') if rancher_data else '-' national_code = rancher_data.get('national_code', '-') if rancher_data else '-'
rancher_name = data.get('rancher_fullname', '-') if rancher_data else '-'
seller_org = data.get('seller_organization') seller_org = data.get('seller_organization')
org_name = seller_org.get('name', '-') if seller_org else '-' org_name = seller_org.get('name', '-') if seller_org else '-'
@@ -329,6 +331,7 @@ class WareHouseExcelViewSet(viewsets.ModelViewSet, ExcelDynamicSearchMixin):
m, m,
org_name, org_name,
national_code, national_code,
rancher_name,
str(shamsi_date(convert_str_to_date(data['transaction_date']), in_value=True)) if data.get( str(shamsi_date(convert_str_to_date(data['transaction_date']), in_value=True)) if data.get(
'transaction_date') else '', 'transaction_date') else '',
products_str, products_str,
@@ -364,6 +367,7 @@ class WareHouseExcelViewSet(viewsets.ModelViewSet, ExcelDynamicSearchMixin):
'', '',
'', '',
'', '',
'',
total_price, total_price,
'', '',
] ]