Merge branch 'feature/修复销售订单完成时效' into develop

sf_manufacturing/models/mrp_workorder.py

@@ -59,7 +59,8 @@ class ResMrpWorkOrder(models.Model):
         compute='_compute_state', store=True,
         default='pending', copy=False, readonly=True, recursive=True, index=True, tracking=True)
 
-    delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效')
+    delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效',
+                                        tracking=True)
 
     @api.depends('production_id.manual_quotation')
     def _compute_manual_quotation(self):

sf_message/data/cron_data.xml

@@ -13,6 +13,19 @@
             <field name="active" eval="True"/>
         </record>
 
+        <record model="ir.cron" id="ir_cron_sale_order_recover_time_warning">
+            <field name="name">检查销售订单是否完成并恢复正常时效</field>
+            <field name="model_id" ref="model_sale_order"/>
+            <field name="state">code</field>
+            <field name="code">model._recover_sale_time_warning_func()</field>
+            <field name="interval_number">10</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"/>

sf_message/models/sf_message_sale.py

@@ -158,3 +158,8 @@ class SFMessageSale(models.Model):
                 if not sale_order_has:
                     message_name = '销售订单逾期预警' if wo.delivery_warning == 'warning' else '销售订单已逾期'
                     wo.add_queue(message_name)
+
+    def _recover_sale_time_warning_func(self):
+        sale_order_done = self.sudo().search([('state', 'in', ['sale']), ('delivery_status', '=', 'full')])
+        sale_order_overdue = sale_order_done.filtered(lambda x: x.delivery_warning in ['overdue', 'warning'])
+        sale_order_overdue.write({'delivery_warning': 'normal'})

sf_sale/models/sale_order.py

@@ -55,7 +55,8 @@ class ReSaleOrder(models.Model):
         store=True, readonly=False, copy=False, precompute=True,
         states=READONLY_FIELD_STATES, default=fields.Datetime.now)
 
-    delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效')
+    delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效',
+                                        tracking=True)
 
     # 业务平台分配工厂后在智能工厂先创建销售订单
     def sale_order_create(self, company_id, delivery_name, delivery_telephone, delivery_address,