From bb56b2b6f21acb7c69c02585e5bc534d2f67715f Mon Sep 17 00:00:00 2001 From: dengjunjie <dengjunjie@hnkhzn.com> Date: 星期四, 27 三月 2025 17:13:35 +0800 Subject: [PATCH] WMS首页优化,WCS优化AGV和产线、输送线交互逻辑 --- 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs" index c35b38c..e51ab53 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs" @@ -5,6 +5,7 @@ using System.Reflection.Metadata; using System.Text; using System.Threading.Tasks; +using WIDESEA_Common; using WIDESEA_Core; using WIDESEA_Core.BaseRepository; using WIDESEA_Core.BaseServices; @@ -119,7 +120,28 @@ } return content; } - + public object GetLocationLayer() + { + List<object> list = new List<object>(); + var data = Db.Ado.SqlQuery<LocationArea>(@"SELECT areaName,areaCode,roadwayNo,layer from Dt_AreaInfo as t1 + INNER JOIN + ( + select DISTINCT AreaId,RoadwayNo,Layer from Dt_LocationInfo + ) as t2 + on t1.Id=t2.AreaId"); + foreach (var item in data.GroupBy(t => t.areaName)) + { + var obj = new + { + areaName = item.Key, + areaCode = item.Max(x => x.areaCode), + tunnel = item.Select(t => t.roadwayNo).OrderBy(t => t).Distinct().ToList(), + Layers = item.Select(t => t.layer).OrderBy(t => t).ToList(), + }; + list.Add(obj); + } + return list; + } public WebResponseContent InitializationLocation(InitializationLocationDTO initializationLocationDTO) { try -- Gitblit v1.9.3