From b56dc88ebd4f88b824e55af00604fba1b69c96ac Mon Sep 17 00:00:00 2001 From: chenlin Date: Thu, 24 Oct 2024 14:25:14 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E8=BF=9B=E9=94=80?= =?UTF-8?q?=E5=AD=98=E6=8A=A5=E8=A1=A8=EF=BC=8C=E4=B9=8B=E5=89=8D=E7=94=B1?= =?UTF-8?q?=E4=BA=8E=E8=AE=A1=E7=AE=97=E6=9C=9F=E5=88=9D=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=97=B6=E6=94=B9=E5=8F=98=E4=BA=86=E6=97=A5=E6=9C=9F=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=9F=A5=E8=AF=A2=E7=9A=84=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E7=AD=89=E6=95=B0=E9=87=8F=E4=B8=8D=E5=87=86=E7=A1=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/models/decision.go | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/app/admin/models/decision.go b/app/admin/models/decision.go index 306bcba..0a29f98 100644 --- a/app/admin/models/decision.go +++ b/app/admin/models/decision.go @@ -457,7 +457,8 @@ func getSystemStartData(req *ErpDecisionReportReq, stock ErpStock) (DecisionRepo return DecisionReportData{}, nil } - tempReq := req + tempReq1 := *req + tempReq := &tempReq1 tempReq.EndTime = time.Now().Format(QueryTimeFormat) var respData DecisionReportData @@ -1673,7 +1674,8 @@ func getSumStartData(req *ErpDecisionReportReq) (DecisionReportData, error) { return DecisionReportData{}, nil } - tempReq := req + tempReq1 := *req + tempReq := &tempReq1 tempReq.EndTime = time.Now().Format(QueryTimeFormat) var respData DecisionReportData @@ -2425,7 +2427,7 @@ func getSumAllotData(req *ErpDecisionReportReq) (DecisionReportData, error) { logger.Errorf("getAllotCounts err:", err) return DecisionReportData{}, err } - qs = qs.Where("erp_inventory_allot_commodity.created_at > ?", parse) + qs = qs.Where("erp_inventory_allot_order.receive_time > ?", parse) } if req.EndTime != "" { @@ -2434,7 +2436,7 @@ func getSumAllotData(req *ErpDecisionReportReq) (DecisionReportData, error) { logger.Errorf("getAllotCounts err:", err) return DecisionReportData{}, err } - qs = qs.Where("erp_inventory_allot_commodity.created_at <= ?", parse) + qs = qs.Where("erp_inventory_allot_order.receive_time <= ?", parse) } if len(req.CommodityName) > 0 { // 商品名称 @@ -2595,10 +2597,17 @@ func getSumDecisionReportData(req *ErpDecisionReportReq) (DecisionSumData, error sumData.TotalProductIn + sumData.TotalCheckIn + sumData.TotalOrderReject if sumData.TotalEndStock < (sumData.TotalPurchaseReturn + sumData.TotalOrderSale + sumData.TotalAllotOut + sumData.TotalSystemOut + sumData.TotalCheckOut) { sumData.TotalEndStock = 0 - sumData.TotalEndAmount = 0 } else { sumData.TotalEndStock -= sumData.TotalPurchaseReturn + sumData.TotalOrderSale + sumData.TotalAllotOut + sumData.TotalSystemOut + sumData.TotalCheckOut } + + sumData.TotalEndAmount = sumData.TotalBeginAmount + sumData.TotalPurchaseAmount + sumData.TotalAllotInAmount + + sumData.TotalProductInAmount + sumData.TotalCheckInAmount + sumData.TotalRejectAmount + if sumData.TotalEndAmount < (sumData.TotalReturnAmount + sumData.TotalSaleAmount + sumData.TotalAllotOutAmount + sumData.TotalSystemOutAmount + sumData.TotalCheckOutAmount) { + sumData.TotalEndAmount = 0 + } else { + sumData.TotalEndAmount -= sumData.TotalReturnAmount + sumData.TotalSaleAmount + sumData.TotalAllotOutAmount + sumData.TotalSystemOutAmount + sumData.TotalCheckOutAmount + } } roundDecisionSumData(&sumData)