From 1dc55c277010c5259cba3a5402c6c7ff10d95469 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Mon, 2 Sep 2024 09:04:42 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8D=E8=89=AF?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/controllers/controllers.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py
index 35f4a257..5168173e 100644
--- a/sf_machine_connect/controllers/controllers.py
+++ b/sf_machine_connect/controllers/controllers.py
@@ -312,9 +312,22 @@ class Sf_Dashboard_Connect(http.Controller):
                 # 工单计划量
                 plan_data_plan_counts = plan_obj.search_count(
                     [('production_line_id.name', '=', line), ('state', 'not in', ['finished'])])
-                # 工单不良累计
-                plan_data_fault_counts = plan_obj.search_count(
-                    [('production_line_id.name', '=', line), ('production_id.state', 'in', ['scrap', 'cancel'])])
+                # # 工单不良累计
+                # plan_data_fault_counts = plan_obj.search_count(
+                #     [('production_line_id.name', '=', line), ('production_id.detection_result_ids.state', 'in', ['返工', '报废'])])
+
+                # 查找符合条件的生产计划记录
+                plan_data = plan_obj.search([
+                    ('production_line_id.name', '=', line),
+                ])
+
+                # 过滤出那些检测结果状态为 '返工' 或 '报废' 的记录
+                faulty_plans = plan_data.filtered(lambda p: any(
+                    result.test_results in ['返工', '报废'] for result in p.production_id.detection_result_ids
+                ))
+
+                # 计算符合条件的记录数量
+                plan_data_fault_counts = len(faulty_plans)
 
                 # 工单返工数量
 

From eec79d7d3e6ccc70c5deaeee149f246c56f0e2f9 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 5 Sep 2024 10:30:04 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=BAurl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/controllers/controllers.py | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py
index 5168173e..6e661f46 100644
--- a/sf_machine_connect/controllers/controllers.py
+++ b/sf_machine_connect/controllers/controllers.py
@@ -15,7 +15,7 @@ db_config = {
     "user": "postgres",
     "password": "postgres",
     "port": "5432",
-    "host": "172.16.10.98"
+    "host": "172.16.10.113"
 }
 
 
@@ -162,7 +162,8 @@ class Sf_Dashboard_Connect(http.Controller):
                         'first_online_duration': first_online_duration,
                         # 停机时间：关机时间 - 运行时间
                         # 停机时长：关机时间 - 初次上线时间
-                        'img': f'data:image/png;base64,{machine_data.machine_tool_picture.decode("utf-8")}',
+                        # 'img': f'data:image/png;base64,{machine_data.machine_tool_picture.decode("utf-8")}',
+                        'img': f'https://xt.sf.jikimo.com/equipment/get_image/{machine_data.id}',
                         'equipment_type': machine_data.category_id.name,
                     })
 
@@ -843,3 +844,21 @@ class Sf_Dashboard_Connect(http.Controller):
         # 返回数据
         res['data'] = oee_data
         return json.dumps(res)
+
+    @http.route(['/equipment/get_image/<int:record_id>'], type='http', auth="public", website=True)
+    def get_image(self, record_id, **kwargs):
+        # 获取模型中的记录
+        record = request.env['maintenance.equipment'].sudo().browse(record_id)
+
+        # 获取图片字段的数据
+        image_data_base64 = record.machine_tool_picture
+
+        if image_data_base64:
+            # 将Base64解码为二进制数据
+            image_data_binary = base64.b64decode(image_data_base64)
+
+            # 返回图片数据，并设置正确的Content-Type
+            return request.make_response(image_data_binary, headers=[('Content-Type', 'image/png')])
+        else:
+            # 如果没有图片数据，返回404
+            return request.not_found()

From 0ae7424f043136bbaf9a6449d81933e70d24fb93 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Tue, 10 Sep 2024 16:12:24 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=A2=9E=E5=8A=A0=E8=B0=83=E7=94=A8=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/models/res_config_setting.py   |  4 ++++
 .../views/res_config_settings_views.xml           | 15 +++++++++++++++
 sf_manufacturing/models/mrp_workorder.py          | 14 ++++++++++++--
 sf_manufacturing/views/mrp_workorder_view.xml     |  5 +++++
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/sf_machine_connect/models/res_config_setting.py b/sf_machine_connect/models/res_config_setting.py
index c0bdf597..60862ccf 100644
--- a/sf_machine_connect/models/res_config_setting.py
+++ b/sf_machine_connect/models/res_config_setting.py
@@ -16,6 +16,7 @@ class ResBFMConfigSettings(models.TransientModel):
     #      ("https://bfm.jikimo.com", "正式环境(https://bfm.jikimo.com)")], string='bfm环境', store=True)
 
     bfm_url_new = fields.Char('业务平台环境路径', placeholder='请输入当前对应的业务平台环境路径')
+    get_check_file_path = fields.Char('获取检查文件路径', default='')
 
     @api.model
     def get_values(self):
@@ -26,9 +27,11 @@ class ResBFMConfigSettings(models.TransientModel):
         values = super(ResBFMConfigSettings, self).get_values()
         config = self.env['ir.config_parameter'].sudo()
         bfm_url_new = config.get_param('bfm_url_new', default='')
+        get_check_file_path = config.get_param('get_check_file_path', default='')
 
         values.update(
             bfm_url_new=bfm_url_new,
+            get_check_file_path=get_check_file_path
         )
         return values
 
@@ -36,3 +39,4 @@ class ResBFMConfigSettings(models.TransientModel):
         super(ResBFMConfigSettings, self).set_values()
         ir_config = self.env['ir.config_parameter'].sudo()
         ir_config.set_param("bfm_url_new", self.bfm_url_new or "")
+        ir_config.set_param("get_check_file_path", self.get_check_file_path or "")
diff --git a/sf_machine_connect/views/res_config_settings_views.xml b/sf_machine_connect/views/res_config_settings_views.xml
index 4ad5b0e7..fa3ba59c 100644
--- a/sf_machine_connect/views/res_config_settings_views.xml
+++ b/sf_machine_connect/views/res_config_settings_views.xml
@@ -18,6 +18,21 @@
                                             <field name="bfm_url_new" string="业务平台访问地址"/>
                                         </div>
                                     </div>
+<!--                                 </div> -->
+                            </div>
+                        </div>
+                    </div>
+                    <div>
+                        <h2>获取检测报告服务配置</h2>
+                        <div class="row mt16 o_settings_container" id="jd_api">
+                            <div class="col-12 col-lg-6 o_setting_box">
+                                <div class="o_setting_left_pane"/>
+                                    <div class="o_setting_right_pane">
+                                        <div class="text-muted">
+                                            <label for="get_check_file_path" />
+                                            <field name="get_check_file_path" string="检测报告服务地址"/>
+                                        </div>
+                                    </div>
 <!--                                 </div> -->
                             </div>
                         </div>
diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index a5e20ff7..2e77bcdd 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -414,12 +414,10 @@ class ResMrpWorkOrder(models.Model):
 
     # 获取三次元检测点数据
     def get_three_check_datas(self):
-        factory_nick_name = 'XT'
         ftp_resconfig = self.env['res.config.settings'].get_values()
         ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']),
                             ftp_resconfig['ftp_user'],
                             ftp_resconfig['ftp_password'])
-        # ftp.connect()
 
         local_dir_path = '/ftp/before'
         os.makedirs(local_dir_path, exist_ok=True)
@@ -428,6 +426,17 @@ class ResMrpWorkOrder(models.Model):
         logging.info('local_file_path:%s' % local_file_path)
         remote_path = '/home/ftp/ftp_root/ThreeTest/XT/Before/' + local_filename
         logging.info('remote_path:%s' % remote_path)
+        # if not ftp.file_exists(remote_path):
+        paload_data = {
+            "filename": local_filename
+        }
+        if not ftp_resconfig['get_check_file_path']:
+            raise UserError('请先配置获取检测报告地址')
+        url = ftp_resconfig['get_check_file_path'] + '/get/check/report'
+        response = requests.post(url, json=paload_data)
+        logging.info('response:%s' % response.json())
+        if response.json().get('detail'):
+            raise UserError(response.json().get('detail'))
 
         if not ftp.file_exists(remote_path):
             raise UserError(f"文件不存在: {remote_path}")
@@ -540,6 +549,7 @@ class ResMrpWorkOrder(models.Model):
             raise UserError('PT10点未测或数据错误')
 
         self.data_state = True
+        self.getcenter()
 
         return True
 
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 7cada1be..bb451f51 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -513,6 +513,11 @@
 
             </xpath>
 
+            <xpath expr="//form//header" position="inside">
+                <button type="object" class="oe_highlight" name="get_three_check_datas" string="获取数据"
+                attrs='{"invisible": [("state","!=","progress")]}'/>
+            </xpath>
+
 
             <xpath expr="//page[1]" position="before">
                 <field name="results" invisible="1"/>

From f6a9c97e7f7ef8dc50b9127df4070225aedcc867 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 11 Sep 2024 08:51:01 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=A7=E9=87=8F?=
 =?UTF-8?q?=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/controllers/controllers.py | 29 +++++++++++--------
 sf_plan/models/custom_plan.py                 | 25 ++++++++++++++--
 2 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py
index 6e661f46..6f692bde 100644
--- a/sf_machine_connect/controllers/controllers.py
+++ b/sf_machine_connect/controllers/controllers.py
@@ -301,21 +301,21 @@ class Sf_Dashboard_Connect(http.Controller):
 
         try:
             plan_obj = request.env['sf.production.plan'].sudo()
+            production_obj = request.env['mrp.production'].sudo()
             line_list = ast.literal_eval(kw['line_list'])
             print('line_list: %s' % line_list)
             for line in line_list:
-                plan_data = plan_obj.search([('production_line_id.name', '=', line)])
-                # 工单总量
-                plan_data_total_counts = plan_obj.search_count([('production_line_id.name', '=', line)])
+
+                # 工单计划量
+                plan_data_total_counts = production_obj.search_count(
+                    [('production_line_id.name', '=', line), ('state', 'not in', ['cancel']),
+                     ('active', '=', True)])
                 # 工单完成量
                 plan_data_finish_counts = plan_obj.search_count(
                     [('production_line_id.name', '=', line), ('state', 'in', ['finished'])])
-                # 工单计划量
-                plan_data_plan_counts = plan_obj.search_count(
-                    [('production_line_id.name', '=', line), ('state', 'not in', ['finished'])])
-                # # 工单不良累计
-                # plan_data_fault_counts = plan_obj.search_count(
-                #     [('production_line_id.name', '=', line), ('production_id.detection_result_ids.state', 'in', ['返工', '报废'])])
+                # # 工单计划量
+                # plan_data_plan_counts = plan_obj.search_count(
+                #     [('production_line_id.name', '=', line), ('state', 'not in', ['finished'])])
 
                 # 查找符合条件的生产计划记录
                 plan_data = plan_obj.search([
@@ -327,8 +327,13 @@ class Sf_Dashboard_Connect(http.Controller):
                     result.test_results in ['返工', '报废'] for result in p.production_id.detection_result_ids
                 ))
 
+                # 查找制造订单取消与归档的数量
+                cancel_order_count = production_obj.search_count(
+                    [('production_line_id.name', '=', line), ('state', 'in', ['cancel']),
+                     ('active', '=', False)])
+
                 # 计算符合条件的记录数量
-                plan_data_fault_counts = len(faulty_plans)
+                plan_data_fault_counts = len(faulty_plans) + cancel_order_count
 
                 # 工单返工数量
 
@@ -340,13 +345,13 @@ class Sf_Dashboard_Connect(http.Controller):
                     (plan_data_finish_counts / plan_data_total_counts if plan_data_total_counts > 0 else 0), 3)
 
                 # 工单进度偏差
-                plan_data_progress_deviation = plan_data_finish_counts - plan_data_plan_counts
+                plan_data_progress_deviation = plan_data_total_counts - plan_data_finish_counts - plan_data_fault_counts
 
                 if plan_data:
                     data = {
                         'plan_data_total_counts': plan_data_total_counts,
                         'plan_data_finish_counts': plan_data_finish_counts,
-                        'plan_data_plan_counts': plan_data_plan_counts,
+                        'plan_data_plan_counts': plan_data_total_counts,
                         'plan_data_fault_counts': plan_data_fault_counts,
                         'finishe_rate': finishe_rate,
                         'plan_data_progress_deviation': plan_data_progress_deviation,
diff --git a/sf_plan/models/custom_plan.py b/sf_plan/models/custom_plan.py
index c4043d33..b3bd6ff6 100644
--- a/sf_plan/models/custom_plan.py
+++ b/sf_plan/models/custom_plan.py
@@ -18,7 +18,8 @@ class sf_production_plan(models.Model):
         ('draft', '待排程'),
         ('done', '已排程'),
         ('processing', '加工中'),
-        ('finished', '已完成')
+        ('finished', '已完成'),
+        ('cancel', '已取消')
     ], string='状态', tracking=True)
 
     state_order = fields.Integer(compute='_compute_state_order', store=True)
@@ -37,7 +38,7 @@ class sf_production_plan(models.Model):
     _order = 'state_order asc, write_date desc'
 
     name = fields.Char(string='制造订单')
-    # active = fields.Boolean(string='已归档', default=True)
+    active = fields.Boolean(string='已归档', default=True)
     # selected = fields.Boolean(default=False)
     # order_number = fields.Char(string='订单号')
     order_deadline = fields.Datetime(string='订单交期')
@@ -385,3 +386,23 @@ class machine_work_schedule(models.Model):
     _description = '机台作业计划'
 
     name = fields.Char(string='机台名')
+
+
+class MrpProductionInheritForPlan(models.Model):
+    _inherit = 'mrp.production'
+
+    def button_cancel(self):
+        # 调用父类的取消操作
+        res = super(MrpProductionInheritForPlan, self).button_cancel()
+        # 更新 sf.production.plan 模型的 state 为 'cancel'
+        self.env['sf.production.plan'].search([('production_id', '=', self.id)]).write({'state': 'cancel'})
+        return res
+
+    def toggle_active(self):
+        # 调用父类方法切换 active 状态
+        res = super(MrpProductionInheritForPlan, self).toggle_active()
+        self.env['sf.production.plan'].search(
+            [('production_id', '=', self.id), '|', ('active', '=', False), ('active', '=', True)]).write(
+            {'active': self.active})
+
+        return res

From 4394dd023ed62d37db4a60942e25983321f9d8da Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 11 Sep 2024 10:11:22 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=A4=E4=BB=98?=
 =?UTF-8?q?=E5=87=86=E6=97=B6=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/controllers/controllers.py | 40 +++++++++++++++++--
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py
index 6f692bde..9702b6e4 100644
--- a/sf_machine_connect/controllers/controllers.py
+++ b/sf_machine_connect/controllers/controllers.py
@@ -6,7 +6,7 @@ import base64
 import logging
 import psycopg2
 from datetime import datetime, timedelta
-from odoo import http
+from odoo import http, fields
 from odoo.http import request
 
 # 数据库连接配置
@@ -347,6 +347,32 @@ class Sf_Dashboard_Connect(http.Controller):
                 # 工单进度偏差
                 plan_data_progress_deviation = plan_data_total_counts - plan_data_finish_counts - plan_data_fault_counts
 
+                # 交付准时率
+                plan_data_finish_orders = plan_obj.search(
+                    [('production_line_id.name', '=', line), ('state', 'in', ['finished'])])
+
+                delay_num = 0
+                for plan in plan_data_finish_orders:
+                    sale_obj = request.env['sale.order'].sudo().search([('name', '=', plan.origin)])
+                    if sale_obj:
+                        if sale_obj.deadline_of_delivery and plan.actual_end_time:
+                            # 将 deadline_of_delivery 转换为字符串
+                            date_as_string = sale_obj.deadline_of_delivery.strftime('%Y-%m-%d')
+                            # 然后使用 strptime 将字符串转换为 datetime 对象
+                            date_as_datetime = datetime.strptime(date_as_string, '%Y-%m-%d')
+
+                            # 将 actual_end_time 转换为 datetime 对象
+                            datetime_value = fields.Datetime.from_string(plan.actual_end_time)
+
+                            # 给 datetime_value 加1天
+                            new_datetime_value = datetime_value + timedelta(days=1)
+
+                            # 比较 new_datetime_value 和 date_as_datetime 的大小
+                            if new_datetime_value.date() > date_as_datetime.date():
+                                delay_num += 1
+                delay_rate = round((delay_num / plan_data_finish_counts if plan_data_finish_counts > 0 else 0), 3)
+                on_time_rate = 1 - delay_rate
+
                 if plan_data:
                     data = {
                         'plan_data_total_counts': plan_data_total_counts,
@@ -355,7 +381,8 @@ class Sf_Dashboard_Connect(http.Controller):
                         'plan_data_fault_counts': plan_data_fault_counts,
                         'finishe_rate': finishe_rate,
                         'plan_data_progress_deviation': plan_data_progress_deviation,
-                        'plan_data_rework_counts': plan_data_rework_counts
+                        'plan_data_rework_counts': plan_data_rework_counts,
+                        'on_time_rate': on_time_rate
                     }
                     res['data'][line] = data
 
@@ -514,10 +541,15 @@ class Sf_Dashboard_Connect(http.Controller):
         for line in line_list:
             # 未完成订单
             not_done_orders = plan_obj.search(
-                [('production_line_id.name', '=', line), ('state', 'not in', ['finished'])])
+                [('production_line_id.name', '=', line), ('state', 'not in', ['finished']),
+                 ('production_id.state', 'not in', ['cancel']), ('active', '=', True)
+                 ])
             print(not_done_orders)
             # 完成订单
-            finish_orders = plan_obj.search([('production_line_id.name', '=', line), ('state', 'in', ['finished'])])
+            finish_orders = plan_obj.search([
+                ('production_line_id.name', '=', line), ('state', 'in', ['finished']),
+                ('production_id.state', 'not in', ['cancel']), ('active', '=', True)
+            ])
             print(finish_orders)
 
             # 获取所有未完成订单的ID列表

From 96eeb1cab74584063062032c61414f0d9ee353bc Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 11 Sep 2024 11:45:14 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E9=87=8F=E3=80=81=E5=90=88=E6=A0=BC=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/controllers/controllers.py | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py
index 9702b6e4..8802a5be 100644
--- a/sf_machine_connect/controllers/controllers.py
+++ b/sf_machine_connect/controllers/controllers.py
@@ -333,7 +333,8 @@ class Sf_Dashboard_Connect(http.Controller):
                      ('active', '=', False)])
 
                 # 计算符合条件的记录数量
-                plan_data_fault_counts = len(faulty_plans) + cancel_order_count
+                # plan_data_fault_counts = len(faulty_plans) + cancel_order_count
+                plan_data_fault_counts = len(faulty_plans)
 
                 # 工单返工数量
 
@@ -347,10 +348,36 @@ class Sf_Dashboard_Connect(http.Controller):
                 # 工单进度偏差
                 plan_data_progress_deviation = plan_data_total_counts - plan_data_finish_counts - plan_data_fault_counts
 
-                # 交付准时率
+                # 完成记录
                 plan_data_finish_orders = plan_obj.search(
                     [('production_line_id.name', '=', line), ('state', 'in', ['finished'])])
 
+                # # 检测量
+                # detection_nums = 0
+                # for i in plan_data_finish_orders:
+                #     print('i: %s' % i)
+                #     if i.production_id.detection_result_ids:
+                #         detection_nums += 1
+                #
+                # print('detection_nums: %s' % detection_nums)
+
+                # 检测量
+                detection_data = len(plan_data_finish_orders.mapped('production_id.detection_result_ids').filtered(lambda r: r))
+
+                # 检测合格量
+                pass_nums = plan_data_finish_orders.filtered(lambda p: any(
+                    result.test_results in ['合格'] for result in p.production_id.detection_result_ids
+                ))
+
+                # 质量合格率
+                pass_rate = 1
+                if pass_nums:
+                    pass_rate = round((len(pass_nums) / len(plan_data_finish_orders) if len(plan_data_finish_orders) > 0 else 0), 3)
+
+                # 返工率
+                rework_rate = round((plan_data_rework_counts / plan_data_finish_counts if plan_data_finish_counts > 0 else 0), 3)
+
+                # 交付准时率
                 delay_num = 0
                 for plan in plan_data_finish_orders:
                     sale_obj = request.env['sale.order'].sudo().search([('name', '=', plan.origin)])
@@ -382,7 +409,9 @@ class Sf_Dashboard_Connect(http.Controller):
                         'finishe_rate': finishe_rate,
                         'plan_data_progress_deviation': plan_data_progress_deviation,
                         'plan_data_rework_counts': plan_data_rework_counts,
-                        'on_time_rate': on_time_rate
+                        'on_time_rate': on_time_rate,
+                        'detection_data': detection_data,
+                        'pass_rate': pass_rate
                     }
                     res['data'][line] = data
 

From 763d64a1cad789d096083933818d766b391e88e3 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 11 Sep 2024 14:57:42 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=B6=E9=95=BF=E6=95=88=E7=8E=87=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/controllers/controllers.py | 176 +++++++++++++++++-
 1 file changed, 173 insertions(+), 3 deletions(-)

diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py
index 8802a5be..e4496553 100644
--- a/sf_machine_connect/controllers/controllers.py
+++ b/sf_machine_connect/controllers/controllers.py
@@ -22,7 +22,11 @@ db_config = {
 def convert_to_seconds(time_str):
     # 修改正则表达式，使 H、M、S 部分可选
 
+    if time_str is None:
+        return 0
+
     pattern = r"(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?"
+
     match = re.match(pattern, time_str)
 
     if match:
@@ -362,7 +366,8 @@ class Sf_Dashboard_Connect(http.Controller):
                 # print('detection_nums: %s' % detection_nums)
 
                 # 检测量
-                detection_data = len(plan_data_finish_orders.mapped('production_id.detection_result_ids').filtered(lambda r: r))
+                detection_data = len(
+                    plan_data_finish_orders.mapped('production_id.detection_result_ids').filtered(lambda r: r))
 
                 # 检测合格量
                 pass_nums = plan_data_finish_orders.filtered(lambda p: any(
@@ -372,10 +377,12 @@ class Sf_Dashboard_Connect(http.Controller):
                 # 质量合格率
                 pass_rate = 1
                 if pass_nums:
-                    pass_rate = round((len(pass_nums) / len(plan_data_finish_orders) if len(plan_data_finish_orders) > 0 else 0), 3)
+                    pass_rate = round(
+                        (len(pass_nums) / len(plan_data_finish_orders) if len(plan_data_finish_orders) > 0 else 0), 3)
 
                 # 返工率
-                rework_rate = round((plan_data_rework_counts / plan_data_finish_counts if plan_data_finish_counts > 0 else 0), 3)
+                rework_rate = round(
+                    (plan_data_rework_counts / plan_data_finish_counts if plan_data_finish_counts > 0 else 0), 3)
 
                 # 交付准时率
                 delay_num = 0
@@ -928,3 +935,166 @@ class Sf_Dashboard_Connect(http.Controller):
         else:
             # 如果没有图片数据，返回404
             return request.not_found()
+
+    # 设备运行时长
+    @http.route('/api/RunningTime', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
+    def RunningTime(self, **kw):
+        """
+        获取设备运行时长
+        """
+        res = {'status': 1, 'message': '成功', 'data': {}}
+        # 连接数据库
+        conn = psycopg2.connect(**db_config)
+        # 获取请求的机床数据
+        machine_list = ast.literal_eval(kw['machine_list'])
+
+        def fetch_result_as_dict(cursor):
+            """辅助函数：将查询结果转为字典"""
+            columns = [desc[0] for desc in cursor.description]
+            return dict(zip(columns, cursor.fetchone())) if cursor.rowcount != 0 else None
+
+        # 初始化当天、当月和有记录以来的总时长
+        day_total_running_time = 0
+        day_total_process_time = 0
+        day_work_rate = 0
+        month_total_running_time = 0
+        month_total_process_time = 0
+        month_work_rate = 0
+        all_time_total_running_time = 0
+        all_time_total_process_time = 0
+        all_time_work_rate = 0
+
+        for item in machine_list:
+            # 获取当天第一条记录（排除device_state等于‘离线’的记录）
+            with conn.cursor() as cur:
+                cur.execute("""
+                    SELECT * FROM device_data
+                    WHERE device_name = %s
+                    AND time::date = CURRENT_DATE
+                    AND device_state != '离线'
+                    ORDER BY time ASC
+                    LIMIT 1;
+                """, (item,))
+                first_today = fetch_result_as_dict(cur)
+                print("当天第一条记录（非离线）:", first_today)
+
+            # 获取当天最新一条记录（排除device_state等于‘离线’的记录）
+            with conn.cursor() as cur:
+                cur.execute("""
+                    SELECT * FROM device_data
+                    WHERE device_name = %s
+                    AND time::date = CURRENT_DATE
+                    AND device_state != '离线'
+                    ORDER BY time DESC
+                    LIMIT 1;
+                """, (item,))
+                last_today = fetch_result_as_dict(cur)
+                print("当天最新一条记录（非离线）:", last_today)
+
+            # 计算当天运行时长
+            if first_today and last_today:
+                running_time = convert_to_seconds(last_today['run_time']) - convert_to_seconds(first_today['run_time'])
+                process_time = convert_to_seconds(last_today['process_time']) - convert_to_seconds(
+                    first_today['process_time'])
+                day_total_running_time += abs(running_time)
+                day_total_process_time += abs(process_time)
+
+            # 获取当月第一条记录（排除device_state等于‘离线’的记录）
+            with conn.cursor() as cur:
+                cur.execute("""
+                    SELECT * FROM device_data
+                    WHERE device_name = %s
+                    AND EXTRACT(YEAR FROM time) = EXTRACT(YEAR FROM CURRENT_DATE)
+                    AND EXTRACT(MONTH FROM time) = EXTRACT(MONTH FROM CURRENT_DATE)
+                    AND device_state != '离线'
+                    ORDER BY time ASC
+                    LIMIT 1;
+                """, (item,))
+                first_month = fetch_result_as_dict(cur)
+                print("当月第一条记录（非离线）:", first_month)
+
+            # 获取当月最新一条记录（排除device_state等于‘离线’的记录）
+            with conn.cursor() as cur:
+                cur.execute("""
+                    SELECT * FROM device_data
+                    WHERE device_name = %s
+                    AND EXTRACT(YEAR FROM time) = EXTRACT(YEAR FROM CURRENT_DATE)
+                    AND EXTRACT(MONTH FROM time) = EXTRACT(MONTH FROM CURRENT_DATE)
+                    AND device_state != '离线'
+                    ORDER BY time DESC
+                    LIMIT 1;
+                """, (item,))
+                last_month = fetch_result_as_dict(cur)
+                print("当月最新一条记录（非离线）:", last_month)
+
+            # 计算当月运行时长
+            if first_month and last_month:
+                month_running_time = convert_to_seconds(last_month['run_time']) - convert_to_seconds(
+                    first_month['run_time'])
+                month_process_time = convert_to_seconds(last_month['process_time']) - convert_to_seconds(
+                    first_month['process_time'])
+                month_total_running_time += abs(month_running_time)
+                month_total_process_time += abs(month_process_time)
+
+            # 获取有记录以来的第一条记录（排除device_state等于‘离线’的记录）
+            with conn.cursor() as cur:
+                cur.execute("""
+                    SELECT * FROM device_data
+                    WHERE device_name = %s
+                    AND device_state != '离线'
+                    ORDER BY time ASC
+                    LIMIT 1;
+                """, (item,))
+                first_all_time = fetch_result_as_dict(cur)
+                print("有记录以来的第一条记录（非离线）:", first_all_time)
+
+            # 获取有记录以来的最新一条记录（排除device_state等于‘离线’的记录）
+            with conn.cursor() as cur:
+                cur.execute("""
+                    SELECT * FROM device_data
+                    WHERE device_name = %s
+                    AND device_state != '离线'
+                    ORDER BY time DESC
+                    LIMIT 1;
+                """, (item,))
+                last_all_time = fetch_result_as_dict(cur)
+                print("有记录以来的最新一条记录（非离线）:", last_all_time)
+
+            # 计算有记录以来的运行时长
+            if first_all_time and last_all_time:
+                all_time_running_time = convert_to_seconds(last_all_time['run_time']) - convert_to_seconds(
+                    first_all_time['run_time'])
+                all_time_process_time = convert_to_seconds(last_all_time['process_time']) - convert_to_seconds(
+                    first_all_time['process_time'])
+                all_time_total_running_time += abs(all_time_running_time)
+                all_time_total_process_time += abs(all_time_process_time)
+
+        # 计算当天工作效率
+        if day_total_running_time > day_total_process_time:
+            day_work_rate = day_total_process_time / day_total_running_time if day_total_running_time != 0 else 0
+        else:
+            day_work_rate = day_total_running_time / day_total_process_time if day_total_process_time != 0 else 0
+        print("当天工作效率: %s" % day_work_rate)
+
+        # 计算当月工作效率
+        if month_total_running_time > month_total_process_time:
+            month_work_rate = month_total_process_time / month_total_running_time if month_total_running_time != 0 else 0
+        else:
+            month_work_rate = month_total_running_time / month_total_process_time if month_total_process_time != 0 else 0
+        print("当月工作效率: %s" % month_work_rate)
+
+        # 计算有记录以来的工作效率
+        if all_time_total_running_time > all_time_total_process_time:
+            all_time_work_rate = all_time_total_process_time / all_time_total_running_time if all_time_total_running_time != 0 else 0
+        else:
+            all_time_work_rate = all_time_total_running_time / all_time_total_process_time if all_time_total_process_time != 0 else 0
+        print("有记录以来的工作效率: %s" % all_time_work_rate)
+
+        conn.close()
+
+        # 返回数据
+        res['data']['day_work_rate'] = day_work_rate
+        res['data']['month_work_rate'] = month_work_rate
+        res['data']['all_time_work_rate'] = all_time_work_rate
+
+        return json.dumps(res)

From 908e4a3df619081bc0949b485fde01746ef7443d Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 11 Sep 2024 18:07:21 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=8F=96=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/controllers/controllers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py
index e4496553..92410fbd 100644
--- a/sf_machine_connect/controllers/controllers.py
+++ b/sf_machine_connect/controllers/controllers.py
@@ -378,7 +378,7 @@ class Sf_Dashboard_Connect(http.Controller):
                 pass_rate = 1
                 if pass_nums:
                     pass_rate = round(
-                        (len(pass_nums) / len(plan_data_finish_orders) if len(plan_data_finish_orders) > 0 else 0), 3)
+                        (len(pass_nums) / detection_data if len(plan_data_finish_orders) > 0 else 0), 3)
 
                 # 返工率
                 rework_rate = round(
@@ -413,6 +413,7 @@ class Sf_Dashboard_Connect(http.Controller):
                         'plan_data_finish_counts': plan_data_finish_counts,
                         'plan_data_plan_counts': plan_data_total_counts,
                         'plan_data_fault_counts': plan_data_fault_counts,
+                        'nopass_orders_counts': detection_data - len(pass_nums),
                         'finishe_rate': finishe_rate,
                         'plan_data_progress_deviation': plan_data_progress_deviation,
                         'plan_data_rework_counts': plan_data_rework_counts,

From 95e49c7b0fad4f90c120ec4d0b6531a0330d9d90 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 12 Sep 2024 09:17:52 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/controllers/controllers.py | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py
index 92410fbd..e8c5c226 100644
--- a/sf_machine_connect/controllers/controllers.py
+++ b/sf_machine_connect/controllers/controllers.py
@@ -70,7 +70,7 @@ class Sf_Dashboard_Connect(http.Controller):
 
         # 获取当前时间的时间戳
         current_timestamp = datetime.now().timestamp()
-        print(current_timestamp)
+        # print(current_timestamp)
 
         # tem_list = [
         #     "XT-GNJC-WZZX-X800-Y550-Z550-T24-A5-1", "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-3",
@@ -199,7 +199,7 @@ class Sf_Dashboard_Connect(http.Controller):
             begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
             end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
 
-            print('begin_time: %s' % begin_time)
+            # print('begin_time: %s' % begin_time)
 
             for item in machine_list:
                 sql = '''
@@ -280,7 +280,7 @@ class Sf_Dashboard_Connect(http.Controller):
             res = {'Succeed': True}
             line_list_obj = request.env['sf.production.line'].sudo().search([('name', 'ilike', 'CNC')])
             line_list = list(map(lambda x: x.name, line_list_obj))
-            print('line_list: %s' % line_list)
+            # print('line_list: %s' % line_list)
             res['LineList'] = line_list
 
         except Exception as e:
@@ -307,7 +307,7 @@ class Sf_Dashboard_Connect(http.Controller):
             plan_obj = request.env['sf.production.plan'].sudo()
             production_obj = request.env['mrp.production'].sudo()
             line_list = ast.literal_eval(kw['line_list'])
-            print('line_list: %s' % line_list)
+            # print('line_list: %s' % line_list)
             for line in line_list:
 
                 # 工单计划量
@@ -446,7 +446,7 @@ class Sf_Dashboard_Connect(http.Controller):
         end_time_str = kw['end_time'].strip('"')
         begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
         end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
-        print('line_list: %s' % line_list)
+        # print('line_list: %s' % line_list)
 
         def get_date_list(start_date, end_date):
             date_list = []
@@ -483,7 +483,9 @@ class Sf_Dashboard_Connect(http.Controller):
                     'date': date.strftime('%Y-%m-%d'),
                     'order_count': len(orders),
                     'rework_orders': len(rework_orders),
-                    'not_passed_orders': len(not_passed_orders)
+                    'not_passed_orders': len(not_passed_orders),
+                    'finish_order_nums': len(orders),
+                    'plan_order_nums': 20,
                 })
             # 外面包一层，没什么是包一层不能解决的，包一层就能区分了，类似于包一层div
             # 外面包一层的好处是，可以把多个数据结构打包在一起，方便前端处理
@@ -570,7 +572,7 @@ class Sf_Dashboard_Connect(http.Controller):
         end_time_str = kw['end_time'].strip('"')
         begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
         end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
-        print('line_list: %s' % line_list)
+        # print('line_list: %s' % line_list)
         not_done_data = []
         done_data = []
         final_data = {}
@@ -581,13 +583,13 @@ class Sf_Dashboard_Connect(http.Controller):
                 [('production_line_id.name', '=', line), ('state', 'not in', ['finished']),
                  ('production_id.state', 'not in', ['cancel']), ('active', '=', True)
                  ])
-            print(not_done_orders)
+            # print(not_done_orders)
             # 完成订单
             finish_orders = plan_obj.search([
                 ('production_line_id.name', '=', line), ('state', 'in', ['finished']),
                 ('production_id.state', 'not in', ['cancel']), ('active', '=', True)
             ])
-            print(finish_orders)
+            # print(finish_orders)
 
             # 获取所有未完成订单的ID列表
             order_ids = [order.id for order in not_done_orders]
@@ -710,11 +712,11 @@ class Sf_Dashboard_Connect(http.Controller):
                 # 执行SQL命令
                 cur.execute(sql, (item,))
                 result = cur.fetchall()
-                print('result========', result)
+                # print('result========', result)
 
                 cur.execute(sql2, (item,))
                 result2 = cur.fetchall()
-                print('result2========', result2)
+                # print('result2========', result2)
                 #
                 for row in result:
                     res['data'][item] = {'idle_count': row[0]}
@@ -770,7 +772,7 @@ class Sf_Dashboard_Connect(http.Controller):
             # 执行SQL命令
             cur.execute(sql)
             result = cur.fetchall()
-            print('result', result)
+            # print('result', result)
 
             # 将查询结果转换为字典列表
             data = []
@@ -977,7 +979,7 @@ class Sf_Dashboard_Connect(http.Controller):
                     LIMIT 1;
                 """, (item,))
                 first_today = fetch_result_as_dict(cur)
-                print("当天第一条记录（非离线）:", first_today)
+                # print("当天第一条记录（非离线）:", first_today)
 
             # 获取当天最新一条记录（排除device_state等于‘离线’的记录）
             with conn.cursor() as cur:
@@ -990,7 +992,7 @@ class Sf_Dashboard_Connect(http.Controller):
                     LIMIT 1;
                 """, (item,))
                 last_today = fetch_result_as_dict(cur)
-                print("当天最新一条记录（非离线）:", last_today)
+                # print("当天最新一条记录（非离线）:", last_today)
 
             # 计算当天运行时长
             if first_today and last_today:
@@ -1012,7 +1014,7 @@ class Sf_Dashboard_Connect(http.Controller):
                     LIMIT 1;
                 """, (item,))
                 first_month = fetch_result_as_dict(cur)
-                print("当月第一条记录（非离线）:", first_month)
+                # print("当月第一条记录（非离线）:", first_month)
 
             # 获取当月最新一条记录（排除device_state等于‘离线’的记录）
             with conn.cursor() as cur:
@@ -1026,7 +1028,7 @@ class Sf_Dashboard_Connect(http.Controller):
                     LIMIT 1;
                 """, (item,))
                 last_month = fetch_result_as_dict(cur)
-                print("当月最新一条记录（非离线）:", last_month)
+                # print("当月最新一条记录（非离线）:", last_month)
 
             # 计算当月运行时长
             if first_month and last_month:
@@ -1047,7 +1049,7 @@ class Sf_Dashboard_Connect(http.Controller):
                     LIMIT 1;
                 """, (item,))
                 first_all_time = fetch_result_as_dict(cur)
-                print("有记录以来的第一条记录（非离线）:", first_all_time)
+                # print("有记录以来的第一条记录（非离线）:", first_all_time)
 
             # 获取有记录以来的最新一条记录（排除device_state等于‘离线’的记录）
             with conn.cursor() as cur:
@@ -1059,7 +1061,7 @@ class Sf_Dashboard_Connect(http.Controller):
                     LIMIT 1;
                 """, (item,))
                 last_all_time = fetch_result_as_dict(cur)
-                print("有记录以来的最新一条记录（非离线）:", last_all_time)
+                # print("有记录以来的最新一条记录（非离线）:", last_all_time)
 
             # 计算有记录以来的运行时长
             if first_all_time and last_all_time:

From e0bad6ed40731a8b0cd9092989f1985806cb10e7 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 12 Sep 2024 11:08:24 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BD=93=E7=8F=AD?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E9=87=8F=EF=BC=8C=E5=AE=8C=E6=88=90=E9=87=8F?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/controllers/controllers.py | 52 +++++++++++++++++--
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py
index e8c5c226..4f99f319 100644
--- a/sf_machine_connect/controllers/controllers.py
+++ b/sf_machine_connect/controllers/controllers.py
@@ -447,6 +447,27 @@ class Sf_Dashboard_Connect(http.Controller):
         begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
         end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
         # print('line_list: %s' % line_list)
+        print('kw', kw)
+        time_unit = kw.get('time_unit', 'day').strip('"')  # 默认单位为天
+        print('time_unit: %s' % time_unit)
+
+        # 日期或小时循环生成器，根据time_unit决定是按天还是按小时
+        def get_time_intervals(start_time, end_time, time_unit):
+            intervals = []
+            current_time = start_time
+            if time_unit == 'hour':
+                delta = timedelta(hours=1)
+            else:
+                delta = timedelta(days=1)
+
+            while current_time < end_time:
+                next_time = current_time + delta
+                # 确保最后一个时间段不会超出end_time
+                if next_time > end_time:
+                    next_time = end_time
+                intervals.append((current_time, next_time))
+                current_time = next_time
+            return intervals
 
         def get_date_list(start_date, end_date):
             date_list = []
@@ -457,10 +478,33 @@ class Sf_Dashboard_Connect(http.Controller):
             return date_list
 
         for line in line_list:
-            date_list = get_date_list(begin_time, end_time)
+            date_field_name = 'actual_end_time'  # 替换为你模型中的实际字段名
             order_counts = []
 
-            date_field_name = 'actual_end_time'  # 替换为你模型中的实际字段名
+            if time_unit == 'hour':
+                time_intervals = get_time_intervals(begin_time, end_time, time_unit)
+                print('============================= %s' % time_intervals)
+
+                time_count_dict = {}
+
+                for time_interval in time_intervals:
+                    start_time, end_time = time_interval
+                    # print(start_time, end_time)
+                    orders = plan_obj.search([('production_line_id.name', '=', line), ('state', 'in', ['finished']),
+                                              (date_field_name, '>=', start_time.strftime('%Y-%m-%d 00:00:00')),
+                                              (date_field_name, '<', end_time.strftime('%Y-%m-%d 00:00:00'))
+                                              ])
+                    # 使用小时和分钟作为键，确保每个小时的数据有独立的键
+                    key = start_time.strftime('%H:%M:%S')  # 只取小时:分钟:秒作为键
+                    time_count_dict[key] = len(orders)
+                order_counts.append({
+                    'finish_order_nums': time_count_dict,
+                    'plan_order_nums': 28
+                })
+                res['data'][line] = order_counts
+                return json.dumps(res)
+
+            date_list = get_date_list(begin_time, end_time)
 
             for date in date_list:
                 next_day = date + timedelta(days=1)
@@ -483,9 +527,7 @@ class Sf_Dashboard_Connect(http.Controller):
                     'date': date.strftime('%Y-%m-%d'),
                     'order_count': len(orders),
                     'rework_orders': len(rework_orders),
-                    'not_passed_orders': len(not_passed_orders),
-                    'finish_order_nums': len(orders),
-                    'plan_order_nums': 20,
+                    'not_passed_orders': len(not_passed_orders)
                 })
             # 外面包一层，没什么是包一层不能解决的，包一层就能区分了，类似于包一层div
             # 外面包一层的好处是，可以把多个数据结构打包在一起，方便前端处理

From eae902ee92871c00c2e5bb1848daffb3de8b1d6b Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 12 Sep 2024 15:36:30 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=B6=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/controllers/controllers.py | 47 +++++++++++++++++--
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py
index 4f99f319..faf68f6e 100644
--- a/sf_machine_connect/controllers/controllers.py
+++ b/sf_machine_connect/controllers/controllers.py
@@ -497,11 +497,11 @@ class Sf_Dashboard_Connect(http.Controller):
                     # 使用小时和分钟作为键，确保每个小时的数据有独立的键
                     key = start_time.strftime('%H:%M:%S')  # 只取小时:分钟:秒作为键
                     time_count_dict[key] = len(orders)
-                order_counts.append({
+                # order_counts.append()
+                res['data'][line] = {
                     'finish_order_nums': time_count_dict,
                     'plan_order_nums': 28
-                })
-                res['data'][line] = order_counts
+                }
                 return json.dumps(res)
 
             date_list = get_date_list(begin_time, end_time)
@@ -981,7 +981,7 @@ class Sf_Dashboard_Connect(http.Controller):
             # 如果没有图片数据，返回404
             return request.not_found()
 
-    # 设备运行时长
+    # 设备运行率
     @http.route('/api/RunningTime', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
     def RunningTime(self, **kw):
         """
@@ -1143,3 +1143,42 @@ class Sf_Dashboard_Connect(http.Controller):
         res['data']['all_time_work_rate'] = all_time_work_rate
 
         return json.dumps(res)
+
+    # 设备运行时长
+    @http.route('/api/RunningTimeDetail', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
+    def RunningTimeDetail(self, **kw):
+        """
+        获取
+        """
+        res = {'status': 1, 'message': '成功', 'data': {}}
+        # 连接数据库
+        conn = psycopg2.connect(**db_config)
+        # 获取请求的机床数据
+        machine_list = ast.literal_eval(kw['machine_list'])
+
+        def fetch_result_as_dict(cursor):
+            """辅助函数：将查询结果转为字典"""
+            columns = [desc[0] for desc in cursor.description]
+            return dict(zip(columns, cursor.fetchone())) if cursor.rowcount != 0 else None
+
+        for item in machine_list:
+            with conn.cursor() as cur:
+                cur.execute("""
+                    SELECT * FROM device_data
+                    WHERE device_name = %s
+                    AND device_state != '离线'
+                    ORDER BY time DESC
+                    LIMIT 1;
+                """, (item,))
+                last_all_time = fetch_result_as_dict(cur)
+            # 返回数据
+            res['data'][item] = {
+                'wait_time': last_all_time['run_time'] if last_all_time['run_time'] is not None else 0,
+                'cut_time': last_all_time['process_time'] if last_all_time['process_time'] is not None else 0,
+                'run_time': last_all_time['run_time'] if last_all_time['run_time'] is not None else 0 + last_all_time['process_time'] if last_all_time['process_time'] is not None else 0,
+                'power_on_time': last_all_time['power_on_time'] if last_all_time['power_on_time'] is not None else 0
+            }
+
+        conn.close()
+
+        return json.dumps(res)

From 1719e0394e3c470336b0a87980e96deb3a3feeb7 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 12 Sep 2024 16:33:55 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E5=8E=BB=E6=8E=89run=5Ftime=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/controllers/controllers.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py
index faf68f6e..e301154b 100644
--- a/sf_machine_connect/controllers/controllers.py
+++ b/sf_machine_connect/controllers/controllers.py
@@ -1175,7 +1175,6 @@ class Sf_Dashboard_Connect(http.Controller):
             res['data'][item] = {
                 'wait_time': last_all_time['run_time'] if last_all_time['run_time'] is not None else 0,
                 'cut_time': last_all_time['process_time'] if last_all_time['process_time'] is not None else 0,
-                'run_time': last_all_time['run_time'] if last_all_time['run_time'] is not None else 0 + last_all_time['process_time'] if last_all_time['process_time'] is not None else 0,
                 'power_on_time': last_all_time['power_on_time'] if last_all_time['power_on_time'] is not None else 0
             }
 

From 7c01196f17882342524f8a84a086f8046d9ae423 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 13 Sep 2024 10:37:50 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E2=80=9C=E8=A3=85?=
 =?UTF-8?q?=E5=A4=B9=E9=A2=84=E8=B0=83=E5=B7=A5=E5=8D=95=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=B5=8B=E9=87=8F=E6=95=B0=E6=8D=AE=E6=97=B6=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=B7=A6=E4=B8=8A=E8=A7=92=E7=9A=84=E3=80=90=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E3=80=91=E6=8C=89=E9=92=AE=E7=9B=B4=E6=8E=A5=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=BA=86=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 997e2ba3..9e1d5632 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1179,7 +1179,7 @@ class ResMrpWorkOrder(models.Model):
                 if not record.rfid_code and record.is_rework is False:
                     raise UserError("请扫RFID码进行绑定")
                 if record.is_rework is False:
-                    if not record.material_center_point and record.X_deviation_angle > 0:
+                    if not record.material_center_point or record.X_deviation_angle <= 0:
                         raise UserError("坯料中心点为空或X偏差角度小于等于0")
                 record.process_state = '待加工'
                 # record.write({'process_state': '待加工'})