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

解决合并冲突

Browse Source
This commit is contained in:
hujiaying
2024-10-10 16:08:23 +08:00
parent 298d2391de
commit d1ff7c196d
1 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
sf_message/models/sf_message_stock_picking.py
View File

@@ -32,21 +32,17 @@ class SFMessageStockPicking(models.Model):
if not stock_picking_send: if not stock_picking_send:
record.add_queue('订单发货提醒') record.add_queue('订单发货提醒')
def deal_stock_picking_sfp(self, message_queue_ids): # 处理订单发货提醒 def deal_stock_picking_sfp(self, message_queue_id): # 处理订单发货提醒
contents = [] content = message_queue_id.message_template_id.content
for message_queue_id in message_queue_ids: stock_picking = self.env['stock.picking'].search([('id', '=', int(message_queue_id.res_id))])
if message_queue_id.message_template_id.name == '订单发货提醒': stock_picking_out = self.env['stock.picking'].search(
content = message_queue_id.message_template_id.content [('origin', '=', stock_picking.origin), ('state', '=', 'assigned'),
stock_picking = self.env['stock.picking'].search([('id', '=', int(message_queue_id.res_id))]) ('picking_type_id.sequence_code', '=', 'OUT')])
stock_picking_out = self.env['stock.picking'].search( if stock_picking_out and len(stock_picking_out) > 0:
[('origin', '=', stock_picking.origin), ('state', '=', 'assigned'), url = self.request_url()
('picking_type_id.sequence_code', '=', 'OUT')]) content = content.replace('{{name}}', stock_picking_out.name).replace(
if stock_picking_out and len(stock_picking_out) > 0: '{{sale_order_name}}', stock_picking_out.origin).replace('{{request_url}}', url)
url = self.request_url() return content
content = content.replace('{{name}}', stock_picking_out.name).replace(
'{{sale_order_name}}', stock_picking_out.origin).replace('{{request_url}}', url)
contents.append(content)
return contents
def _get_message(self, message_queue_ids): def _get_message(self, message_queue_ids):
contents = [] contents = []
@@ -71,17 +67,18 @@ class SFMessageStockPicking(models.Model):
'{{number}}', str(i)).replace('{{request_url}}', url) '{{number}}', str(i)).replace('{{request_url}}', url)
product_id.append(mrp_production_info.product_id.id) product_id.append(mrp_production_info.product_id.id)
contents.append(content) contents.append(content)
return contents elif message_queue_id.message_template_id.name == '订单发货提醒':
else: content = self.deal_stock_picking_sfp(message_queue_id)
res = super(SFMessageStockPicking, self)._get_message(message_queue_id) contents.append(content)
return res return contents
def get_special_url(self,id,tmplate_name,special_name,model_id):
def get_special_url(self, id, tmplate_name, special_name, model_id):
menu_id = 0 menu_id = 0
action_id = 0 action_id = 0
if tmplate_name=='调拨入库' and special_name== 'transfer_inventory_special_url': if tmplate_name == '调拨入库' and special_name == 'transfer_inventory_special_url':
menu_id = self.env.ref('stock.menu_stock_root').id menu_id = self.env.ref('stock.menu_stock_root').id
action_id = self.env.ref('stock.action_picking_tree_ready').id action_id = self.env.ref('stock.action_picking_tree_ready').id
return super(SFMessageStockPicking, self).get_url(id, menu_id, action_id,model_id) return super(SFMessageStockPicking, self).get_url(id, menu_id, action_id, model_id)
else: else:
return super(SFMessageStockPicking, self).get_special_url(id, tmplate_name, special_name, model_id) return super(SFMessageStockPicking, self).get_special_url(id, tmplate_name, special_name, model_id)