diff --git a/jikimo_purchase_request/models/purchase_order.py b/jikimo_purchase_request/models/purchase_order.py index 29e6c646..9894f34f 100644 --- a/jikimo_purchase_request/models/purchase_order.py +++ b/jikimo_purchase_request/models/purchase_order.py @@ -94,12 +94,20 @@ class PurchaseOrder(models.Model): def button_cancel(self): """ - 将取消的采购订单关联的库存移动撤销 + 1. 先将采购订单行与目标库存移动断开链接,避免采购单取消后,调拨单被调整为mts的问题 + 2. 取消采购订单 + 3. 将采购订单行与目标库存移动重新建立链接 """ - move_ids = self.order_line.move_dest_ids.filtered(lambda move: move.state != 'done' and not move.scrapped) + created_purchase_request_line_ids = {} + if self.order_line.move_dest_ids.created_purchase_request_line_id: + move_ids = self.order_line.move_dest_ids.filtered(lambda move: move.state != 'done' and not move.scrapped) + created_purchase_request_line_ids = {move.id: move.created_purchase_request_line_id for move in move_ids} + self.order_line.write({'move_dest_ids': [(5, 0, 0)]}) res =super(PurchaseOrder, self).button_cancel() - if move_ids.mapped('created_purchase_request_line_id'): - move_ids.write({'state': 'waiting', 'is_done': False}) + for move_id, created_purchase_request_line_id in created_purchase_request_line_ids.items(): + self.env['stock.move'].browse(move_id).created_purchase_request_line_id = created_purchase_request_line_id + # if move_ids.mapped('created_purchase_request_line_id'): + # move_ids.write({'state': 'waiting', 'is_done': False}) return res def write(self, vals):