Merge branch 'mlh_jzjx_project' into 'master'

Mlh jzjx project

See merge request !34

roke_product_income_expense/controller/main.py

@@ -11,6 +11,7 @@ import os
 import io
 from jinja2 import FileSystemLoader, Environment
 import logging
+
 _logger = logging.getLogger(__name__)
 
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
@@ -37,32 +38,26 @@ class ProductIncomeExpenseIframe(http.Controller):
         try:
             # 获取模型环境
             model = _self.env(user=SUPERUSER_ID)["roke.product.income.expense"]
-            # 查找最新创建的一条数据（按创建时间降序，取第一条）
-            latest_record = model.search([], order="business_date desc,create_date desc", limit=1)
-            if latest_record:
-                data = data_list[0]
-                expenditure = data.get("expenditure")
-                if expenditure in ['', None, False]:
-                    data.update({"expenditure": 0})
-                income = data.get("income")
-                if income in ['', None, False]:
-                    data.update({"income": 0})
-                balance = round(latest_record.balance + float(data.get("income")) - float(data.get("expenditure")), 2)
-            else:
-                # 如果没有找到任何记录
-                balance = round(0 + data_list.get("income") - data_list.get("expenditure"), 2)
             for v in data_list:
-                data = {
-                    "business_date": v.get("business_date"),
-                    "abstract": v.get("abstract"),
-                    "income": v.get("income"),
-                    "machinery_type": v.get("machinery_type", "其他"),
-                    "expenditure": v.get("expenditure"),
-                    "customer": v.get("customer"),
-                    "balance": balance,
-                }
-
                 if v.get("id"):  # 更新
+                    # 获取当前要更新的记录（旧数据）
+                    current_record = model.browse(int(v.get("id")))
+                    if not current_record:
+                        return {"code": 1, "message": f"更新失败，ID为{v.get('id')}的记录不存在"}
+                    # 提取旧数据（用于还原历史影响）
+                    old_income = float(current_record.income or 0)
+                    old_expenditure = float(current_record.expenditure or 0)
+                    old_diff = old_income - old_expenditure  # 旧的收支差额
+                    # 提取更新后的值
+                    new_income = float(v.get("income", 0) or 0)
+                    new_expenditure = float(v.get("expenditure", 0) or 0)
+                    new_diff = new_income - new_expenditure  # 新的收支差额
+                    # 计算差额变化
+                    diff_change = new_diff - old_diff  # 新旧差额的差值
+                    # 当前的一条数据
+                    latest_record = model.search([('id', '=', int(v.get("id")))], order="business_date desc,create_date desc", limit=1)
+
+                    balance = round(latest_record.balance + diff_change, 2);
                     cr.execute("""
                         UPDATE roke_product_income_expense
                            SET business_date = %s,
@@ -74,23 +69,33 @@ class ProductIncomeExpenseIframe(http.Controller):
                                balance = %s
                          WHERE id = %s
                     """, (
-                        data["business_date"], data["abstract"], data["income"],
-                        data["machinery_type"], data["expenditure"], data["customer"],data["balance"],
-                        v["id"]
+                        v.get("business_date"), v.get("abstract"), v.get("income"),
+                        v.get("machinery_type"), v.get("expenditure"), v.get("customer"), balance,
+                        v.get("id")
                     ))
 
                     if cr.rowcount == 0:  # 没有找到对应记录
                         return {"code": 1, "message": "更新失败，没找到对应数据。"}
 
                 else:  # 创建
+                    # 支出
+                    expenditure = float(v.get("expenditure", 0) or 0)
+                    # 收入
+                    income = float(v.get("income", 0) or 0)
+                    # 最新一条数据
+                    latest_record = model.search([], order="business_date desc,create_date desc", limit=1)
+
+                    # 计算结余
+                    balance = round(latest_record.balance + (income - expenditure), 2)
+
                     cr.execute("""
                         INSERT INTO roke_product_income_expense
                             (business_date, abstract, income, machinery_type, expenditure, customer, balance, create_uid, create_date)
                         VALUES (%s, %s, %s, %s, %s, %s, %s, %s,  NOW() - INTERVAL '8 hours')
                     """, (
-                        data["business_date"], data["abstract"], data["income"],
-                        data["machinery_type"], data["expenditure"], data["customer"],
-                        data["balance"],
+                        v.get("business_date"), v.get("abstract"), v.get("income"),
+                        v.get("machinery_type"), v.get("expenditure"), v.get("customer"),
+                        balance,
                         v.get("user_id", 1)  # 默认 user_id 没传的话用 1（管理员）
                     ))
             _self.env.cr.commit()  # 提交事务，防止数据丢失