解决冲突

sf_manufacturing/models/purchase_order.py

@@ -146,8 +146,15 @@ class PurchaseOrder(models.Model):
                     raise UserError('请对【产品】中的【数量】进行输入')
                 if line.price_unit <= 0:
                     raise UserError('请对【产品】中的【单价】进行输入')
-            record.outsourcing_service_replenishment()
-        return super(PurchaseOrder, self).button_confirm()
+            record.outsourcing_service_replenishment()        
+        
+        res = super(PurchaseOrder, self).button_confirm()
+
+        for line in self.order_line:
+            # 将产品不追踪序列号的行项目设置qty_done
+            if line.move_ids[0].product_id.tracking == 'none':
+                line.move_ids[0].quantity_done = line.move_ids[0].product_qty
+        return res
     
 
     origin_sale_id = fields.Many2one('sale.order', string='销售订单号', store=True, compute='_compute_origin_sale_id')