From a33e339bd04a8e0527c228c214b6113813655c12 Mon Sep 17 00:00:00 2001 From: chenlin Date: Wed, 8 Jan 2025 14:08:56 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=85=B6=E4=BB=96=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=98=8E=E7=BB=86=E4=B8=AD=EF=BC=8C=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=87=BA=E5=BA=93=E6=97=B6=E9=97=B4=E6=9C=89=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E7=BC=BA=E9=99=B7=EF=BC=9B=202.=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=8D=E5=8E=8B=E7=BC=A9=EF=BC=8C=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=8E=9F=E6=96=87=E4=BB=B6=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/models/inventory_report.go | 4 ++-- app/admin/router/decision.go | 2 +- logger/logx.go | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/admin/models/inventory_report.go b/app/admin/models/inventory_report.go index 0bd6a70..121a229 100644 --- a/app/admin/models/inventory_report.go +++ b/app/admin/models/inventory_report.go @@ -2012,7 +2012,7 @@ func getSystemOutData() ([]ReportOtherDetailData, error) { } var systemOutList []ReportOtherDetailData - for _, item := range stockCommodities { + for i, item := range stockCommodities { var systemOutData ReportOtherDetailData systemOutData.CommodityId = item.ErpCommodityId systemOutData.CommodityName = item.ErpCommodityName @@ -2024,7 +2024,7 @@ func getSystemOutData() ([]ReportOtherDetailData, error) { systemOutData.StoreName = item.StoreName systemOutData.SupplierId = item.ErpSupplierId systemOutData.SupplierName = item.ErpSupplierName - systemOutData.StockTime = &item.UpdatedAt + systemOutData.StockTime = &stockCommodities[i].UpdatedAt systemOutData.Type = 3 systemOutData.PurchasePrice = item.WholesalePrice systemOutData.EmployeePrice = item.WholesalePrice + item.StaffCostPrice diff --git a/app/admin/router/decision.go b/app/admin/router/decision.go index ab82d14..d4ab093 100644 --- a/app/admin/router/decision.go +++ b/app/admin/router/decision.go @@ -11,7 +11,7 @@ func registerErpDecisionRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMi r := v1.Group("/decision").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) r.POST("report", decision.ErpDecisionReport) // 进销存报表 - r.POST("store_sales_report", decision.ErpStoreSalesData) // 进销存报表 + r.POST("store_sales_report", decision.ErpStoreSalesData) // 门店销售对比 r1 := v1.Group("/decision/month_end_closing").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) r1.POST("list", decision.ErpMonthEndClosingList) // 财务月结-列表 diff --git a/logger/logx.go b/logger/logx.go index 643163d..4ed6d11 100644 --- a/logger/logx.go +++ b/logger/logx.go @@ -45,10 +45,10 @@ func Setup() { logFileName := getLogFileName() fileLogger := &lumberjack.Logger{ Filename: logFileName, - MaxSize: 100, // 每个日志文件的最大尺寸，单位为 MB - MaxBackups: 5, // 保留旧日志文件的最大个数 - MaxAge: 60, // 保留旧日志文件的最大天数 - Compress: true, // 是否压缩旧日志文件 + MaxSize: 100, // 每个日志文件的最大尺寸，单位为 MB + MaxBackups: 5, // 保留旧日志文件的最大个数 + MaxAge: 60, // 保留旧日志文件的最大天数 + Compress: false, // 是否压缩旧日志文件 } defer fileLogger.Close()