From cf8c14e7380eaec81b7800c58242ec8e5ffaa46b Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 9 Apr 2025 15:22:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 quality_control/views/quality_views.xml       |  2 +-
 sf_machine_connect/controllers/controllers.py | 25 +++++++++++++------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/quality_control/views/quality_views.xml b/quality_control/views/quality_views.xml
index 38de9e4e..528003e3 100644
--- a/quality_control/views/quality_views.xml
+++ b/quality_control/views/quality_views.xml
@@ -267,7 +267,7 @@
                             <field name="company_id" invisible="1"/>
                             <field name="categ_type" invisible="1"/>
                             <field name="product_id" attrs="{'invisible' : [('measure_on', '=', 'operation')]}"/>
-                            <field name="part_name" attrs="{'invisible': [('categ_type', '!=', '成品')]}"/>
+                            <field name="part_name" attrs="{'invisible': [('categ_type', '!=', '成品')], 'readonly': [('publish_status', '=', 'published')]}"/>
                             <field name="part_number" attrs="{'invisible': [('categ_type', '!=', '成品')], 'readonly': [('publish_status', '=', 'published')]}"/>
                             <field name="material_name" attrs="{'invisible': [('categ_type', '!=', '成品')]}"/>
                             <field name="total_qty" attrs="{'invisible': ['|', ('measure_on', '!=', 'product'), ('is_out_check', '=', False)]}"/>
diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py
index 4385937c..0017e2ae 100644
--- a/sf_machine_connect/controllers/controllers.py
+++ b/sf_machine_connect/controllers/controllers.py
@@ -567,7 +567,7 @@ class Sf_Dashboard_Connect(http.Controller):
         """
         res = {'status': 1, 'message': '成功', 'data': {}}
         # plan_obj = request.env['sf.production.plan'].sudo()
-        plan_obj = request.env['mrp.workorder'].sudo().search([('routing_type', '=', 'CNC加工')])
+        # plan_obj = request.env['mrp.workorder'].sudo().search([('routing_type', '=', 'CNC加工')])
         line_list = ast.literal_eval(kw['line_list'])
         begin_time_str = kw['begin_time'].strip('"')
         end_time_str = kw['end_time'].strip('"')
@@ -617,11 +617,19 @@ class Sf_Dashboard_Connect(http.Controller):
                 for time_interval in time_intervals:
                     start_time, end_time = time_interval
 
-                    orders = plan_obj.search([
-                        ('production_id.production_line_id.name', '=', line),
+                    # orders = plan_obj.search([
+                    #     ('production_line_id.name', '=', line),
+                    #     ('state', 'in', ['done']),
+                    #     (date_field_name, '>=', start_time.strftime('%Y-%m-%d %H:%M:%S')),
+                    #     (date_field_name, '<=', end_time.strftime('%Y-%m-%d %H:%M:%S'))  # 包括结束时间
+                    # ])
+
+                    orders = request.env['mrp.workorder'].sudo().search([
+                        ('routing_type', '=', 'CNC加工'),  # 将第一个条件合并进来
+                        ('production_line_id.name', '=', line),
                         ('state', 'in', ['done']),
                         (date_field_name, '>=', start_time.strftime('%Y-%m-%d %H:%M:%S')),
-                        (date_field_name, '<=', end_time.strftime('%Y-%m-%d %H:%M:%S'))  # 包括结束时间
+                        (date_field_name, '<=', end_time.strftime('%Y-%m-%d %H:%M:%S'))
                     ])
 
                     # 使用小时和分钟作为键，确保每个小时的数据有独立的键
@@ -638,18 +646,21 @@ class Sf_Dashboard_Connect(http.Controller):
 
             for date in date_list:
                 next_day = date + timedelta(days=1)
-                orders = plan_obj.search([('production_id.production_line_id.name', '=', line), ('state', 'in', ['done']),
+                orders = request.env['mrp.workorder'].sudo().search([('production_id.production_line_id.name', '=', line), ('state', 'in', ['done']),
+                                          ('routing_type', '=', 'CNC加工'),
                                           (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
                                           (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
                                           ])
 
-                rework_orders = plan_obj.search(
+                rework_orders = request.env['mrp.workorder'].sudo().search(
                     [('production_id.production_line_id.name', '=', line), ('state', 'in', ['rework']),
+                     ('routing_type', '=', 'CNC加工'),
                      (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
                      (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
                      ])
-                not_passed_orders = plan_obj.search(
+                not_passed_orders = request.env['mrp.workorder'].sudo().search(
                     [('production_id.production_line_id.name', '=', line), ('state', 'in', ['scrap', 'cancel']),
+                     ('routing_type', '=', 'CNC加工'),
                      (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
                      (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
                      ])