From 07544bcc1c18efc8bf9f7d1475765c898364911a Mon Sep 17 00:00:00 2001 From: chenlin Date: Fri, 20 Sep 2024 10:58:13 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=9B=B8=E5=85=B3=E9=87=91=E9=A2=9D=E6=81=A2?= =?UTF-8?q?=E5=A4=8D2=E4=BD=8D=E5=B0=8F=E6=95=B0=EF=BC=9B=E7=9B=B8?= =?UTF-8?q?=E5=90=8C=E5=95=86=E5=93=81=E9=99=A4=E4=B8=8D=E5=B0=BD=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5=E9=80=9A=E8=BF=87=E6=96=B0=E5=BB=BA=E5=A4=9A?= =?UTF-8?q?=E6=9D=A1=E6=95=B0=E6=8D=AE=E6=9D=A5=E5=A4=84=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/apis/purchasemanage/purchase.go | 1 - app/admin/models/purchase.go | 4 ++-- tools/utils.go | 5 ----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/admin/apis/purchasemanage/purchase.go b/app/admin/apis/purchasemanage/purchase.go index 6af9f37..af450dd 100644 --- a/app/admin/apis/purchasemanage/purchase.go +++ b/app/admin/apis/purchasemanage/purchase.go @@ -285,7 +285,6 @@ func ErpPurchaseDetail(c *gin.Context) { v.EffectiveCount = nCount // 有效数量 v.ErpCategoryID = erpCommodity.ErpCategoryId v.ErpCategoryName = erpCommodity.ErpCategoryName - v.Price = math.Round(v.Price*1000) / 1000 commodityList = append(commodityList, v) } diff --git a/app/admin/models/purchase.go b/app/admin/models/purchase.go index dbb9d2b..882ea09 100644 --- a/app/admin/models/purchase.go +++ b/app/admin/models/purchase.go @@ -1330,8 +1330,8 @@ func InventoryErpPurchaseUpdateStock(gdb *gorm.DB, list []ErpPurchaseInventory, ErpCategoryName: commodityInfo.ErpCategoryName, ErpSupplierId: purchaseOrder.ErpSupplierId, ErpSupplierName: purchaseOrder.ErpSupplierName, - StaffCostPrice: tools.RoundToThreeDecimalPlaces(v.EmployeePrice - v.ImplementationPrice), - WholesalePrice: tools.RoundToThreeDecimalPlaces(v.ImplementationPrice), + StaffCostPrice: tools.RoundToTwoDecimalPlaces(v.EmployeePrice - v.ImplementationPrice), + WholesalePrice: tools.RoundToTwoDecimalPlaces(v.ImplementationPrice), State: InStock, StorageType: PurchaseInventory, // 采购入库 FirstStockTime: nowTime, diff --git a/tools/utils.go b/tools/utils.go index dc8de87..dc7fa11 100644 --- a/tools/utils.go +++ b/tools/utils.go @@ -116,11 +116,6 @@ func RoundToTwoDecimalPlaces(num float64) float64 { return math.Round(num*100) / 100 } -// RoundToThreeDecimalPlaces 将float64类型四舍五入保留3位小数 -func RoundToThreeDecimalPlaces(num float64) float64 { - return math.Round(num*1000) / 1000 -} - // Uint32SliceContains 检查 uint32 切片中是否包含特定的值 func Uint32SliceContains(slice []uint32, val uint32) bool { for _, item := range slice {