添加业务节点

sf_message/__manifest__.py

@@ -11,9 +11,10 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify','stock'],
+    'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify', 'stock'],
     'data': [
-        'data/bussiness_node.xml'
+        'data/bussiness_node.xml',
+        'data/cron_data.xml',
     ],
     'test': [
     ],

sf_message/data/bussiness_node.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" ?>
 <odoo>
     <data noupdate="1">
+        <!--销售订单-->
         <record id="bussiness_pending_order" model="jikimo.message.bussiness.node">
             <field name="name">待接单</field>
             <field name="model">sale.order</field>
@@ -10,6 +11,17 @@
             <field name="name">确认接单</field>
             <field name="model">sale.order</field>
         </record>
+
+        <record id="bussiness_sale_order_overdue_warning" model="jikimo.message.bussiness.node">
+            <field name="name">销售订单逾期预警</field>
+            <field name="model">sale.order</field>
+        </record>
+
+        <record id="bussiness_sale_order_overdue" model="jikimo.message.bussiness.node">
+            <field name="name">销售订单已逾期</field>
+            <field name="model">sale.order</field>
+        </record>
+
         <record id="transfer_inventory" model="jikimo.message.bussiness.node">
             <field name="name">调拨入库</field>
             <field name="model">stock.picking</field>
@@ -26,5 +38,52 @@
             <field name="name">坯料采购提醒</field>
             <field name="model">purchase.order</field>
         </record>
+        <record id="bussiness_material_picking_remind" model="jikimo.message.bussiness.node">
+            <field name="name">坯料发料提醒</field>
+            <field name="model">stock.picking</field>
+        </record>
+
+        <!--工单-->
+        <record id="bussiness_mrp_workorder_remind" model="jikimo.message.bussiness.node">
+            <field name="name">工单已下发通知</field>
+            <field name="model">mrp.workorder</field>
+        </record>
+         <record id="bussiness_mrp_workorder_pre_overdue_warning" model="jikimo.message.bussiness.node">
+            <field name="name">装夹预调工单逾期预警</field>
+            <field name="model">mrp.workorder</field>
+        </record>
+        <record id="bussiness_mrp_workorder_pre_overdue" model="jikimo.message.bussiness.node">
+            <field name="name">装夹预调工单已逾期</field>
+            <field name="model">mrp.workorder</field>
+        </record>
+
+         <record id="bussiness_mrp_workorder_cnc_overdue_warning" model="jikimo.message.bussiness.node">
+            <field name="name">CNC工单逾期预警</field>
+            <field name="model">mrp.workorder</field>
+        </record>
+        <record id="bussiness_mrp_workorder_cnc_overdue" model="jikimo.message.bussiness.node">
+            <field name="name">CNC工单已逾期</field>
+            <field name="model">mrp.workorder</field>
+        </record>
+
+        <record id="bussiness_mrp_workorder_unclamp_overdue_warning" model="jikimo.message.bussiness.node">
+            <field name="name">解除装夹工单逾期预警</field>
+            <field name="model">mrp.workorder</field>
+        </record>
+
+        <record id="bussiness_mrp_workorder_unclamp_overdue" model="jikimo.message.bussiness.node">
+            <field name="name">解除装夹工单已逾期</field>
+            <field name="model">mrp.workorder</field>
+        </record>
+
+         <record id="bussiness_mrp_workorder_surface_overdue_warning" model="jikimo.message.bussiness.node">
+            <field name="name">表面工艺工单逾期预警</field>
+            <field name="model">mrp.workorder</field>
+        </record>
+
+        <record id="bussiness_mrp_workorder_surface_overdue" model="jikimo.message.bussiness.node">
+            <field name="name">表面工艺工单已逾期</field>
+            <field name="model">mrp.workorder</field>
+        </record>
     </data>
 </odoo>

sf_message/data/cron_data.xml

@@ -0,0 +1,160 @@
+<odoo>
+    <data noupdate="1">
+        <record model="ir.cron" id="ir_cron_sale_order_overdue_warning">
+            <field name="name">销售订单逾期预警</field>
+            <field name="model_id" ref="model_sale_order"/>
+            <field name="state">code</field>
+            <field name="code">model._overdue_warning_func()</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field name="doall" eval="False"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="active" eval="True"/>
+        </record>
+
+         <record model="ir.cron" id="ir_cron_sale_order_overdue">
+            <field name="name">销售订单已逾期</field>
+            <field name="model_id" ref="model_sale_order"/>
+            <field name="state">code</field>
+            <field name="code">model._overdue_func()</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field name="doall" eval="False"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="active" eval="True"/>
+        </record>
+
+        <record model="ir.cron" id="ir_cron_mrp_workorder_overdue_warning">
+            <field name="name">装夹预调工单逾期预警</field>
+            <field name="model_id" ref="model_mrp_workorder"/>
+            <field name="state">code</field>
+            <field name="code">model._overdue_warning_func()</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field name="doall" eval="False"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="active" eval="True"/>
+        </record>
+
+         <record model="ir.cron" id="ir_cron_mrp_workorder_overdue">
+            <field name="name">工单已逾期</field>
+            <field name="model_id" ref="model_mrp_workorder"/>
+            <field name="state">code</field>
+            <field name="code">model._overdue_func()</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field name="doall" eval="False"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="active" eval="True"/>
+        </record>
+<!--        -->
+<!--          <record model="ir.cron" id="ir_cron_mrp_workorder_overdue_warning">-->
+<!--            <field name="name">工单逾期预警</field>-->
+<!--            <field name="model_id" ref="model_mrp_workorder"/>-->
+<!--            <field name="state">code</field>-->
+<!--            <field name="code">model._overdue_warning_func()</field>-->
+<!--            <field name="interval_number">1</field>-->
+<!--            <field name="interval_type">minutes</field>-->
+<!--            <field name="numbercall">-1</field>-->
+<!--            <field name="doall" eval="False"/>-->
+<!--            <field name="user_id" ref="base.user_root"/>-->
+<!--            <field name="active" eval="True"/>-->
+<!--        </record>-->
+
+<!--         <record model="ir.cron" id="ir_cron_mrp_workorder_pre_overdue">-->
+<!--            <field name="name">工单已逾期</field>-->
+<!--            <field name="model_id" ref="model_mrp_workorder"/>-->
+<!--            <field name="state">code</field>-->
+<!--            <field name="code">model._overdue_func()</field>-->
+<!--            <field name="interval_number">1</field>-->
+<!--            <field name="interval_type">minutes</field>-->
+<!--            <field name="numbercall">-1</field>-->
+<!--            <field name="doall" eval="False"/>-->
+<!--            <field name="user_id" ref="base.user_root"/>-->
+<!--            <field name="active" eval="True"/>-->
+<!--        </record>-->
+<!--        -->
+<!--          <record model="ir.cron" id="ir_cron_mrp_workorder_pre_overdue_warning">-->
+<!--            <field name="name">工单逾期预警</field>-->
+<!--            <field name="model_id" ref="model_mrp_workorder"/>-->
+<!--            <field name="state">code</field>-->
+<!--            <field name="code">model._overdue_warning_func()</field>-->
+<!--            <field name="interval_number">1</field>-->
+<!--            <field name="interval_type">minutes</field>-->
+<!--            <field name="numbercall">-1</field>-->
+<!--            <field name="doall" eval="False"/>-->
+<!--            <field name="user_id" ref="base.user_root"/>-->
+<!--            <field name="active" eval="True"/>-->
+<!--        </record>-->
+
+<!--         <record model="ir.cron" id="ir_cron_mrp_workorder_pre_overdue">-->
+<!--            <field name="name">工单已逾期</field>-->
+<!--            <field name="model_id" ref="model_mrp_workorder"/>-->
+<!--            <field name="state">code</field>-->
+<!--            <field name="code">model._overdue_func()</field>-->
+<!--            <field name="interval_number">1</field>-->
+<!--            <field name="interval_type">minutes</field>-->
+<!--            <field name="numbercall">-1</field>-->
+<!--            <field name="doall" eval="False"/>-->
+<!--            <field name="user_id" ref="base.user_root"/>-->
+<!--            <field name="active" eval="True"/>-->
+<!--        </record>-->
+<!--        -->
+<!--        -->
+<!--          <record model="ir.cron" id="ir_cron_mrp_workorder_pre_overdue_warning">-->
+<!--            <field name="name">工单逾期预警</field>-->
+<!--            <field name="model_id" ref="model_mrp_workorder"/>-->
+<!--            <field name="state">code</field>-->
+<!--            <field name="code">model._overdue_warning_func()</field>-->
+<!--            <field name="interval_number">1</field>-->
+<!--            <field name="interval_type">minutes</field>-->
+<!--            <field name="numbercall">-1</field>-->
+<!--            <field name="doall" eval="False"/>-->
+<!--            <field name="user_id" ref="base.user_root"/>-->
+<!--            <field name="active" eval="True"/>-->
+<!--        </record>-->
+
+<!--         <record model="ir.cron" id="ir_cron_mrp_workorder_pre_overdue">-->
+<!--            <field name="name">工单已逾期</field>-->
+<!--            <field name="model_id" ref="model_mrp_workorder"/>-->
+<!--            <field name="state">code</field>-->
+<!--            <field name="code">model._overdue_func()</field>-->
+<!--            <field name="interval_number">1</field>-->
+<!--            <field name="interval_type">minutes</field>-->
+<!--            <field name="numbercall">-1</field>-->
+<!--            <field name="doall" eval="False"/>-->
+<!--            <field name="user_id" ref="base.user_root"/>-->
+<!--            <field name="active" eval="True"/>-->
+<!--        </record>-->
+<!--        -->
+<!--          <record model="ir.cron" id="ir_cron_mrp_workorder_pre_overdue_warning">-->
+<!--            <field name="name">工单逾期预警</field>-->
+<!--            <field name="model_id" ref="model_mrp_workorder"/>-->
+<!--            <field name="state">code</field>-->
+<!--            <field name="code">model._overdue_warning_func()</field>-->
+<!--            <field name="interval_number">1</field>-->
+<!--            <field name="interval_type">minutes</field>-->
+<!--            <field name="numbercall">-1</field>-->
+<!--            <field name="doall" eval="False"/>-->
+<!--            <field name="user_id" ref="base.user_root"/>-->
+<!--            <field name="active" eval="True"/>-->
+<!--        </record>-->
+
+<!--         <record model="ir.cron" id="ir_cron_mrp_workorder_pre_overdue">-->
+<!--            <field name="name">工单已逾期</field>-->
+<!--            <field name="model_id" ref="model_mrp_workorder"/>-->
+<!--            <field name="state">code</field>-->
+<!--            <field name="code">model._overdue_func()</field>-->
+<!--            <field name="interval_number">1</field>-->
+<!--            <field name="interval_type">minutes</field>-->
+<!--            <field name="numbercall">-1</field>-->
+<!--            <field name="doall" eval="False"/>-->
+<!--            <field name="user_id" ref="base.user_root"/>-->
+<!--            <field name="active" eval="True"/>-->
+<!--        </record>-->
+    </data>
+</odoo>

sf_message/models/sf_message_sale.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import logging
 from odoo import models, fields, api, _
 
 
@@ -10,6 +11,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)
@@ -28,12 +30,29 @@ class SFMessageSale(models.Model):
     # 继承并重写jikimo.message.dispatch的_get_message()
     def _get_message(self, message_queue_ids):
         res = super(SFMessageSale, self)._get_message(message_queue_ids)
-        if message_queue_ids.message_template_id.bussiness_node_id.name == '确认接单':
+        new_res = []
-            # sale_order = self.env['sale.order'].search([('id', '=', message_queue_ids.model.res_id)])
+        processed_messages = set()  # 用于跟踪已经处理过的消息
-            sale_order_line = self.env['sale.order.line'].search([('order_id', '=', int(message_queue_ids.res_id))])
+        for item in message_queue_ids:
-            if len(sale_order_line) == 1:
+            if item.message_template_id.bussiness_node_id.name == '确认接单':
-                product = sale_order_line[0].product_id.name
+                sale_order_line = self.env['sale.order.line'].search([('order_id', '=', int(item.res_id))])
-            elif len(sale_order_line) > 1:
+                if len(sale_order_line) == 1:
-                product = '%s...' % sale_order_line[0].product_id.name
+                    product = sale_order_line[0].product_id.name
-            res[0] = res[0].replace('{{product_id}}', product)
+                elif len(sale_order_line) > 1:
+                    product = '%s...' % sale_order_line[0].product_id.name
+                for message in res:
+                    message_text = message.replace('{{product_id}}', product)
+                    if message_text not in processed_messages:
+                        new_res.append(message_text)
+                        processed_messages.add(message_text)
+        if new_res:
+            res = new_res
         return res
+
+    # 销售订单逾期预警
+    def _overdue_warning_func(self):
+        sale_order_
+        return 1
+
+    # 销售订单已逾期
+    def _overdue_func(self):
+        return 1