mirror of
https://gitlab.com/mbugroup/lti-api.git
synced 2026-05-24 15:25:43 +00:00
[FIX/BE-US] recording,reporting,closing and uniformity
This commit is contained in:
@@ -27,12 +27,12 @@ type PurchaseSupplierRowDTO struct {
|
||||
}
|
||||
|
||||
type PurchaseSupplierSummaryDTO struct {
|
||||
TotalQty float64 `json:"total_qty"`
|
||||
TotalPurchaseValue float64 `json:"total_purchase_value"`
|
||||
TotalTransportValue float64 `json:"total_transport_value"`
|
||||
TotalAmount float64 `json:"total_amount"`
|
||||
TotalUnitPrice float64 `json:"total_unit_price"`
|
||||
TotalTransportUnitPrice float64 `json:"total_transport_unit_price"`
|
||||
TotalQty float64 `json:"total_qty"`
|
||||
TotalPurchaseValue float64 `json:"total_purchase_value"`
|
||||
TotalTransportValue float64 `json:"total_transport_value"`
|
||||
TotalAmount float64 `json:"total_amount"`
|
||||
TotalUnitPrice float64 `json:"total_unit_price"`
|
||||
TotalTransportUnitPrice float64 `json:"total_transport_unit_price"`
|
||||
}
|
||||
|
||||
type PurchaseSupplierDTO struct {
|
||||
@@ -122,11 +122,6 @@ func ToPurchaseSupplierDTO(supplier entity.Supplier, items []entity.PurchaseItem
|
||||
rows := make([]PurchaseSupplierRowDTO, 0, len(items))
|
||||
summary := PurchaseSupplierSummaryDTO{}
|
||||
|
||||
var unitPriceSum float64
|
||||
var unitPriceCount int
|
||||
var transportUnitPriceSum float64
|
||||
var transportUnitPriceCount int
|
||||
|
||||
for i := range items {
|
||||
row := ToPurchaseSupplierRowDTO(&items[i])
|
||||
rows = append(rows, row)
|
||||
@@ -136,19 +131,16 @@ func ToPurchaseSupplierDTO(supplier entity.Supplier, items []entity.PurchaseItem
|
||||
summary.TotalTransportValue += row.TransportValue
|
||||
summary.TotalAmount += row.TotalAmount
|
||||
|
||||
unitPriceSum += row.UnitPrice
|
||||
unitPriceCount++
|
||||
|
||||
transportUnitPriceSum += row.TransportUnitPrice
|
||||
transportUnitPriceCount++
|
||||
}
|
||||
|
||||
if unitPriceCount > 0 {
|
||||
summary.TotalUnitPrice = math.Round(unitPriceSum / float64(unitPriceCount))
|
||||
if summary.TotalQty > 0 {
|
||||
avg := summary.TotalPurchaseValue / summary.TotalQty
|
||||
summary.TotalUnitPrice = math.Round(avg)
|
||||
}
|
||||
|
||||
if transportUnitPriceCount > 0 {
|
||||
summary.TotalTransportUnitPrice = math.Round(transportUnitPriceSum / float64(transportUnitPriceCount))
|
||||
if summary.TotalQty > 0 {
|
||||
avg := summary.TotalTransportValue / summary.TotalQty
|
||||
summary.TotalTransportUnitPrice = math.Round(avg)
|
||||
}
|
||||
|
||||
return PurchaseSupplierDTO{
|
||||
|
||||
Reference in New Issue
Block a user