From 570046df69aeffbffb3efe8ddecaf523ca492a46 Mon Sep 17 00:00:00 2001 From: zongzhibin <zongzhibin@weben-smart.com> Date: 周二, 26 11月 2024 09:15:39 +0800 Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine --- LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsBase/WmsBasePlace/WmsBasePlaceService.cs | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsBase/WmsBasePlace/WmsBasePlaceService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsBase/WmsBasePlace/WmsBasePlaceService.cs index 7228b9c..f6dec3e 100644 --- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsBase/WmsBasePlace/WmsBasePlaceService.cs +++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsBase/WmsBasePlace/WmsBasePlaceService.cs @@ -12,9 +12,12 @@ public class WmsBasePlaceService : IDynamicApiController, ITransient { private readonly SqlSugarRepository<WmsBasePlace> _rep; - public WmsBasePlaceService(SqlSugarRepository<WmsBasePlace> rep) + private readonly SqlSugarRepository<V_Station_Quan> _V_Station_Quan; + public WmsBasePlaceService(SqlSugarRepository<WmsBasePlace> rep, + SqlSugarRepository<V_Station_Quan> V_Station_Quan_Rep) { _rep = rep; + _V_Station_Quan = V_Station_Quan_Rep; } /// <summary> @@ -260,5 +263,31 @@ await _rep.InsertRangeAsync(places); } + + /// <summary> + /// 涓嶅垎椤垫煡璇㈠簱浣嶄俊鎭� + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + [HttpGet] + [ApiDescriptionSettings(Name = "ListView")] + [Description("WmsBasePlace/ListView")] + public async Task<List<LocationViewOutput>> ListView([FromQuery] WmsBasePlaceInput input) + { + var query = await _V_Station_Quan.AsQueryable() + .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => + u.PlaceCode.Contains(input.SearchKey.Trim()) + // || u.WareContainerCode.Contains(input.SearchKey.Trim()) + //|| u.Lane==input.Lane + //|| u.Row==input.Row + ) + .OrderBy(u => u.LaneNo) + //.OrderBy(u => u.Row) + .OrderBy(u => u.LayerNo) + .OrderBy(u => u.ColumnNo) + .Select<LocationViewOutput>().ToListAsync(); + return query; + } + } -- Gitblit v1.9.3