jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/修复销售订单和工单消息提醒' into develop

Browse Source
This commit is contained in:
jinling.yang
2024-10-24 17:36:00 +08:00
parent ae08c5b56e 4cc03aee9b
commit b64893436b
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sf_message/data/template_data.xml
View File

@@ -97,7 +97,7 @@
<field name="send_type">timing</field>
<field name="urgency">normal</field>
<field name="content">### 工单逾期预警
事项：共有[{{warning_num}}]({{url}})工单有逾期风险</field>
事项：共有[{{warning_num}}]({{url}})个工单有逾期风险</field>
</record>
<record id="template_mrp_workorder_pre_overdue" model="jikimo.message.template">
@@ -109,7 +109,7 @@
<field name="send_type">timing</field>
<field name="urgency">normal</field>
<field name="content">### 工单已逾期提醒
事项：共有[{{overdue_num}}]({{url}})工单已逾期</field>
事项：共有[{{overdue_num}}]({{url}})个工单已逾期</field>
</record>
<record id="template_mrp_workorder_cnc_overdue_warning" model="jikimo.message.template">
@@ -121,7 +121,7 @@
<field name="send_type">timing</field>
<field name="urgency">normal</field>
<field name="content">### 工单逾期预警
事项：共有[{{warning_num}}]({{url}})工单有逾期风险</field>
事项：共有[{{warning_num}}]({{url}})个工单有逾期风险</field>
</record>
<record id="template_mrp_workorder_cnc_overdue" model="jikimo.message.template">
@@ -133,7 +133,7 @@
<field name="send_type">timing</field>
<field name="urgency">normal</field>
<field name="content">### 工单已逾期提醒
事项：共有[{{overdue_num}}]({{url}})工单已逾期</field>
事项：共有[{{overdue_num}}]({{url}})个工单已逾期</field>
</record>
<record id="template_mrp_workorder_unclamp_overdue_warning" model="jikimo.message.template">
@@ -145,7 +145,7 @@
<field name="send_type">timing</field>
<field name="urgency">normal</field>
<field name="content">### 工单逾期预警
事项：共有[{{warning_num}}]({{url}})工单有逾期风险</field>
事项：共有[{{warning_num}}]({{url}})个工单有逾期风险</field>
</record>
<record id="template_mrp_workorder_unclamp_overdue" model="jikimo.message.template">
@@ -157,7 +157,7 @@
<field name="send_type">timing</field>
<field name="urgency">normal</field>
<field name="content">### 工单已逾期提醒
事项：共有[{{overdue_num}}]({{url}})工单已逾期</field>
事项：共有[{{overdue_num}}]({{url}})个工单已逾期</field>
</record>
<record id="template_mrp_workorder_surface_overdue_warning" model="jikimo.message.template">
@@ -169,7 +169,7 @@
<field name="send_type">timing</field>
<field name="urgency">normal</field>
<field name="content">### 工单逾期预警
事项：共有[{{warning_num}}]({{url}})工单有逾期风险</field>
事项：共有[{{warning_num}}]({{url}})个工单有逾期风险</field>
</record>
<record id="template_mrp_workorder_surface_overdue" model="jikimo.message.template">
@@ -181,7 +181,7 @@
<field name="send_type">timing</field>
<field name="urgency">normal</field>
<field name="content">### 工单已逾期提醒
事项：共有[{{overdue_num}}]({{url}})工单已逾期</field>
事项：共有[{{overdue_num}}]({{url}})个工单已逾期</field>
</record>

7
sf_message/models/sf_message_sale.py
View File

@@ -162,4 +162,11 @@ class SFMessageSale(models.Model):
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'])
if sale_order_overdue:
sale_order_overdue.write({'delivery_warning': 'normal'})
message_queue_ids = self.env["jikimo.message.queue"].sudo().search([
("message_status", "=", "pending"),
("res_id", "in", [item.id for item in sale_order_overdue])
])
if message_queue_ids:
message_queue_ids.write({'message_status': 'cancel'})

9
sf_message/models/sf_message_workorder.py
View File

@@ -69,7 +69,7 @@ class SFMessageWork(models.Model):
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))])
record = self.sudo().search(search_condition + [('id', '=', int(message_queue_id.res_id))])
if record:
i += 1
if i >= 1:
@@ -164,4 +164,11 @@ class SFMessageWork(models.Model):
def _recover_time_warning_func(self):
workorder_done = self.env['mrp.workorder'].search([("state", "in", ["done", "rework", "cancel"])])
workorder_overdue = workorder_done.filtered(lambda x: x.delivery_warning in ['overdue', 'warning'])
if workorder_overdue:
workorder_overdue.write({'delivery_warning': 'normal'})
message_queue_ids = self.env["jikimo.message.queue"].sudo().search([
("message_status", "=", "pending"),
("res_id", "in", [item.id for item in workorder_overdue])
])
if message_queue_ids:
message_queue_ids.write({'message_status': 'cancel'})