diff --git a/app/admin/models/purchase.go b/app/admin/models/purchase.go index 74bb8fb..7c11579 100644 --- a/app/admin/models/purchase.go +++ b/app/admin/models/purchase.go @@ -4625,7 +4625,14 @@ LEFT JOIN // 计算未执行金额和未执行数量 purchaseData.NonExecutionAmount = purchaseData.PlanAmount - purchaseData.Amount + if purchaseData.NonExecutionAmount < 0 { + purchaseData.NonExecutionAmount = 0 + } + purchaseData.NonExecutionCount = purchaseData.PlanCount - purchaseData.Count + if purchaseData.NonExecutionCount < 0 { + purchaseData.NonExecutionCount = 0 + } if purchaseType == ErpRejectOrder { purchaseData.PlanCount = -purchaseData.PlanCount @@ -5480,12 +5487,12 @@ func GetReportDetail(req *ErpPurchaseReportDetailReq, c *gin.Context) (*ErpPurch "erp_purchase_inventory.employee_price, " + "(erp_purchase_inventory.implementation_price - erp_purchase_inventory.employee_price) as difference_price"). Joins("JOIN erp_purchase_inventory ON erp_purchase_order.id = erp_purchase_inventory.erp_purchase_order_id") - //Where("erp_purchase_order.state <> ?", 5) // 排除已终止的订单 + //Where("erp_purchase_order.state <> ?", 5) // 排除已终止的订单 // 创建一个新的查询对象,用于 count 查询 countQuery := orm.Eloquent.Debug().Table("erp_purchase_order"). Joins("JOIN erp_purchase_inventory ON erp_purchase_order.id = erp_purchase_inventory.erp_purchase_order_id") - //Where("erp_purchase_order.state <> ?", 5) // 排除已终止的订单 + //Where("erp_purchase_order.state <> ?", 5) // 排除已终止的订单 if req.SerialNumber != "" { qs = qs.Where("erp_purchase_order.serial_number = ?", req.SerialNumber)