From 18d2f40bbf40469b033de6f07ca8a8e3bc191132 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期六, 26 四月 2025 19:21:40 +0800
Subject: [PATCH] 优化代码
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 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 70961b3..f5e9bda 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;
@@ -42,6 +43,10 @@
public override WebResponseContent DeleteData(object[] keys)
{
return base.DeleteData(keys);
+ }
+ public override PageGridData<Dt_LocationInfo> GetPageData(PageDataOptions options)
+ {
+ return base.GetPageData(options);
}
/// <summary>
/// 淇敼璐т綅鐨勭鐢ㄧ姸鎬�
@@ -119,7 +124,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
@@ -145,7 +171,7 @@
LocationType = LocationTypeEnum.Cube.ObjToInt(),
RoadwayNo = initializationLocationDTO.Roadway,
Row = i + 1,
- MaxQty = i == 1 ? 24 : 12,
+ MaxQty = 12,
CurrentQty = 0,
};
--
Gitblit v1.9.3