合并分支 'jzjx_project' 到 'master'

Jzjx project

查看合并请求 !15

jzjx_project/models/__init__.py

@@ -3,3 +3,4 @@ from . import inherit_production_task
 from . import inherit_workcenter
 from . import work_log
 from . import inherit_roke_routing
+from . import inherit_ir_http

jzjx_project/models/inherit_ir_http.py

+import base64
+import hashlib
+import os
+import re
+
+from odoo import models, fields, http, api, _
+from odoo.modules.module import get_resource_path, get_module_path
+from odoo.tools.mimetypes import guess_mimetype
+from odoo.tools import consteq, pycompat
+
+
+class InheritIrHttp(models.AbstractModel):
+    _inherit = 'ir.http'
+
+    @classmethod
+    def _binary_ir_attachment_redirect_content(cls, record, default_mimetype='application/octet-stream'):
+        # mainly used for theme images attachemnts
+        base = http.request.env['ir.config_parameter'].sudo().get_param('web.base.url', '')
+        if record.type == 'url' and record.url and base.startswith("https") and "http://121.37.69.162:9000" in record.url:
+            filename = filehash = None
+            mimetype = getattr(record, 'mimetype', False)
+            url = record.url.replace("http://121.37.69.162:9000", "https://minio.xbg.rokeris.com")
+            status = 301
+            content = url
+        else:
+            status = content = filename = filehash = None
+            mimetype = getattr(record, 'mimetype', False)
+            if record.type == 'url' and record.url:
+                # if url in in the form /somehint server locally
+                url_match = re.match("^/(\w+)/(.+)$", record.url)
+                if url_match:
+                    module = url_match.group(1)
+                    module_path = get_module_path(module)
+                    module_resource_path = get_resource_path(module, url_match.group(2))
+
+                    if module_path and module_resource_path:
+                        module_path = os.path.join(os.path.normpath(module_path),
+                                                   '')  # join ensures the path ends with '/'
+                        module_resource_path = os.path.normpath(module_resource_path)
+                        if module_resource_path.startswith(module_path):
+                            with open(module_resource_path, 'rb') as f:
+                                content = base64.b64encode(f.read())
+                            status = 200
+                            filename = os.path.basename(module_resource_path)
+                            mimetype = guess_mimetype(base64.b64decode(content), default=default_mimetype)
+                            filehash = '"%s"' % hashlib.md5(pycompat.to_text(content).encode('utf-8')).hexdigest()
+
+                if not content:
+                    status = 301
+                    content = record.url
+        return status, content, filename, mimetype, filehash

jzjx_project/views/iniherit_work_center_view.xml

@@ -9,9 +9,10 @@
                 <div id="jzjx_work_center_state" class="row" style="display:flex;justify-content: center;align-items: center;font-size: 30px;">
                     <p style="color:#dee2e6;"><field name="deviceState"/></p>
                 </div>
+                <div id="work_center_wo"/>
             </xpath>
             <xpath expr="//div[@id='work_center_empty']" position="replace">
-                <div/>
+                <div id="work_center_empty"/>
             </xpath>
         </field>
     </record>

roke_product_income_expense/controller/main.py

 import datetime
 
+import pandas as pd
+import xlsxwriter
 from odoo import http, tools
+from odoo.http import content_disposition, request
 import os
-
+import io
 from jinja2 import FileSystemLoader, Environment
 import logging
 _logger = logging.getLogger(__name__)
@@ -32,10 +35,19 @@ class ProductIncomeExpenseIframe(http.Controller):
                 "business_date": v.get("business_date", False),
                 "abstract": v.get("abstract", False),
                 "income": v.get("income", False),
-                "expenditure": v.get("expenditure", False)
+                "machinery_type": v.get("machinery_type", "其他"),
+                "expenditure": v.get("expenditure", False),
+                "customer": v.get("customer", False)
             }
-            _self.env(user=v.get("user_id"))["roke.product.income.expense"].create(data)
-        return {"code": 0, "message": "创建成功！"}
+            # 看是否有id，如果有的话就说明是更新，没有的话就说明是创建
+            if v.get("id", False):
+                expense_obj = _self.env["roke.product.income.expense"].sudo().search([("id", "=", v.get("id"))])
+                if not expense_obj:
+                    return {"code": 1, "message": "更新失败，没找到对应数据。"}
+                expense_obj.write(data)
+            else:
+                _self.env(user=v.get("user_id"))["roke.product.income.expense"].create(data)
+        return {"code": 0, "message": "操作成功！"}
 
     @http.route("/roke/product/product_income_expense/get", type="json", auth='none', cors='*', csrf=False)
     def product_income_expense_get_list(self):
@@ -44,10 +56,19 @@ class ProductIncomeExpenseIframe(http.Controller):
         page = _self.jsonrequest.get("page", 1)
         start_date = _self.jsonrequest.get("start_date", "")
         end_date = _self.jsonrequest.get("end_date", "")
+        type_str = _self.jsonrequest.get("type_str", False)  # income收入/expenditure支出
+        machinery_type = _self.jsonrequest.get("machinery_type", False)
+        customer = _self.jsonrequest.get("customer", False)
         domain = []
         if start_date and end_date:
             domain.append(("business_date", ">=", start_date))
             domain.append(("business_date", "<=", end_date))
+        if type_str:
+            domain.append((type_str, ">", 0))
+        if machinery_type:
+            domain.append(("machinery_type", "=", machinery_type))
+        if customer:
+            domain.append(("customer", "ilike", customer))
         data_list = _self.env["roke.product.income.expense"].sudo().search(domain, limit=limit,
                                                                            offset=(page - 1) * limit,
                                                                            order="business_date desc, create_date desc")
@@ -58,9 +79,11 @@ class ProductIncomeExpenseIframe(http.Controller):
                 "id": v.id,
                 "business_date": v.business_date and v.business_date.strftime('%Y-%m-%d'),
                 "abstract": v.abstract or "",
-                "income": v.income or 0,
-                "expenditure": v.expenditure or 0,
-                "balance": v.balance or 0,
+                "customer": v.customer or "",
+                "income": round(v.income, 2) or 0,
+                "machinery_type": v.machinery_type or "其他",
+                "expenditure": round(v.expenditure) or 0,
+                "balance": round(v.balance, 2) or 0,
                 "user_name": v.create_uid.name or "",
                 "create_date": (v.create_date + datetime.timedelta(hours=8)).strftime('%Y-%m-%d %H:%M'),
             })
@@ -77,3 +100,85 @@ class ProductIncomeExpenseIframe(http.Controller):
             return {"code": 1, "message": "删除失败，没找到对应数据。"}
         data.unlink()
         return {"code": 0, "message": "删除成功!"}
+
+    @http.route("/roke/product/product_income_expense/export", type="http", auth='none', cors='*', csrf=False)
+    def get_product_income_expense_export(self, **kwargs):
+        _self = http.request
+        start_date = kwargs.get("start_date", "")
+        end_date = kwargs.get("end_date", "")
+        type_str = kwargs.get("type_str", False)  # income收入/expenditure支出
+        machinery_type = kwargs.get("machinery_type", False)
+        customer = kwargs.get("customer", False)
+        domain = []
+        if start_date and end_date:
+            domain.append(("business_date", ">=", start_date))
+            domain.append(("business_date", "<=", end_date))
+        if type_str:
+            domain.append((type_str, ">", 0.0))
+        if machinery_type:
+            domain.append(("machinery_type", "=", machinery_type))
+        if customer:
+            domain.append(("customer", "ilike", customer))
+        data_list = _self.env["roke.product.income.expense"].sudo().search(domain, order="business_date desc, create_date desc")
+        data = []
+        for v in data_list:
+            data.append({
+                "business_date": v.business_date,
+                "abstract": v.abstract or "",
+                "customer": v.customer or "",
+                "income": v.income or 0,
+                "expenditure": v.expenditure or 0,
+                "balance": v.balance or 0,
+                "machinery_type": v.machinery_type or '其他',
+                "user_name": v.create_uid.name or "",
+                "create_date": v.create_date + datetime.timedelta(hours=8),
+            })
+
+        output = io.BytesIO()
+        workbook = xlsxwriter.Workbook(output, {'in_memory': True})
+        worksheet = workbook.add_worksheet('Sheet1')
+
+        header_format = workbook.add_format({
+            'bold': True, 'border': 1,
+            'fg_color': '#17a2b8', 'font_color': '#FFFFFF',
+            'align': 'center', 'valign': 'vcenter'
+        })
+        date_format = workbook.add_format({'num_format': 'YYYY-MM-DD'})
+        datetime_format = workbook.add_format({'num_format': 'YYYY-MM-DD HH:MM'})
+        currency_format = workbook.add_format({'num_format': '#,##0.00'})  # 逗号作为千分位分隔符
+
+        worksheet.write(0, 0, "业务日期", header_format)
+        worksheet.write(0, 1, "摘要", header_format)
+        worksheet.write(0, 2, "客户", header_format)
+        worksheet.write(0, 3, "收入", header_format)
+        worksheet.write(0, 4, "支出", header_format)
+        worksheet.write(0, 5, "结余", header_format)
+        worksheet.write(0, 6, "类型", header_format)
+        worksheet.write(0, 7, "创建人", header_format)
+        worksheet.write(0, 8, "创建时间", header_format)
+
+        for row_num, row_data in enumerate(data):
+            worksheet.write_datetime(row_num + 1, 0, row_data.get("business_date"), date_format)
+            worksheet.write(row_num + 1, 1, row_data.get("abstract"))
+            worksheet.write(row_num + 1, 2, row_data.get("customer"))
+            worksheet.write_number(row_num + 1, 3, row_data.get("income"), currency_format)
+            worksheet.write_number(row_num + 1, 4, row_data.get("expenditure"), currency_format)
+            worksheet.write_number(row_num + 1, 5, row_data.get("balance"), currency_format)
+            worksheet.write(row_num + 1, 6, row_data.get("machinery_type"))
+            worksheet.write(row_num + 1, 7, row_data.get("user_name"))
+            worksheet.write_datetime(row_num + 1, 8, row_data.get("create_date"), datetime_format)
+
+        workbook.close()
+        output.seek(0)
+
+        file_name = '财务收支记录.xlsx'
+        response = request.make_response(
+            None,
+            headers=[
+                ('Content-Type', 'application/vnd.ms-excel'),
+                ('Content-Disposition', content_disposition(file_name))
+            ]
+        )
+        response.stream.write(output.read())
+        output.close()
+        return response

roke_product_income_expense/models/product_income_expense.py

@@ -14,10 +14,13 @@ class ProductIncomeExpense(models.Model):
     income = fields.Float(string="收入")
     expenditure = fields.Float(string="支出")
     balance = fields.Float(string="结余", compute="_compute_balance")
+    machinery_type = fields.Selection([("烘干桶", "烘干桶"), ("钣金", "钣金"), ("颗粒机", "颗粒机"), ("其他", "其他")],
+                                      default="其他", string="类型")
+    customer = fields.Char(string="客户")
 
     @api.depends("income", "expenditure")
     def _compute_balance(self):
-        data = self.search([("id", "in", self.ids)], order="business_date asc, create_date asc")
+        data = self.search([], order="business_date asc, create_date asc")
         for v in data:
             last_data = self.search([
                 "|",
@@ -28,6 +31,6 @@ class ProductIncomeExpense(models.Model):
                 ("id", "!=", v.id)
             ], limit=1, order="business_date desc, create_date desc")
             if not last_data:
-                v.balance = 0 + v.income - v.expenditure
+                v.balance = round(0 + v.income - v.expenditure, 2)
             else:
-                v.balance = last_data.balance + v.income - v.expenditure
+                v.balance = round(last_data.balance + v.income - v.expenditure, 2)