From d57a4d61a81e2e27b09c4c9560358efb668f349d Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 19 5月 2025 09:12:37 +0800
Subject: [PATCH] 增加 扩展查询方法
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 101 insertions(+), 13 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs
index f8d424b..ded7054 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs
@@ -186,16 +186,35 @@
{
throw new UserFriendlyException("鐗╂枡淇℃伅涓嶅瓨鍦�");
}
- var container = await _wmscontainerRepository.FindByNameAsync(input.ContainerNo);
+ var palceInfo = await _wmsplaceRepository.FindByNameAsync(input.PlaceNo);
+
//if (container == null)
//{
// throw new UserFriendlyException("鎵樼洏淇℃伅涓嶅瓨鍦�");
//}
+ input.ContainerNo = string.IsNullOrEmpty(input.ContainerNo) ? "TP_" + DateTime.Now.ToString("yyMMddHHmmssfff") : input.ContainerNo;
var wmsmaterialstock = ObjectMapper.Map<WmsMaterialStockCreateDto, WmsMaterialStock>(input);
input.MapExtraPropertiesTo(wmsmaterialstock, MappingPropertyDefinitionChecks.None);
wmsmaterialstock.MaterialId = Guid.NewGuid().ToString("N");
+ wmsmaterialstock.MaterialNo = material.MaterialNo;
wmsmaterialstock.MaterialName = material.MaterialName;
+
+ var wmsmaterialstockList = await _wmsmaterialstockRepository.GetStockListAsync(new WmsMaterialStock { PlaceNo = input.PlaceNo });
+ if (wmsmaterialstockList.Count > 0)
+ {
+ if (wmsmaterialstock.StorageTypeNo == PlaceTypeEnum.YUANLIAOKUWEI)
+ {
+ wmsmaterialstock.ContainerNo = wmsmaterialstockList[0].ContainerNo;
+ input.ContainerNo = wmsmaterialstockList[0].ContainerNo;
+ }
+ if (wmsmaterialstockList[0].MaterialNo != material.MaterialNo)
+ {
+ throw new UserFriendlyException("褰撳墠搴撲綅宸插瓨鏀惧埆鐨勭墿鏂�");
+ }
+ }
+
+ var container = await _wmscontainerRepository.FindByNameAsync(input.ContainerNo);
wmsmaterialstock.ContainerStatus = ContainerStatusEnum.KUWEI;
wmsmaterialstock.ContainerType = container == null ? ContainerTypeEnum.XUNI : container.ContainerType;
@@ -224,14 +243,7 @@
await _wmsplaceRepository.UpdateAsync(place);
}
- var wmsmaterialstockList = await _wmsmaterialstockRepository.GetStockListAsync(new WmsMaterialStock { PlaceNo = input.PlaceNo });
- if (wmsmaterialstockList.Count > 0)
- {
- if (wmsmaterialstockList[0].MaterialNo != input.MaterialNo)
- {
- throw new UserFriendlyException("褰撳墠搴撲綅宸插瓨鏀惧埆鐨勭墿鏂�");
- }
- }
+
var maxSort = await _wmsmaterialstockRepository.GetMaxSortAsync();
var sort = input.Sort ?? maxSort;
@@ -256,7 +268,7 @@
// 娣诲姞搴撳瓨璁板綍
var record = new WmsInOutStockRecord
{
- TaskNo = input.TaskNo,
+ TaskNo = string.IsNullOrEmpty(input.OrderNo) ? "Task_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") : input.OrderNo,
OrderNo = input.OrderNo,
StockType = StockTypeEnum.InBound,
ContainerNo = stock.ContainerNo,
@@ -279,7 +291,7 @@
{
container = new WmsContainer
{
- ContainerNo = input.ContainerNo,
+ ContainerNo = wmsmaterialstock.ContainerNo,
ContainerType = Domain.Shared.Enums.ContainerTypeEnum.XUNI,
ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI,
};
@@ -693,9 +705,85 @@
protected Task CheckCreateOrUpdateDtoAsync(WmsMaterialStockCreateOrUpdateDtoBase input)
{
Check.NotNull(input, nameof(input));
- Check.NotNullOrWhiteSpace(input.MaterialNo, "缂栧彿", WmsMaterialStockConsts.MaxCodeLength);
- Check.NotNullOrWhiteSpace(input.MaterialName, "鍚嶇О", WmsMaterialStockConsts.MaxNameLength);
+ //Check.NotNullOrWhiteSpace(input.MaterialNo, "缂栧彿", WmsMaterialStockConsts.MaxCodeLength);
+ //Check.NotNullOrWhiteSpace(input.MaterialName, "鍚嶇О", WmsMaterialStockConsts.MaxNameLength);
Check.Length(input.Remark, "澶囨敞", WmsMaterialStockConsts.MaxRemarkLength);
return Task.CompletedTask;
}
+
+
+ /// <summary>
+ /// 鏍规嵁鏉′欢鑾峰彇鍑哄叆搴撳崟鎹鎯呭垪琛�
+ /// </summary>
+ /// <param name="whereConditions"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public async Task<List<WmsMaterialStock>> GetListByFilterAsync(Expression<Func<WmsMaterialStock, bool>> whereConditions, CancellationToken cancellationToken = default)
+ {
+ return await _wmsmaterialstockRepository.GetListByFilterAsync(whereConditions);
+ }
+
+ /// <summary>
+ /// 鏍规嵁鏉′欢鑾峰彇鍗曚釜鍑哄叆搴撳崟鎹鎯�
+ /// </summary>
+ /// <param name="whereConditions"></param>
+ /// <param name="isMultipleThrowException">鏄惁鏌ヨ鍑哄鏉″氨鎶ラ敊</param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ /// <exception cref="UserFriendlyException"></exception>
+ public async Task<WmsMaterialStock> GetSingleByFilterAsync(Expression<Func<WmsMaterialStock, bool>> whereConditions, bool is鈥婱ultipleThrowException = false, CancellationToken cancellationToken = default)
+ {
+ return await _wmsmaterialstockRepository.GetSingleByFilterAsync(whereConditions, is鈥婱ultipleThrowException);
+ }
+
+ /// <summary>
+ /// 鏍规嵁鏉′欢鑾峰彇鍑哄叆搴撳崟鎹鎯呭垪琛�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public virtual async Task<List<WmsMaterialStockDto>> FindListByFilterAsync(GetWmsMaterialStockInput input, CancellationToken cancellationToken = default)
+ {
+ Check.NotNull(input, nameof(input));
+
+ if (input.Sorting.IsNullOrWhiteSpace())
+ {
+ input.Sorting = nameof(WmsMaterialStock.Sort);
+ }
+
+ #region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+
+ //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+ var list = await _wmsmaterialstockRepository.GetListByFilterAsync(whereConditions?.data);
+
+ return new List<WmsMaterialStockDto>(ObjectMapper.Map<List<WmsMaterialStock>, List<WmsMaterialStockDto>>(list));
+ }
+ /// <summary>
+ /// 鏍规嵁鏉′欢鑾峰彇鍗曚釜鍑哄叆搴撳崟鎹鎯�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public virtual async Task<WmsMaterialStockDto> FindSingleByFilterAsync(GetWmsMaterialStockInput input, CancellationToken cancellationToken = default)
+ {
+ Check.NotNull(input, nameof(input));
+
+ if (input.Sorting.IsNullOrWhiteSpace())
+ {
+ input.Sorting = nameof(WmsMaterialStock.Sort);
+ }
+
+ #region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+
+ //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+ var dataObj = await _wmsmaterialstockRepository.GetSingleByFilterAsync(whereConditions?.data);
+
+ return (ObjectMapper.Map<WmsMaterialStock, WmsMaterialStockDto>(dataObj));
+ }
}
--
Gitblit v1.9.3