!10919 !10918 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyuse…

Merge pull request !10919 from 李鹏宇/dev
2026-04-16 04:07:07 +00:00
parent f387741813 8bbfa71e2e
commit ec25ef5f79
1 changed files with 1 additions and 1 deletions
@@ -270,7 +270,7 @@ class ExportDateWizard(models.TransientModel):
                    'end_time': (over_line.end_time + timedelta(hours=8)).strftime('%Y-%m-%d %H:%M:%S') if over_line and over_line.end_time else '',
                    'carry_forward_date': record.carry_forward_date,
                    'carry_forward_quantity': record.carry_forward_quantity,
-                    'carry_result': carry_result_dict.get(record.carry_result, '') if record.carry_result else '',
+                    'carry_result': carry_result_dict.get(record.carry_result or (over_line.carry_result if over_line else None), '') if (record.carry_result or (over_line and over_line.carry_result)) else '',
                }
                export_data.append(row_data)