minghui/mh_goadmin_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、优化采购报表（按商品），未执行金额和数量不能为负值；

Browse Source
This commit is contained in:
chenlin 2024-09-29 22:13:35 +08:00
parent a0263fedf1
commit caad0d881b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/admin/models/purchase.go
View File

@ -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)