diff --git a/sf_message/models/sf_message_purchase.py b/sf_message/models/sf_message_purchase.py index cf0d2333..8d95ffaf 100644 --- a/sf_message/models/sf_message_purchase.py +++ b/sf_message/models/sf_message_purchase.py @@ -1,9 +1,6 @@ -import logging from odoo import models, fields, api, _ class SFMessagePurchase(models.Model): _name = 'purchase.order' - _inherit = ['purchase.order', 'jikimo.message.dispatch'] - - + _inherit = ['purchase.order', 'jikimo.message.dispatch'] diff --git a/sf_message/models/sf_message_sale.py b/sf_message/models/sf_message_sale.py index 7d6cd7cd..6519b7a1 100644 --- a/sf_message/models/sf_message_sale.py +++ b/sf_message/models/sf_message_sale.py @@ -27,7 +27,8 @@ class SFMessageSale(models.Model): if picking_ids: for picking_id in picking_ids: purchase_order_ids = ( - picking_id.procurement_group_id.stock_move_ids.created_purchase_line_id.order_id | picking_id.procurement_group_id.stock_move_ids.move_orig_ids.purchase_line_id.order_id).ids + picking_id.procurement_group_id.stock_move_ids.created_purchase_line_id.order_id | + picking_id.procurement_group_id.stock_move_ids.move_orig_ids.purchase_line_id.order_id).ids purchase_order_id.extend(purchase_order_ids) if purchase_order_id: purchase_order_list = self.env['purchase.order'].search([('id', 'in', purchase_order_id)]) diff --git a/sf_message/models/sf_message_stock_picking.py b/sf_message/models/sf_message_stock_picking.py index a1611652..0c3045cb 100644 --- a/sf_message/models/sf_message_stock_picking.py +++ b/sf_message/models/sf_message_stock_picking.py @@ -43,7 +43,7 @@ class SFMessageStockPicking(models.Model): '{{number}}', str(i)).replace('{{request_url}}', url) product_id.append(mrp_production_info.product_id.id) contents.append(content) + return contents else: res = super(SFMessageStockPicking, self)._get_message(message_queue_id) - contents.append(res) - return contents + return res diff --git a/sf_message/models/sf_message_workorder.py b/sf_message/models/sf_message_workorder.py index 2462b3f1..0f211198 100644 --- a/sf_message/models/sf_message_workorder.py +++ b/sf_message/models/sf_message_workorder.py @@ -8,8 +8,9 @@ class SFMessageWork(models.Model): @api.depends('production_availability', 'blocked_by_workorder_ids.state') def _compute_state(self): super(SFMessageWork, self)._compute_state() - if self.state == 'ready' and self.routing_type == '装夹预调': - self.add_queue('工单已下发通知') + for workorder in self: + if workorder.state == 'ready' and workorder.routing_type == '装夹预调': + workorder.add_queue('工单已下发通知') def _get_message(self, message_queue_ids): contents = []