From 48a18cc8437166d62d4e3ad3cb0d5840ad450834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Tue, 31 Mar 2026 15:02:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wizard/property_reconciliation_wizard.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yuthon_property_approval/wizard/property_reconciliation_wizard.py b/yuthon_property_approval/wizard/property_reconciliation_wizard.py index 48126c104..76628b652 100644 --- a/yuthon_property_approval/wizard/property_reconciliation_wizard.py +++ b/yuthon_property_approval/wizard/property_reconciliation_wizard.py @@ -571,7 +571,7 @@ class PropertyReconciliationLine(models.Model): amount = round(line.amount or 0, 2) debt_amount = round(rent - amount, 2) same_month = (due_month == actual_month) and (due_year == actual_year) - no_remark = same_month and (rent == rent_month) + no_remark = same_month and rent == rent_month == amount if no_remark: line.remake = "" continue @@ -583,6 +583,8 @@ class PropertyReconciliationLine(models.Model): # 条件2:rent == amount → 补齐 elif rent_month != rent and rent == amount and amount != 0: line.remake = f'补齐{due_date_str}' + elif rent_month == rent and rent > amount and amount != 0: + line.remake = f'补交{due_date_str}欠 {debt_amount}' continue if (due_month > actual_month and due_year == actual_year) or (due_year > actual_year): line.remake = f'{actual_date_str}预{due_date_str}{debt_str}'