diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml index 708a9779..6d9bf88f 100644 --- a/sf_manufacturing/views/mrp_workorder_view.xml +++ b/sf_manufacturing/views/mrp_workorder_view.xml @@ -102,7 +102,7 @@ current [('state', '!=', 'cancel'),('schedule_state', '=', '已排')] {'search_default_product': 1, 'search_default_workcenter_id': - active_id,'search_default_filter_order_warning':1,'search_default_filter_order_overdue':1} + active_id,'search_default_filter_order_warning':1,'search_default_filter_order_overdue':1,'search_default_filter_order_normal':1}

@@ -125,9 +125,9 @@ mrp.workorder - - - + + + @@ -642,6 +642,7 @@ + diff --git a/sf_message/data/template_data.xml b/sf_message/data/template_data.xml index 8a01f5f1..beb37771 100644 --- a/sf_message/data/template_data.xml +++ b/sf_message/data/template_data.xml @@ -36,7 +36,7 @@ markdown normal ### 销售订单逾期预警 -事项：共有[{{warning_num}}]({{url}})个销售订单有逾期风险 +事项：[共有{{warning_num}}个销售订单有逾期风险]({{url}}) @@ -48,7 +48,7 @@ markdown urgent ### 销售订单已逾期提醒 -事项：共有[{{overdue_num}}]({{url}})个销售订单已逾期 +事项：[共有{{overdue_num}}个销售订单已逾期]({{url}}) @@ -97,7 +97,7 @@ timing normal ### 工单逾期预警 -事项：共有[{{warning_num}}]({{url}})个工单有逾期风险 +事项：[共有{{warning_num}}个工单有逾期风险]({{url}}) @@ -109,7 +109,7 @@ timing normal ### 工单已逾期提醒 -事项：共有[{{overdue_num}}]({{url}})个工单已逾期 +事项：[共有{{overdue_num}}个工单已逾期]({{url}}) @@ -121,7 +121,7 @@ timing normal ### 工单逾期预警 -事项：共有[{{warning_num}}]({{url}})个工单有逾期风险 +事项：[共有{{warning_num}}个工单有逾期风险]({{url}}) @@ -133,7 +133,7 @@ timing normal ### 工单已逾期提醒 -事项：共有[{{overdue_num}}]({{url}})个工单已逾期 +事项：[共有{{overdue_num}}个工单已逾期]({{url}}) @@ -145,7 +145,7 @@ timing normal ### 工单逾期预警 -事项：共有[{{warning_num}}]({{url}})个工单有逾期风险 +事项：[共有{{warning_num}}个工单有逾期风险]({{url}}) @@ -157,7 +157,7 @@ timing normal ### 工单已逾期提醒 -事项：共有[{{overdue_num}}]({{url}})个工单已逾期 +事项：[共有{{overdue_num}}个工单已逾期]({{url}}) @@ -169,7 +169,7 @@ timing normal ### 工单逾期预警 -事项：共有[{{warning_num}}]({{url}})个工单有逾期风险 +事项：[共有{{warning_num}}个工单有逾期风险]({{url}}) @@ -181,7 +181,7 @@ timing normal ### 工单已逾期提醒 -事项：共有[{{overdue_num}}]({{url}})个工单已逾期 +事项：[共有{{overdue_num}}个工单已逾期]({{url}}) @@ -262,7 +262,7 @@ markdown normal ### 待质量判定提醒 -事项：共有[{{judge_num}}]({{url}})个工单需判定质量结果 +事项：[共有{{judge_num}}个工单需判定质量结果]({{url}}) 设备故障 diff --git a/sf_message/models/sf_message_sale.py b/sf_message/models/sf_message_sale.py index 9907dbc9..f9932013 100644 --- a/sf_message/models/sf_message_sale.py +++ b/sf_message/models/sf_message_sale.py @@ -100,15 +100,22 @@ class SFMessageSale(models.Model): # # 销售订单逾期预警和已逾期 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}") + 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) + today_str = datetime.strptime(current_time, '%Y-%m-%d %H:%M:%S') + today = today_str.strftime("%Y-%m-%d") + # 计算下一天的日期 + deadline_check_str = today_str + timedelta(days=1) + deadline_check = deadline_check_str.strftime("%Y-%m-%d") + logging.info( + f"today: {today}, deadline_check: {deadline_check},current_time_strf: {current_time_strf}, current_time: {current_time}'") sale_order = self.sudo().search( [('state', 'in', ['sale']), ('deadline_of_delivery', '!=', False), ('delivery_status', '!=', 'full')]) 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'])) + deadline_of_delivery = item.deadline_of_delivery.strftime("%Y-%m-%d") if (len(production_not_done) >= 1 and len(production_not_done) != item.mrp_production_count) or len( production_not_done) != production_done_count: # logging.info("-----不等于----") @@ -116,9 +123,9 @@ class SFMessageSale(models.Model): # logging.info( # f"production_not_done: {len(production_not_done)}, production_done_count: {production_done_count}") # logging.info(f"deadline_of_delivery: {item.deadline_of_delivery}") - if deadline_check == item.deadline_of_delivery and item.delivery_warning not in ['warning']: + if deadline_check == deadline_of_delivery and item.delivery_warning not in ['warning']: item.delivery_warning = 'warning' - elif today >= item.deadline_of_delivery and item.delivery_warning not in ['overdue']: + elif today >= deadline_of_delivery and item.delivery_warning not in ['overdue']: item.delivery_warning = 'overdue' elif production_done_count == item.mrp_production_count: # logging.info("-----等于----") @@ -127,9 +134,9 @@ class SFMessageSale(models.Model): # f"production_not_done: {len(production_not_done)}, production_done_count: {production_done_count}") # logging.info(f"deadline_of_delivery: {item.deadline_of_delivery}") if item.delivery_status in ['pending', 'partial']: - if deadline_check == item.deadline_of_delivery and item.delivery_warning not in ['warning']: + if deadline_check == deadline_of_delivery and item.delivery_warning not in ['warning']: item.delivery_warning = 'warning' - elif today >= item.deadline_of_delivery and item.delivery_warning not in ['overdue']: + elif today >= deadline_of_delivery and item.delivery_warning not in ['overdue']: item.delivery_warning = 'overdue' else: # logging.info("-----1111111----") @@ -158,6 +165,23 @@ class SFMessageSale(models.Model): if not sale_order_has: message_name = '销售订单逾期预警' if wo.delivery_warning == 'warning' else '销售订单已逾期' wo.add_queue(message_name) + if wo.delivery_warning == 'overdue': + # 把消息队列中销售订单预警的状态改为取消发送 + business_node_id_warning = business_node_ids['warning'] + if business_node_id_warning: + message_template_warning = self.env["jikimo.message.template"].search([ + ("model", "=", self._name), + ("bussiness_node_id", "=", business_node_id_warning) + ], limit=1) + if message_template_warning: + sale_order_warning = self.env['jikimo.message.queue'].search([ + ('res_id', '=', wo.id), + ('message_status', '=', 'pending'), + ('message_template_id', '=', message_template_warning.id) + ]) + if sale_order_warning: + logging.info('取消发送:%s' % sale_order_warning.name) + sale_order_warning.write({'message_status': 'cancel'}) def _recover_sale_time_warning_func(self): sale_order_done = self.sudo().search([('state', 'in', ['sale']), ('delivery_status', '=', 'full')]) diff --git a/sf_message/models/sf_message_workorder.py b/sf_message/models/sf_message_workorder.py index 1786a796..7549cffd 100644 --- a/sf_message/models/sf_message_workorder.py +++ b/sf_message/models/sf_message_workorder.py @@ -71,10 +71,22 @@ class SFMessageWork(models.Model): ('delivery_warning', '=', 'overdue')] record = self.sudo().search(search_condition + [('id', '=', int(message_queue_id.res_id))]) if record: + bussiness_node = item.bussiness_node_id.name + # 分割业务节点名称，提取出业务节点关键字 + business_node_key = bussiness_node.split('工单')[0].strip() + workcenter_mapping = { + '装夹预调': '工件装夹', + 'CNC加工': '自动产线', + '解除装夹': '工件拆卸', + '表面工艺': '表面工艺外协', + } + workcenter_name = workcenter_mapping.get(business_node_key, '表面工艺外协') + active_id = self.env['mrp.workcenter'].search([('name', 'ilike', workcenter_name)], + limit=1).id i += 1 if i >= 1: action_id = self.env.ref('sf_message.mrp_workorder_action_notify').id - url_with_id = f"{url}/web#view_type=list&action={action_id}" + url_with_id = f"{url}/web#view_type=list&action={action_id}&active_id={active_id}" content_template = content.replace('{{url}}', url_with_id) if bussiness_node in template_names['预警']: content = content_template.replace('{{warning_num}}', str(i)) @@ -160,6 +172,24 @@ class SFMessageWork(models.Model): args = [f'{item.routing_type}{overdue_message}'] # 获取add_queue方法并调用它，传入参数列表 getattr(item, queue_method_name)(*args) + if item.delivery_warning == 'overdue': + # 把消息队列中销售订单预警的状态改为取消发送 + key = f"{item.routing_type}_{'warning'}" + business_node_id_warning = business_node_ids.get(key, None) + if business_node_id_warning: + message_template_warning = self.env["jikimo.message.template"].search([ + ("model", "=", self._name), + ("bussiness_node_id", "=", business_node_id_warning) + ], limit=1) + if message_template_warning: + work_order_warning = self.env['jikimo.message.queue'].search([ + ('res_id', '=', item.id), + ('message_status', '=', 'pending'), + ('message_template_id', '=', message_template_warning.id) + ]) + if work_order_warning: + logging.info('取消发送:%s' % work_order_warning.name) + work_order_warning.write({'message_status': 'cancel'}) def _recover_time_warning_func(self): workorder_done = self.env['mrp.workorder'].search([("state", "in", ["done", "rework", "cancel"])])