From 80b776ec47fba6424f522000e2607c1d53ff4db9 Mon Sep 17 00:00:00 2001 From: chenlin Date: Thu, 24 Oct 2024 16:30:15 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E8=BF=9B=E9=94=80?= =?UTF-8?q?=E5=AD=98=E6=8A=A5=E8=A1=A8=E7=AD=9B=E9=80=89=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=9C=9F=E6=9C=AB=E9=87=91=E9=A2=9D=E4=B8=8D?= =?UTF-8?q?=E5=87=86=E7=A1=AE=E7=9A=84=E7=BC=BA=E9=99=B7=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/models/decision.go | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/app/admin/models/decision.go b/app/admin/models/decision.go index 0a29f98..effaac9 100644 --- a/app/admin/models/decision.go +++ b/app/admin/models/decision.go @@ -2559,12 +2559,19 @@ func getSumDecisionReportData(req *ErpDecisionReportReq) (DecisionSumData, error sumData.TotalSystemIn = sumStockData.SystemIn sumData.TotalSystemOut = sumStockData.SystemOut + sumData.TotalReturnAmount = sumStockData.PurchaseReturnAmount + sumData.TotalWaitInAmount = sumStockData.AllotWaitInAmount + sumData.TotalProductInAmount = sumStockData.ProductInAmount + sumData.TotalSystemInAmount = sumStockData.SystemInAmount + sumData.TotalSystemOutAmount = sumStockData.SystemOutAmount + // 查询采购进货数量 sumPurchaseData, err := getSumPurchaseData(req) if err != nil { return DecisionSumData{}, err } sumData.TotalPurchaseStock = sumPurchaseData.PurchaseStock + sumData.TotalPurchaseAmount = sumPurchaseData.PurchaseStockAmount // 查询零售汇总数据：零售销售数量、零售退货数量 sumSalesData, err := getSumSalesData(req) @@ -2574,6 +2581,9 @@ func getSumDecisionReportData(req *ErpDecisionReportReq) (DecisionSumData, error sumData.TotalOrderSale = sumSalesData.OrderSale sumData.TotalOrderReject = sumSalesData.OrderReject + sumData.TotalSaleAmount = sumSalesData.OrderSaleAmount + sumData.TotalRejectAmount = sumSalesData.OrderRejectAmount + // 查询盘点汇总数据：盘点入库数量、盘点出库数量 sumInventoryData, err := getSumInventoryData(req) if err != nil { @@ -2582,6 +2592,9 @@ func getSumDecisionReportData(req *ErpDecisionReportReq) (DecisionSumData, error sumData.TotalCheckIn = sumInventoryData.CheckIn sumData.TotalCheckOut = sumInventoryData.CheckOut + sumData.TotalCheckInAmount = sumInventoryData.CheckInAmount + sumData.TotalCheckOutAmount = sumInventoryData.CheckOutAmount + // 查询调拨汇总数据：在途库存（出库）数量、调拨入库数量、调拨出库数量 sumAllotData, err := getSumAllotData(req) if err != nil { @@ -2591,6 +2604,10 @@ func getSumDecisionReportData(req *ErpDecisionReportReq) (DecisionSumData, error sumData.TotalAllotIn = sumAllotData.AllotIn sumData.TotalAllotOut = sumAllotData.AllotOut + sumData.TotalWaitOutAmount = sumAllotData.AllotWaitOutAmount + sumData.TotalAllotInAmount = sumAllotData.AllotInAmount + sumData.TotalAllotOutAmount = sumAllotData.AllotOutAmount + if req.EndTime != "" { // Step 4: 计算调整库存逻辑（期初+入库-出库） sumData.TotalEndStock = sumData.TotalBeginStock + sumData.TotalPurchaseStock + sumData.TotalAllotIn +