diff --git a/jikimo_purchase_request/models/purchase_request.py b/jikimo_purchase_request/models/purchase_request.py index 0459dcd9..45e7457c 100644 --- a/jikimo_purchase_request/models/purchase_request.py +++ b/jikimo_purchase_request/models/purchase_request.py @@ -41,13 +41,14 @@ class PurchaseRequest(models.Model): if lines: for line in lines: for line_item in line.order_line: - product_id = line_item.product_id.id - qty = line_item.product_qty - product_rounding[product_id] = line_item.product_id.uom_id.rounding - if product_id in product_summary: - product_summary[product_id] += qty - else: - product_summary[product_id] = qty + if line_item.state == 'purchase': + product_id = line_item.product_id.id + qty = line_item.product_qty + product_rounding[product_id] = line_item.product_id.uom_id.rounding + if product_id in product_summary: + product_summary[product_id] += qty + else: + product_summary[product_id] = qty # 校验产品数量 discrepancies = [] @@ -63,7 +64,7 @@ class PurchaseRequest(models.Model): message = "产品数量不一致:\n" for product_id, required_qty, order_qty in discrepancies: product_name = self.env['product.product'].browse(product_id).display_name # 获取产品名称 - message += f"产品 {product_name},需求数量 {required_qty},关联采购订单数量 {order_qty}(含询价状态)\n" + message += f"产品 {product_name},需求数量 {required_qty},关联采购订单确认的数量 {order_qty},不一致,确认关闭?\n" # 添加确认框 message += "确认关闭?" return {