From c64de0727b5d51e82238289538fbc94d404f99a4 Mon Sep 17 00:00:00 2001 From: chenlin Date: Thu, 1 Aug 2024 10:22:30 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=B1=87=E6=80=BB=E9=83=A8=E5=88=86=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E6=B2=A1=E6=9C=89=E5=9B=9B=E8=88=8D=E4=BA=94=E5=85=A5?= =?UTF-8?q?=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/purchase.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/admin/models/purchase.go b/app/admin/models/purchase.go index 0f2bcce..d5a6192 100644 --- a/app/admin/models/purchase.go +++ b/app/admin/models/purchase.go @@ -5015,6 +5015,8 @@ func GetReportBySupplier(req *ErpPurchaseReportBySupplierReq, c *gin.Context) ( //resp.List[i].Amount = -resultInfo.TotalWholesalePrice resp.List[i].Amount = resp.List[i].RejectAmount } + + resp.List[i].Amount = math.Round(resp.List[i].Amount*100) / 100 } } @@ -5032,10 +5034,10 @@ func GetReportBySupplier(req *ErpPurchaseReportBySupplierReq, c *gin.Context) ( totalDifference += item.Difference } - resp.Amount = totalAmount + resp.Amount = math.Round(totalAmount*100) / 100 resp.Count = totalCount - resp.RejectAmount = totalRejectAmount - resp.Difference = totalDifference + resp.RejectAmount = math.Round(totalRejectAmount*100) / 100 + resp.Difference = math.Round(totalDifference*100) / 100 resp.Total = len(mergedData) // 排序规则：供应商编号小＞商品编号小>店铺编号小＞类型为采购入库 @@ -5163,6 +5165,8 @@ func mergeData(esData []PurchaseReportData) []PurchaseReportData { // 根据有序的键列表顺序构建返回的数组 var mergedData []PurchaseReportData for _, key := range keys { + mergedMap[key].Amount = math.Round(mergedMap[key].Amount*100) / 100 + mergedMap[key].RejectAmount = math.Round(mergedMap[key].RejectAmount*100) / 100 mergedData = append(mergedData, *mergedMap[key]) }