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

Accept Merge Request #2160: (feature/采购消息通知 -> develop)

Browse Source 
Merge Request: Merge branch 'feature/销售订单优化' into feature/采购消息通知

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2160
This commit is contained in:
禹翔辉
2025-06-04 16:28:15 +08:00
committed by Coding
parent 4b8d00ec1d b7642d1e0f
commit e7d84e9df2
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sf_message/models/sf_message_product.py
View File

@@ -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):

2
sf_message/models/sf_message_purchase_request.py
View File

@@ -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

4
sf_message/models/sf_message_quality_check.py
View File

@@ -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