From c2bac53ff77d91dfffb4bda9b0bcbf6556fda9a1 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 20 5月 2025 13:25:23 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs
index 5bb3deb..2d20ac3 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs
@@ -71,15 +71,15 @@
/// <returns></returns>
public async Task<List<AreaForListOuptut>> GetAreaListAsync()
{
- var list = await _wmsAreaRepository.GetListForSelectAsync();
+ var list = await _wmsAreaRepository.GetListForSelectAsync();
if (list == null || list.Count <= 0) { return new List<AreaForListOuptut>(); }
- var result = list.Select(x=>new AreaForListOuptut
+ var result = list.Select(x => new AreaForListOuptut
{
AreaName = x.AreaName,
AreaNo = x.AreaNo,
}).ToList();
- return result;
+ return result;
}
/// <summary>
@@ -142,9 +142,17 @@
{
var queryInput = new GetWmsMaterialTypeInput();
var whereConditions = DynamicGetQueryParams(queryInput);
- var list = await _WmsMaterialTypeRepository.GetListAsync(whereConditions);
+ var list = await _WmsMaterialTypeRepository.GetListAsync(whereConditions);
- return ObjectMapper.Map<List<WmsMaterialType>, List<MaterialTypeOutput>>(list);
+ var result = new List<MaterialTypeOutput>();
+ if (list == null || list.Count <= 0) return result;
+
+ result = list.Select(x => new MaterialTypeOutput
+ {
+ MaterialTypeCode = x.MaterialTypeCode,
+ MaterialTypeDesc = x.MaterialTypeDesc,
+ }).ToList();
+ return result;
}
private FunReturnResultModel<Expression<Func<WmsMaterialType, bool>>> DynamicGetQueryParams(GetWmsMaterialTypeInput input)
--
Gitblit v1.9.3