1

xiazhengtongxue

3 天以前 c906272c0905b1309503de92affbdb06ec9d4268

 Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Dashboard/DashboardController.cs

@@ -218,7 +218,7 @@
        /// 按年月统计入站和出站任务数量

        /// </remarks>

        [HttpGet("MonthlyStats"), AllowAnonymous]

        public async Task<WebResponseContent> MonthlyStats([FromQuery] int months = 12, string Roadway = null)

        public async Task<WebResponseContent> MonthlyStats(int months, string roadway)

        {

            try

            {

@@ -230,11 +230,12 @@
                // 仓库名称映射

                var roadwayNames = new Dictionary<string, string>

        {

            { "FJSC1", "负极卷1号仓库" },

            { "ZJSC1", "正极卷1号仓库" },



            { "GWSC1", "高温1号仓库" },

            { "CWSC1", "常温1号仓库" },

            { "HCSC1", "分容1号仓库" }

            { "HCSC1", "分容1号仓库" },

            { "FJSC1", "负极卷1号仓库" },

            { "ZJSC1", "正极卷1号仓库" },

        };



                // 构建查询

@@ -242,9 +243,9 @@
                    .Where(t => t.InsertTime >= startDate);



                // 如果指定了道路，添加道路过滤条件

                if (!string.IsNullOrEmpty(Roadway))

                if (!string.IsNullOrEmpty(roadway))

                {

                    query = query.Where(t => t.Roadway == Roadway);

                    query = query.Where(t => t.Roadway == roadway);

                }



                var monthlyStats = await query

@@ -294,9 +295,9 @@
                            Month = monthKey,

                            Inbound = stat.Inbound,

                            Outbound = stat.Outbound,

                            Roadway = Roadway,

                            RoadwayName = !string.IsNullOrEmpty(Roadway) && roadwayNames.ContainsKey(Roadway)

                                ? roadwayNames[Roadway]

                            Roadway = roadway,

                            RoadwayName = !string.IsNullOrEmpty(roadway) && roadwayNames.ContainsKey(roadway)

                                ? roadwayNames[roadway]

                                : null

                        });

                    }

@@ -307,9 +308,9 @@
                            Month = monthKey,

                            Inbound = 0,

                            Outbound = 0,

                            Roadway = Roadway,

                            RoadwayName = !string.IsNullOrEmpty(Roadway) && roadwayNames.ContainsKey(Roadway)

                                ? roadwayNames[Roadway]

                            Roadway = roadway,

                            RoadwayName = !string.IsNullOrEmpty(roadway) && roadwayNames.ContainsKey(roadway)

                                ? roadwayNames[roadway]

                                : null

                        });

                    }