diff --git a/sf_message/models/sf_message_product.py b/sf_message/models/sf_message_product.py index 302aa5a0..802e2de5 100644 --- a/sf_message/models/sf_message_product.py +++ b/sf_message/models/sf_message_product.py @@ -29,18 +29,18 @@ class SFMessageProduct(models.Model): '{{number}}', str(production_num)).replace( '{{request_url}}', url) contents.append(content) - if message_queue_id.message_template_id.name == '待质检提醒': - content = message_queue_id.message_template_id.content - product_product = self.env['product.product'].sudo().search([('id', '=', int(message_queue_id.res_id))]) - quality_check_num = self.env['quality.check'].sudo().search_count( - [('product_id', '=', product_product.id), ('quality_state', '=', 'none')]) - if quality_check_num >= 1: - url = self.env['ir.config_parameter'].sudo().get_param('web.base.url') - action_id = self.env.ref('quality_control.quality_check_action_report').id - url_with_id = f"{url}/web#view_type=list&action={action_id}" - content = content.replace('{{name}}', product_product.name).replace('{{url}}', url_with_id).replace( - '{{num}}', str(quality_check_num)) - contents.append(content) + # if message_queue_id.message_template_id.name == '待质检提醒': + # content = message_queue_id.message_template_id.content + # product_product = self.env['product.product'].sudo().search([('id', '=', int(message_queue_id.res_id))]) + # quality_check_num = self.env['quality.check'].sudo().search_count( + # [('product_id', '=', product_product.id), ('quality_state', '=', 'none')]) + # if quality_check_num >= 1: + # url = self.env['ir.config_parameter'].sudo().get_param('web.base.url') + # action_id = self.env.ref('quality_control.quality_check_action_report').id + # url_with_id = f"{url}/web#view_type=list&action={action_id}" + # content = content.replace('{{name}}', product_product.name).replace('{{url}}', url_with_id).replace( + # '{{num}}', str(quality_check_num)) + # contents.append(content) return contents, message_queue_ids def get_request_url(self, routing_type): diff --git a/sf_message/models/sf_message_purchase_request.py b/sf_message/models/sf_message_purchase_request.py index 56d5df42..0f251bd3 100644 --- a/sf_message/models/sf_message_purchase_request.py +++ b/sf_message/models/sf_message_purchase_request.py @@ -12,7 +12,7 @@ class SFMessagePurchaseRequest(models.Model): def write(self, vals): original_state = self.state res = super(SFMessagePurchaseRequest, self).write(vals) - if res and vals.get('state') == 'approved' and original_state != 'approved': + if vals.get('state') == 'approved' and original_state != 'approved': self.add_queue('采购申请待处理通知') return res diff --git a/sf_message/models/sf_message_quality_check.py b/sf_message/models/sf_message_quality_check.py index 8a30d770..31e92370 100644 --- a/sf_message/models/sf_message_quality_check.py +++ b/sf_message/models/sf_message_quality_check.py @@ -58,10 +58,10 @@ class SFMessageQualityCheck(models.Model): for message_queue_id in message_queue_ids: if message_queue_id.message_template_id.name == '待质检提醒': content = message_queue_id.message_template_id.content + qc_line = self.search([('id', '=', int(message_queue_id.res_id))]) url = self.request_url(int(message_queue_id.res_id)) - qc_line = self.env['quality.check'].search([('id', '=', int(message_queue_id.res_id))]) content = content.replace('{{name}}', qc_line.name).replace( - '{{request_url}}', url).replace('{{type_name}}', qc_line.point_id.title) + '{{url}}', url).replace('{{type_name}}', qc_line.point_id.title) contents.append(content) return contents, message_queue_ids