解决冲突

2024-10-15 15:25:31 +08:00
parent ce5cb17e31 6330929c04
commit 92c4bcb049
31 changed files with 891 additions and 436 deletions
--- a/sf_message/models/init.py
+++ b/sf_message/models/init.py
@@ -8,4 +8,5 @@ from . import sf_message_purchase
 from . import sf_message_workorder
 from . import sf_message_functional_tool_dismantle
 from . import sf_message_mrp_production
+from . import sf_message_quality_cnc_test
 from . import sf_message_maintenance_logs
--- a/sf_message/models/sf_message_quality_cnc_test.py
+++ b/sf_message/models/sf_message_quality_cnc_test.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+import logging
+from datetime import datetime, timedelta
+from odoo import models, fields, api, _
+
+
+class SFMessageQualityCncTest(models.Model):
+    _name = 'quality.cnc.test'
+    _inherit = ['quality.cnc.test', 'jikimo.message.dispatch']
+
+    def create(self, vals_list):
+        res = super(SFMessageQualityCncTest, self).create(vals_list)
+        if res:
+            try:
+                logging.info('add_queue res:%s' % res)
+                res.add_queue('待质量判定')
+            except Exception as e:
+                logging.info('add_queue error:%s' % e)
+        return res
+
+    # 继承并重写jikimo.message.dispatch的_get_message()
+    def _get_message(self, message_queue_ids):
+        contents = []
+        url = self.env['ir.config_parameter'].get_param('web.base.url')
+        i = 0
+        for item in message_queue_ids:
+            if item.message_template_id.bussiness_node_id.name == '待质量判定':
+                content = item.message_template_id.content
+                i += 1
+        if i >= 1:
+            action_id = self.env.ref('sf_quality.action_quality_cnc_test').id
+            url_with_id = f"{url}/web#view_type=list&action={action_id}"
+            content_template = content.replace('{{judge_num}}', str(i))
+            content_template = content_template.replace('{{url}}', url_with_id)
+            contents.append(content_template)
+        return contents
--- a/sf_message/models/sf_message_sale.py
+++ b/sf_message/models/sf_message_sale.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import logging
+from datetime import datetime, timedelta
 from odoo import models, fields, api, _


@@ -12,6 +13,7 @@ class SFMessageSale(models.Model):
        res = super(SFMessageSale, self).create(vals_list)
        if res:
            try:
+                logging.info('add_queue res:%s' % res)
                res.add_queue('待接单')
            except Exception as e:
                logging.info('add_queue error:%s' % e)
@@ -42,16 +44,20 @@ class SFMessageSale(models.Model):
    # 继承并重写jikimo.message.dispatch的_get_message()
    def _get_message(self, message_queue_ids):
        contents = []
+        bussiness_node = None
        url = self.env['ir.config_parameter'].get_param('web.base.url')
+        current_time_strf = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        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)
+        i = 0
        for item in message_queue_ids:
-            # 待接单的处理
            if item.message_template_id.bussiness_node_id.name == '待接单':
                content = super(SFMessageSale, self)._get_message(item)
                action_id = self.env.ref('sale.action_quotations_with_onboarding').id
-                url = f"{url}/web#id={item.res_id}&view_type=form&action={action_id}"
-                content = content[0].replace('{{url}}', url)
+                url_with_id = f"{url}/web#id={item.res_id}&view_type=form&action={action_id}"
+                content = content[0].replace('{{url}}', url_with_id)
                contents.append(content)
-            # 确认接单的处理
            elif item.message_template_id.bussiness_node_id.name == '确认接单':
                content = super(SFMessageSale, self)._get_message(item)
                sale_order_line = self.env['sale.order.line'].search([('order_id', '=', int(item.res_id))])
@@ -59,16 +65,77 @@ class SFMessageSale(models.Model):
                                                                                               sale_order_line[
                                                                                                   0].product_id.name
                action_id = self.env.ref('sf_plan.sf_production_plan_action1').id
-                url = f"{url}/web#view_type=list&action={action_id}"
-                content = content[0].replace('{{product_id}}', product).replace('{{url}}', url)
+                url_with_id = f"{url}/web#view_type=list&action={action_id}"
+                content = content[0].replace('{{product_id}}', product).replace('{{url}}', url_with_id)
                contents.append(content)
+            elif item.message_template_id.bussiness_node_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
+                    target_time = datetime.combine(current_time_datetime.date(), datetime.min.time()).replace(
+                        hour=reminder_time.time_point,
+                        minute=0,
+                        second=0,
+                        microsecond=0
+                    )
+                    logging.info(current_time)
+                    logging.info(target_time)
+                    if target_time - time_range <= current_time_datetime <= target_time + time_range:
+                        search_condition = [
+                            ('delivery_warning', '=', 'warning')] if bussiness_node == '销售订单逾期预警' else [
+                            ('delivery_warning', '=', 'overdue')]
+                        record = self.sudo().search(search_condition + [('id', '=', int(item.res_id))])
+                        if record:
+                            i += 1
+        if i >= 1:
+            action_id = self.env.ref('sale.action_orders').id
+            url_with_id = f"{url}/web#view_type=list&action={action_id}"
+            content_template = content.replace('{{url}}', url_with_id)
+            if bussiness_node == '销售订单逾期预警':
+                content = content_template.replace('{{warning_num}}', str(i))
+            elif bussiness_node == '销售订单已逾期':
+                content = content_template.replace('{{overdue_num}}', str(i))
+            contents.append(content)
        return contents

-        # # 销售订单逾期预警
-    # def _overdue_warning_func(self):
-    #     sale_order_
-    #     return 1
-    #
-    # # 销售订单已逾期
-    # def _overdue_func(self):
-    #     return 1
+    # # 销售订单逾期预警和已逾期
+    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)])
+            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 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('销售订单已逾期')
+
+
--- a/sf_message/models/sf_message_workorder.py
+++ b/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
@@ -6,6 +7,7 @@ from urllib.parse import urlencode

 _logger = logging.getLogger(__name__)

+
 class SFMessageWork(models.Model):
    _name = 'mrp.workorder'
    _inherit = ['mrp.workorder', 'jikimo.message.dispatch']
@@ -23,6 +25,17 @@ class SFMessageWork(models.Model):
    def _get_message(self, message_queue_ids):
        contents = []
        product_id = []
+        bussiness_node = None
+        url = self.env['ir.config_parameter'].get_param('web.base.url')
+        current_time_strf = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        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 == '工单已下发通知':
                content = message_queue_id.message_template_id.content
@@ -37,6 +50,37 @@ 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 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,
+                        second=0,
+                        microsecond=0
+                    )
+                    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 in template_names['预警'] else [
+                            ('delivery_warning', '=', 'overdue')]
+                        record = self.sudo().search(search_condition + [('id', '=', int(item.res_id))])
+                        if record:
+                            i += 1
+        if i >= 1:
+            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 in template_names['预警']:
+                content = content_template.replace('{{warning_num}}', str(i))
+            elif bussiness_node in template_names['已逾期']:
+                content = content_template.replace('{{overdue_num}}', str(i))
+            contents.append(content)
        return contents

    def request_url(self):
@@ -52,3 +96,58 @@ class SFMessageWork(models.Model):
        full_url = url + "/web#" + query_string
        return full_url

+    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)
+
+    def _recover_time_warning_func(self):
+        workorder_done = self.env['mrp.workorder'].search([("state", "=", "done")])
+        workorder_overdue = workorder_done.filtered(lambda x: x.delivery_warning in ['overdue', 'warning'])
+        workorder_overdue.write({'delivery_warning': 'normal'})