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

优化工单消息推送

Browse Source
This commit is contained in:
jinling.yang
2024-10-09 17:58:47 +08:00
parent 2639a6ac6b
commit 02467d5220
4 changed files with 103 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
sf_message/data/cron_data.xml
View File

@@ -26,31 +26,31 @@
<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_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">
<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>-->

4
sf_message/data/template_data.xml
View File

@@ -36,7 +36,7 @@
<field name="msgtype">markdown</field>
<field name="urgency">normal</field>
<field name="content">### 销售订单逾期预警
事项：共有[{{sale_warning_num}}]({{url}})个销售订单有逾期风险
事项：共有[{{warning_num}}]({{url}})个销售订单有逾期风险
</field>
</record>
@@ -48,7 +48,7 @@
<field name="msgtype">markdown</field>
<field name="urgency">urgent</field>
<field name="content">### 销售订单已逾期提醒
事项：共有[{{sale_overdue_num}}]({{url}})个销售订单已逾期
事项：共有[{{overdue_num}}]({{url}})个销售订单已逾期
</field>
</record>

4
sf_message/models/sf_message_sale.py
View File

@@ -91,9 +91,9 @@ class SFMessageSale(models.Model):
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('{{sale_warning_num}}', str(i))
content = content_template.replace('{{warning_num}}', str(i))
elif bussiness_node == '销售订单已逾期':
content = content_template.replace('{{sale_overdue_num}}', str(i))
content = content_template.replace('{{overdue_num}}', str(i))
contents.append(content)
return contents

75
sf_message/models/sf_message_workorder.py
View File

@@ -6,10 +6,13 @@ from urllib.parse import urlencode
_logger = logging.getLogger(__name__)
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()
@@ -23,6 +26,13 @@ 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)
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 +47,34 @@ 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
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('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 == '工单逾期预警':
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 request_url(self):
@@ -54,3 +92,40 @@ 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('销售订单已逾期')