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 14:25:14 +08:00
parent 1710712684
commit b56dc88ebd
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -457,7 +457,8 @@ func getSystemStartData(req *ErpDecisionReportReq, stock ErpStock) (DecisionRepo
return DecisionReportData{}, nil return DecisionReportData{}, nil
} }
tempReq := req tempReq1 := *req
tempReq := &tempReq1
tempReq.EndTime = time.Now().Format(QueryTimeFormat) tempReq.EndTime = time.Now().Format(QueryTimeFormat)
var respData DecisionReportData var respData DecisionReportData
@ -1673,7 +1674,8 @@ func getSumStartData(req *ErpDecisionReportReq) (DecisionReportData, error) {
return DecisionReportData{}, nil return DecisionReportData{}, nil
} }
tempReq := req tempReq1 := *req
tempReq := &tempReq1
tempReq.EndTime = time.Now().Format(QueryTimeFormat) tempReq.EndTime = time.Now().Format(QueryTimeFormat)
var respData DecisionReportData var respData DecisionReportData
@ -2425,7 +2427,7 @@ func getSumAllotData(req *ErpDecisionReportReq) (DecisionReportData, error) {
logger.Errorf("getAllotCounts err:", err) logger.Errorf("getAllotCounts err:", err)
return DecisionReportData{}, 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 != "" { if req.EndTime != "" {
@ -2434,7 +2436,7 @@ func getSumAllotData(req *ErpDecisionReportReq) (DecisionReportData, error) {
logger.Errorf("getAllotCounts err:", err) logger.Errorf("getAllotCounts err:", err)
return DecisionReportData{}, 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 { // 商品名称 if len(req.CommodityName) > 0 { // 商品名称
@ -2595,10 +2597,17 @@ func getSumDecisionReportData(req *ErpDecisionReportReq) (DecisionSumData, error
sumData.TotalProductIn + sumData.TotalCheckIn + sumData.TotalOrderReject sumData.TotalProductIn + sumData.TotalCheckIn + sumData.TotalOrderReject
if sumData.TotalEndStock < (sumData.TotalPurchaseReturn + sumData.TotalOrderSale + sumData.TotalAllotOut + sumData.TotalSystemOut + sumData.TotalCheckOut) { if sumData.TotalEndStock < (sumData.TotalPurchaseReturn + sumData.TotalOrderSale + sumData.TotalAllotOut + sumData.TotalSystemOut + sumData.TotalCheckOut) {
sumData.TotalEndStock = 0 sumData.TotalEndStock = 0
sumData.TotalEndAmount = 0
} else { } else {
sumData.TotalEndStock -= sumData.TotalPurchaseReturn + sumData.TotalOrderSale + sumData.TotalAllotOut + sumData.TotalSystemOut + sumData.TotalCheckOut 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) roundDecisionSumData(&sumData)