优化销售订单+工单逾期预警和已1逾期代码

sf_message/models/sf_message_sale.py

@@ -97,57 +97,44 @@ class SFMessageSale(models.Model):
             contents.append(content)
         return contents
 
-    # # 销售订单逾期预警
-    def _overdue_warning_func(self):
-        today = fields.Date.today()
+    # # 销售订单逾期预警和已逾期
+    def _overdue_or_warning_func(self):
+        today = datetime.today().date()
         deadline_check = today + timedelta(days=1)
+        logging.info(f"today: {today}, deadline_check: {deadline_check}")
         sale_order = self.sudo().search([('state', 'in', ['sale']), ('deadline_of_delivery', '!=', False)])
         for item in sale_order:
             production = self.env['mrp.production'].search([('origin', '=', item.name)])
-            if len(production.filtered(
-                    lambda p: p.state not in ['done', 'scrap', 'cancel'])) != item.mrp_production_count:
+            production_not_done = production.filtered(lambda p: p.state not in ['done', 'scrap', 'cancel'])
+            production_done_count = len(production.filtered(lambda p: p.state in ['done', 'scrap', 'cancel']))
+            if len(production_not_done) != item.mrp_production_count:
                 if deadline_check == item.deadline_of_delivery:
                     item.delivery_warning = 'warning'
-            elif len(production.filtered(
-                    lambda p: p.state in ['done', 'scrap', 'cancel'])) == item.mrp_production_count:
-                if deadline_check == item.deadline_of_delivery and item.delivery_status in ['pending', 'partial']:
-                    item.delivery_warning = 'warning'
-        sale_order_warning = self.sudo().search([('delivery_warning', '=', 'warning')])
-        if sale_order_warning:
-            for warning in sale_order_warning:
-                message_template = self.env["jikimo.message.template"].search([
-                    ("model", "=", self._name),
-                    ("bussiness_node_id", "=", self.env.ref('sf_message.bussiness_sale_order_overdue_warning').id)
-                ])
-                sale_order_has = self.env['jikimo.message.queue'].search(
-                    [('res_id', '=', warning.id), ('message_status', '=', 'pending'),
-                     ('message_template_id', '=', message_template.id)])
-                if not sale_order_has:
-                    sale_order_warning.add_queue('销售订单逾期预警')
+                elif today == item.deadline_of_delivery:
+                    item.delivery_warning = 'overdue'
+            elif production_done_count == item.mrp_production_count:
+                if item.delivery_status in ['pending', 'partial']:
+                    if deadline_check == item.deadline_of_delivery:
+                        item.delivery_warning = 'warning'
+                    elif today == item.deadline_of_delivery:
+                        item.delivery_warning = 'overdue'
+            else:
+                continue
+        overdue_orders = self.sudo().search([('delivery_warning', 'in', ['warning', 'overdue'])])
+        for wo in overdue_orders:
+            message_template = self.env["jikimo.message.template"].search([
+                ("model", "=", self._name),
+                ("bussiness_node_id", "=", self.env.ref('sf_message.bussiness_sale_order_overdue_warning').id)
+            ])
+            sale_order_has = self.env['jikimo.message.queue'].search([
+                ('res_id', '=', wo.id),
+                ('message_status', '=', 'pending'),
+                ('message_template_id', '=', message_template.id)
+            ])
+            if not sale_order_has:
+                if wo.delivery_warning == 'warning':
+                    wo.add_queue('销售订单逾期预警')
+                elif wo.delivery_warning == 'overdue':
+                    wo.add_queue('销售订单已逾期')
+
 
-    # 销售订单已逾期 订单交期(交货日期)-当前日期时间≤0(未交货完成的销售订单）
-    def _overdue_func(self):
-        today = datetime.today().date()
-        sale_order = self.sudo().search([('state', 'in', ['sale']), ('deadline_of_delivery', '!=', False)])
-        for item in sale_order:
-            production = self.env['mrp.production'].search([('origin', '=', item.name)])
-            if len(production.filtered(
-                    lambda p: p.state not in ['done', 'scrap', 'cancel'])) != item.mrp_production_count:
-                if today == item.deadline_of_delivery:
-                    item.delivery_warning = 'overdue'
-            elif len(production.filtered(
-                    lambda p: p.state in ['done', 'scrap', 'cancel'])) == item.mrp_production_count:
-                if today == item.deadline_of_delivery and item.delivery_status in ['pending', 'partial']:
-                    item.delivery_warning = 'overdue'
-        sale_order_overdue = self.sudo().search([('delivery_warning', '=', 'overdue')])
-        if sale_order_overdue:
-            for overdue in sale_order_overdue:
-                message_template = self.env["jikimo.message.template"].search([
-                    ("model", "=", self._name),
-                    ("bussiness_node_id", "=", self.env.ref('sf_message.bussiness_sale_order_overdue').id)
-                ])
-                sale_order_has = self.env['jikimo.message.queue'].search(
-                    [('res_id', '=', overdue.id), ('message_status', '=', 'pending'),
-                     ('message_template_id', '=', message_template.id)])
-                if not sale_order_has:
-                    sale_order_overdue.add_queue('销售订单已逾期')

sf_message/models/sf_message_workorder.py

@@ -1,3 +1,4 @@
+from datetime import datetime, timedelta
 from odoo import models, fields, api, _
 import logging, json
 import requests
@@ -11,8 +12,6 @@ class SFMessageWork(models.Model):
     _name = 'mrp.workorder'
     _inherit = ['mrp.workorder', 'jikimo.message.dispatch']
 
-    delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效')
-
     @api.depends('production_availability', 'blocked_by_workorder_ids.state')
     def _compute_state(self):
         super(SFMessageWork, self)._compute_state()
@@ -32,6 +31,10 @@ class SFMessageWork(models.Model):
         current_time = self.env['sf.sync.common'].sudo().get_add_time(current_time_strf)
         current_time_datetime = datetime.strptime(current_time, '%Y-%m-%d %H:%M:%S')
         time_range = timedelta(minutes=2)
+        template_names = {
+            '预警': ['装夹预调工单逾期预警', 'CNC加工工单逾期预警', '解除装夹工单逾期预警', '表面工艺工单逾期预警'],
+            '已逾期': ['装夹预调工单已逾期', 'CNC加工工单已逾期', '解除装夹工单已逾期', '表面工艺工单已逾期']
+        }
         i = 0
         for message_queue_id in message_queue_ids:
             if message_queue_id.message_template_id.name == '工单已下发通知':
@@ -47,10 +50,11 @@ class SFMessageWork(models.Model):
                         '{{request_url}}', url)
                     product_id.append(mrp_workorder_line.product_id.id)
                     contents.append(content)
-            elif message_queue_id.message_template_id.name in ['工单逾期预警', '工单已逾期']:
-                bussiness_node = item.message_template_id.bussiness_node_id.name
-                for reminder_time in item.message_template_id.reminder_time_ids:
-                    content = item.message_template_id.content
+            elif message_queue_id.message_template_id.name in template_names['预警'] + template_names['已逾期']:
+                item = message_queue_id.message_template_id
+                bussiness_node = item.bussiness_node_id.name
+                for reminder_time in item.reminder_time_ids:
+                    content = item.content
                     target_time = datetime.combine(current_time_datetime.date(), datetime.min.time()).replace(
                         hour=reminder_time.time_point,
                         minute=0,
@@ -59,9 +63,11 @@ class SFMessageWork(models.Model):
                     )
                     logging.info(current_time)
                     logging.info(target_time)
+                    logging.info(target_time - time_range)
+                    logging.info(target_time + time_range)
                     if target_time - time_range <= current_time_datetime <= target_time + time_range:
                         search_condition = [
-                            ('delivery_warning', '=', 'warning')] if bussiness_node == '工单逾期预警' else [
+                            ('delivery_warning', '=', 'warning')] if bussiness_node in template_names['预警'] else [
                             ('delivery_warning', '=', 'overdue')]
                         record = self.sudo().search(search_condition + [('id', '=', int(item.res_id))])
                         if record:
@@ -70,9 +76,9 @@ class SFMessageWork(models.Model):
             action_id = self.env.ref('sf_manufacturing.mrp_workorder_action_tablet').id
             url_with_id = f"{url}/web#view_type=list&action={action_id}"
             content_template = content.replace('{{url}}', url_with_id)
-            if bussiness_node == '工单逾期预警':
+            if bussiness_node in template_names['预警']:
                 content = content_template.replace('{{warning_num}}', str(i))
-            elif bussiness_node == '工单已逾期':
+            elif bussiness_node in template_names['已逾期']:
                 content = content_template.replace('{{overdue_num}}', str(i))
             contents.append(content)
         return contents
@@ -92,40 +98,53 @@ class SFMessageWork(models.Model):
         full_url = full_url + "web#" + query_string
         return full_url
 
-    def _overdue_warning_func(self):
-        workorders = self.env['mrp.workorder'].read_group([("state", "in", ["ready", "progress", "to be detected"])]
-                                                         , ['routing_type'], ['id'])
-        for group in workorders:
-            workorder_id = group['id'][0] if group['id'] else False
-            if not workorder_id:
-                continue
-            if workorder_id.routing_type == '装夹预调':
-                bussiness_node = self.env.ref('sf_message.bussiness_mrp_workorder_pre_overdue_warning').id
-            elif workorder_id.routing_type == 'CNC加工':
-                bussiness_node = self.env.ref('sf_message.bussiness_mrp_workorder_cnc_overdue_warning').id
-            elif workorder_id.routing_type == '解除装夹':
-                bussiness_node = self.env.ref('sf_message.bussiness_mrp_workorder_unclamp_overdue_warning').id
-            elif workorder_id.routing_type == '表面工艺':
-                bussiness_node = self.env.ref('sf_message.bussiness_mrp_workorder_surface_overdue_warning').id
-            message_template = self.env["jikimo.message.template"].search([
-                    ("model", "=", self._name),
-                    ("bussiness_node_id", "=", bussiness_node.id)
-                ])
-            message_queue_ids = self.env["jikimo.message.queue"].search([
-                ("message_template_id", "=", message_template.id),
-                ("message_status", "=", "pending")
-            ])
-            if not message_queue_ids:
-                    continue
-        # for workorder in workorders:
-        #     for
-        #     message_template = self.env["jikimo.message.template"].search([
-        #         ("model", "=", self._name),
-        #         ("bussiness_node_id", "=", self.env.ref('sf_message.bussiness_sale_order_overdue').id)
-        #     ])
-        #     sale_order_has = self.env['jikimo.message.queue'].search(
-        #         [('res_id', '=', workorder.id), ('message_status', '=', 'pending'),
-        #          ('message_template_id', '=', message_template.id)])
-        #     if not sale_order_has:
-        #         sale_order_overdue.add_queue('销售订单已逾期')
-
+    def _overdue_or_warning_func(self):
+        workorders = self.env['mrp.workorder'].search([("state", "in", ["ready", "progress", "to be detected"])])
+        grouped_workorders = {}
+        for workorder in workorders:
+            routing_type = workorder.routing_type
+            if routing_type not in grouped_workorders:
+                grouped_workorders[routing_type] = []
+            grouped_workorders[routing_type].append(workorder)
+        for routing_type, orders in grouped_workorders.items():
+            print(f"Routing Type: {routing_type}, Orders: {len(orders)}")
+            for item in orders:
+                if item.date_planned_finished:
+                    current_time_str = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                    current_time_datetime = datetime.strptime(current_time_str, '%Y-%m-%d %H:%M:%S')
+                    date_planned_finished_str = self.env['sf.sync.common'].sudo().get_add_time(
+                        item.date_planned_finished.strftime("%Y-%m-%d %H:%M:%S"))
+                    date_planned_finished = datetime.strptime(date_planned_finished_str, '%Y-%m-%d %H:%M:%S')
+                    logging.info(f"Workorder: {item.production_id.name}, Current Time: {current_time_datetime}, "
+                                 f"Planned Finish: {date_planned_finished}")
+                    twelve_hours_ago = current_time_datetime - timedelta(hours=12)
+                    if current_time_datetime >= date_planned_finished:
+                        item.delivery_warning = 'overdue'
+                    elif twelve_hours_ago <= current_time_datetime <= date_planned_finished:
+                        item.delivery_warning = 'warning'
+            business_node_ids = {
+                '装夹预调': self.env.ref('sf_message.bussiness_mrp_workorder_pre_overdue_warning').id,
+                'CNC加工': self.env.ref('sf_message.bussiness_mrp_workorder_cnc_overdue_warning').id,
+                '解除装夹': self.env.ref('sf_message.bussiness_mrp_workorder_unclamp_overdue_warning').id,
+                '表面工艺': self.env.ref('sf_message.bussiness_mrp_workorder_surface_overdue_warning').id,
+            }
+            message_templates = {key: self.env["jikimo.message.template"].sudo().search([
+                ("model", "=", self._name),
+                ("bussiness_node_id", "=", business_node_ids[key])
+            ]) for key in business_node_ids}
+            for item in orders:
+                if item.delivery_warning in ['overdue', 'warning']:
+                    bussiness_node_id = business_node_ids.get(item.routing_type)
+                    if bussiness_node_id and message_templates[item.routing_type]:
+                        message_queue_ids = self.env["jikimo.message.queue"].sudo().search([
+                            ("message_template_id", "=", message_templates[item.routing_type].id),
+                            ("message_status", "=", "pending"),
+                            ("res_id", "=", item.id)
+                        ])
+                        if not message_queue_ids:
+                            overdue_message = '工单已逾期' if item.delivery_warning == 'overdue' else '工单逾期预警'
+                            queue_method_name = f'add_queue'
+                            # 构建参数列表，其中包含item.routing_type和overdue_message
+                            args = [f'{item.routing_type}{overdue_message}']
+                            # 获取add_queue方法并调用它，传入参数列表
+                            getattr(item, queue_method_name)(*args)