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-10-24 16:30:15 +08:00
parent 612c087b44
commit 80b776ec47
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/admin/models/decision.go
View File

@ -2559,12 +2559,19 @@ func getSumDecisionReportData(req *ErpDecisionReportReq) (DecisionSumData, error
sumData.TotalSystemIn = sumStockData.SystemIn sumData.TotalSystemIn = sumStockData.SystemIn
sumData.TotalSystemOut = sumStockData.SystemOut 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) sumPurchaseData, err := getSumPurchaseData(req)
if err != nil { if err != nil {
return DecisionSumData{}, err return DecisionSumData{}, err
} }
sumData.TotalPurchaseStock = sumPurchaseData.PurchaseStock sumData.TotalPurchaseStock = sumPurchaseData.PurchaseStock
sumData.TotalPurchaseAmount = sumPurchaseData.PurchaseStockAmount
// 查询零售汇总数据：零售销售数量、零售退货数量 // 查询零售汇总数据：零售销售数量、零售退货数量
sumSalesData, err := getSumSalesData(req) sumSalesData, err := getSumSalesData(req)
@ -2574,6 +2581,9 @@ func getSumDecisionReportData(req *ErpDecisionReportReq) (DecisionSumData, error
sumData.TotalOrderSale = sumSalesData.OrderSale sumData.TotalOrderSale = sumSalesData.OrderSale
sumData.TotalOrderReject = sumSalesData.OrderReject sumData.TotalOrderReject = sumSalesData.OrderReject
sumData.TotalSaleAmount = sumSalesData.OrderSaleAmount
sumData.TotalRejectAmount = sumSalesData.OrderRejectAmount
// 查询盘点汇总数据：盘点入库数量、盘点出库数量 // 查询盘点汇总数据：盘点入库数量、盘点出库数量
sumInventoryData, err := getSumInventoryData(req) sumInventoryData, err := getSumInventoryData(req)
if err != nil { if err != nil {
@ -2582,6 +2592,9 @@ func getSumDecisionReportData(req *ErpDecisionReportReq) (DecisionSumData, error
sumData.TotalCheckIn = sumInventoryData.CheckIn sumData.TotalCheckIn = sumInventoryData.CheckIn
sumData.TotalCheckOut = sumInventoryData.CheckOut sumData.TotalCheckOut = sumInventoryData.CheckOut
sumData.TotalCheckInAmount = sumInventoryData.CheckInAmount
sumData.TotalCheckOutAmount = sumInventoryData.CheckOutAmount
// 查询调拨汇总数据：在途库存（出库）数量、调拨入库数量、调拨出库数量 // 查询调拨汇总数据：在途库存（出库）数量、调拨入库数量、调拨出库数量
sumAllotData, err := getSumAllotData(req) sumAllotData, err := getSumAllotData(req)
if err != nil { if err != nil {
@ -2591,6 +2604,10 @@ func getSumDecisionReportData(req *ErpDecisionReportReq) (DecisionSumData, error
sumData.TotalAllotIn = sumAllotData.AllotIn sumData.TotalAllotIn = sumAllotData.AllotIn
sumData.TotalAllotOut = sumAllotData.AllotOut sumData.TotalAllotOut = sumAllotData.AllotOut
sumData.TotalWaitOutAmount = sumAllotData.AllotWaitOutAmount
sumData.TotalAllotInAmount = sumAllotData.AllotInAmount
sumData.TotalAllotOutAmount = sumAllotData.AllotOutAmount
if req.EndTime != "" { if req.EndTime != "" {
// Step 4: 计算调整库存逻辑（期初+入库-出库） // Step 4: 计算调整库存逻辑（期初+入库-出库）
sumData.TotalEndStock = sumData.TotalBeginStock + sumData.TotalPurchaseStock + sumData.TotalAllotIn + sumData.TotalEndStock = sumData.TotalBeginStock + sumData.TotalPurchaseStock + sumData.TotalAllotIn +