minghui/mh_goadmin_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修复其他出入库明细中，系统出库时间有误的缺陷；

Browse Source 
2.日志改为不压缩，保存原文件；
This commit is contained in:
chenlin 2025-01-08 14:08:56 +08:00
parent ef20f7d319
commit a33e339bd0
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/admin/models/inventory_report.go
View File

@ -2012,7 +2012,7 @@ func getSystemOutData() ([]ReportOtherDetailData, error) {
} }
var systemOutList []ReportOtherDetailData var systemOutList []ReportOtherDetailData
for _, item := range stockCommodities { for i, item := range stockCommodities {
var systemOutData ReportOtherDetailData var systemOutData ReportOtherDetailData
systemOutData.CommodityId = item.ErpCommodityId systemOutData.CommodityId = item.ErpCommodityId
systemOutData.CommodityName = item.ErpCommodityName systemOutData.CommodityName = item.ErpCommodityName
@ -2024,7 +2024,7 @@ func getSystemOutData() ([]ReportOtherDetailData, error) {
systemOutData.StoreName = item.StoreName systemOutData.StoreName = item.StoreName
systemOutData.SupplierId = item.ErpSupplierId systemOutData.SupplierId = item.ErpSupplierId
systemOutData.SupplierName = item.ErpSupplierName systemOutData.SupplierName = item.ErpSupplierName
systemOutData.StockTime = &item.UpdatedAt systemOutData.StockTime = &stockCommodities[i].UpdatedAt
systemOutData.Type = 3 systemOutData.Type = 3
systemOutData.PurchasePrice = item.WholesalePrice systemOutData.PurchasePrice = item.WholesalePrice
systemOutData.EmployeePrice = item.WholesalePrice + item.StaffCostPrice systemOutData.EmployeePrice = item.WholesalePrice + item.StaffCostPrice

2
app/admin/router/decision.go
View File

@ -11,7 +11,7 @@ func registerErpDecisionRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMi
r := v1.Group("/decision").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) r := v1.Group("/decision").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
r.POST("report", decision.ErpDecisionReport) // 进销存报表 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 := v1.Group("/decision/month_end_closing").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
r1.POST("list", decision.ErpMonthEndClosingList) // 财务月结-列表 r1.POST("list", decision.ErpMonthEndClosingList) // 财务月结-列表

8
logger/logx.go
View File

@ -45,10 +45,10 @@ func Setup() {
logFileName := getLogFileName() logFileName := getLogFileName()
fileLogger := &lumberjack.Logger{ fileLogger := &lumberjack.Logger{
Filename: logFileName, Filename: logFileName,
MaxSize: 100, // 每个日志文件的最大尺寸，单位为 MB MaxSize: 100, // 每个日志文件的最大尺寸，单位为 MB
MaxBackups: 5, // 保留旧日志文件的最大个数 MaxBackups: 5, // 保留旧日志文件的最大个数
MaxAge: 60, // 保留旧日志文件的最大天数 MaxAge: 60, // 保留旧日志文件的最大天数
Compress: true, // 是否压缩旧日志文件 Compress: false, // 是否压缩旧日志文件
} }
defer fileLogger.Close() defer fileLogger.Close()