Accept Merge Request #1341: (feature/制造功能优化 -> develop)

Merge Request: 调整记录匹配条件；优化排程单状态变化

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1341?initial=true

sf_machine_connect/controllers/controllers.py

@@ -489,11 +489,14 @@ class Sf_Dashboard_Connect(http.Controller):
 
                 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'))
+
+                    orders = plan_obj.search([
+                        ('production_line_id.name', '=', line),
+                        ('state', 'in', ['finished']),
+                        (date_field_name, '>=', start_time.strftime('%Y-%m-%d %H:%M:%S')),
+                        (date_field_name, '<=', end_time.strftime('%Y-%m-%d %H:%M:%S'))  # 包括结束时间
                     ])
+
                     # 使用小时和分钟作为键，确保每个小时的数据有独立的键
                     key = start_time.strftime('%H:%M:%S')  # 只取小时:分钟:秒作为键
                     time_count_dict[key] = len(orders)

sf_manufacturing/models/mrp_workorder.py

@@ -1082,6 +1082,12 @@ class ResMrpWorkOrder(models.Model):
 
     # 重写工单开始按钮方法
     def button_start(self):
+        if self.routing_type == 'CNC加工':
+            self.env['sf.production.plan'].sudo().search([('name', '=', self.production_id.name)]).write({
+                'state': 'processing',
+                'actual_start_time': datetime.now()
+            })
+
         if self.routing_type == '装夹预调':
             # 判断是否有坯料的序列号信息
             boolean = False