From caad0d881bcc9f610662a56bcab22eda9c75279e Mon Sep 17 00:00:00 2001 From: chenlin Date: Sun, 29 Sep 2024 22:13:35 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=EF=BC=88=E6=8C=89=E5=95=86=E5=93=81=EF=BC=89?= =?UTF-8?q?=EF=BC=8C=E6=9C=AA=E6=89=A7=E8=A1=8C=E9=87=91=E9=A2=9D=E5=92=8C?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=B8=8D=E8=83=BD=E4=B8=BA=E8=B4=9F=E5=80=BC?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/models/purchase.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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)