解决冲突
This commit is contained in:
@@ -14,19 +14,24 @@ class SFMessageMrpProduction(models.Model):
|
||||
'workorder_ids.state', 'product_qty', 'qty_producing')
|
||||
def _compute_state(self):
|
||||
super(SFMessageMrpProduction, self)._compute_state()
|
||||
for record in self:
|
||||
if record.state in ['scrap', 'done']:
|
||||
# 查询制造订单下的所有未完成的生产订单
|
||||
mrp_production = record.env['mrp.production'].search(
|
||||
[('origin', '=', record.origin), ('state', 'not in', ['scrap', 'done'])])
|
||||
if not mrp_production:
|
||||
mrp_production_queue = self.env["jikimo.message.queue"].search([('res_id', '=', record.id)])
|
||||
if not mrp_production_queue:
|
||||
record.add_queue('生产完工入库提醒')
|
||||
try:
|
||||
for record in self:
|
||||
if record.state in ['scrap', 'done']:
|
||||
# 查询制造订单下的所有未完成的生产订单
|
||||
mrp_production = record.env['mrp.production'].search(
|
||||
[('origin', '=', record.origin), ('state', 'not in', ['scrap', 'done'])])
|
||||
if not mrp_production:
|
||||
mrp_production_queue = self.env["jikimo.message.queue"].search([('res_id', '=', record.id)])
|
||||
if not mrp_production_queue:
|
||||
record.add_queue('生产完工入库提醒')
|
||||
except Exception as e:
|
||||
logging.info('add_queue生产完工入库提醒 error:%s' % e)
|
||||
|
||||
# 获取发送消息内容
|
||||
def _get_message(self, message_queue_ids):
|
||||
contents = []
|
||||
unique_products = set()
|
||||
technology_to_confirmed = set()
|
||||
for message_queue_id in message_queue_ids:
|
||||
if message_queue_id.message_template_id.name == '生产完工入库提醒':
|
||||
content = message_queue_id.message_template_id.content
|
||||
@@ -40,15 +45,65 @@ class SFMessageMrpProduction(models.Model):
|
||||
content = content.replace('{{name}}', stock_picking_sfp.name).replace(
|
||||
'{{sale_order_name}}', mrp_production.origin).replace('{{request_url}}', url)
|
||||
contents.append(content)
|
||||
if message_queue_id.message_template_id.name == '待确认加工路线':
|
||||
content = message_queue_id.message_template_id.content
|
||||
mrp_production = self.env['mrp.production'].sudo().search([('id', '=', int(message_queue_id.res_id))])
|
||||
technology_to_confirmed.add(mrp_production.product_id.id)
|
||||
if message_queue_id.message_template_id.name == '待排程':
|
||||
content = message_queue_id.message_template_id.content
|
||||
mrp_production = self.env['mrp.production'].sudo().search([('id', '=', int(message_queue_id.res_id))])
|
||||
unique_products.add(mrp_production.product_id.id)
|
||||
if message_queue_id.message_template_id.name == '工序外协发料通知':
|
||||
content = message_queue_id.message_template_id.content
|
||||
mrp_production = self.env['mrp.production'].sudo().search([('id', '=', int(message_queue_id.res_id))])
|
||||
mrp_production_list = self.env['mrp.production'].sudo().search(
|
||||
[('product_id', '=', mrp_production.product_id.id)])
|
||||
mrp_production_names = mrp_production_list.mapped('name')
|
||||
stock_picking_num = self.env['stock.picking'].sudo().search_count(
|
||||
[('origin', 'in', mrp_production_names), ('state', '=', 'assigned')])
|
||||
if stock_picking_num >= 1:
|
||||
url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
|
||||
action_id = self.env.ref('stock.action_picking_tree_ready').id
|
||||
url_with_id = f"{url}/web#view_type=list&action={action_id}"
|
||||
content = content.replace('{{name}}', mrp_production.product_id.name).replace('{{url}}',
|
||||
url_with_id).replace(
|
||||
'{{num}}', str(stock_picking_num))
|
||||
contents.append(content)
|
||||
if unique_products:
|
||||
action_id = self.env.ref('sf_plan.sf_production_plan_action1').id
|
||||
unique_products_contents = self.get_production_info(content, unique_products, 'confirmed',
|
||||
action_id)
|
||||
contents.extend(unique_products_contents)
|
||||
if technology_to_confirmed:
|
||||
action_id = self.env.ref('mrp.mrp_production_action').id
|
||||
technology_to_confirmed_contents = self.get_production_info(content, technology_to_confirmed,
|
||||
'technology_to_confirmed',
|
||||
action_id)
|
||||
contents.extend(technology_to_confirmed_contents)
|
||||
logging.info('生产完工入库提醒: %s' % contents)
|
||||
return contents, message_queue_ids
|
||||
|
||||
def get_production_info(self, content, product_ids, state, action_id):
|
||||
contents = []
|
||||
for products_id in product_ids:
|
||||
product_name = self.env['product.product'].sudo().search([('id', '=', products_id)]).name
|
||||
production_num = self.env['mrp.production'].sudo().search_count(
|
||||
[('product_id', '=', products_id), ('state', '=', state)])
|
||||
if production_num >= 1:
|
||||
url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
|
||||
url_with_id = f"{url}/web#view_type=list&action={action_id}"
|
||||
new_content = (content.replace('{{name}}', product_name)
|
||||
.replace('{{url}}', url_with_id)
|
||||
.replace('{{production_num}}', str(production_num)))
|
||||
contents.append(new_content)
|
||||
return contents
|
||||
|
||||
def request_url(self, id):
|
||||
url = self.env['ir.config_parameter'].get_param('web.base.url')
|
||||
action_id = self.env.ref('stock.action_picking_tree_all').id
|
||||
menu_id = self.env['ir.model.data'].search([('name', '=', 'module_theme_treehouse')]).id
|
||||
# 查询参数
|
||||
params = {'id': id, 'menu_id': menu_id, 'action': action_id, 'model': 'mrp.production',
|
||||
params = {'id': id, 'menu_id': menu_id, 'action': action_id, 'model': 'mrp.production',
|
||||
'view_type': 'form'}
|
||||
# 拼接查询参数
|
||||
query_string = urlencode(params)
|
||||
|
||||
Reference in New Issue
Block a user