From f0b6b4d5286d69db4cae6622b8acd8cabcba1cb7 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 13 5月 2025 17:15:20 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs | 195 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 149 insertions(+), 46 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 a03b0b0..6cb1570 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs
@@ -1,4 +1,5 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialStocks;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterialStocks;
using CMS.Plugin.HIAWms.Domain.WmsAreas;
@@ -6,8 +7,11 @@
using CMS.Plugin.HIAWms.Domain.WmsMaterials;
using CMS.Plugin.HIAWms.Domain.WmsMaterialStocks;
using CMS.Plugin.HIAWms.Domain.WmsPlaces;
+using CMS.Plugin.HIAWms.Domain.WmsTask;
using CmsQueryExtensions;
+using CmsQueryExtensions.Extension;
using Microsoft.Extensions.DependencyInjection;
+using System.Linq.Expressions;
using System.Text.Json;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
@@ -54,7 +58,7 @@
}
/// <inheritdoc />
- public virtual async Task<PagedResultDto<WmsMaterialStockDto>> GetListAsync(GetWmsMaterialStocksInput input)
+ public virtual async Task<PagedResultDto<WmsMaterialStockDto>> GetListAsync(GetWmsMaterialStockInput input)
{
Check.NotNull(input, nameof(input));
@@ -63,12 +67,91 @@
input.Sorting = nameof(WmsMaterialStock.Sort);
}
- var specification = new WmsMaterialStockSpecification(input.Name);
- var stock = ObjectMapper.Map<GetWmsMaterialStocksInput, WmsMaterialStock>(input);
- var count = await _wmsmaterialstockRepository.GetCountAsync(stock, input.StartTime, input.EndTime, input.Filter, specification);
- var list = await _wmsmaterialstockRepository.GetListAsync(stock, input.StartTime, input.EndTime, input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);
+ //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+ var whereConditions = DynamicGetQueryParams(input);
+
+ var stock = ObjectMapper.Map<GetWmsMaterialStockInput, WmsMaterialStock>(input);
+ var count = await _wmsmaterialstockRepository.GetCountAsync(whereConditions);
+ var list = await _wmsmaterialstockRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
return new PagedResultDto<WmsMaterialStockDto>(count, ObjectMapper.Map<List<WmsMaterialStock>, List<WmsMaterialStockDto>>(list));
+ }
+
+ public async Task<PagedResultDto<WmsMaterialStockDto>> GetStockDetailAsync(GetWmsMaterialStockInput input)
+ {
+ Check.NotNull(input, nameof(input));
+
+ if (input.Sorting.IsNullOrWhiteSpace())
+ {
+ input.Sorting = nameof(WmsMaterialStock.Sort);
+ }
+
+ #region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+
+ //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+ var count = await _wmsmaterialstockRepository.GetDetailCountAsync(whereConditions);
+ var list = await _wmsmaterialstockRepository.GetStockDetailListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
+ var result = list
+ .GroupBy(x => x.PlaceNo) // 鎸夊簱浣嶅彿鍒嗙粍
+ .SelectMany(g => g
+ .OrderBy(x => x.InStockTime) // 鎸夊叆搴撴椂闂存帓搴�
+ .Select((x, index) => new WmsMaterialStockDto
+ {
+ MaterialId = x.MaterialId,
+ MaterialBatch = x.MaterialBatch,
+ MaterialModel = x.MaterialModel,
+ MaterialName = x.MaterialName,
+ MaterialNo = x.MaterialNo,
+ CheckStatus = x.CheckStatus,
+ ContainerNo = x.ContainerNo,
+ ContainerType = x.ContainerType,
+ StockNumber = x.StockNumber,
+ SupplierCode = x.SupplierCode,
+ PlaceNo = x.PlaceNo,
+ PlaceStatus = x.PlaceStatus,
+ StorageTypeNo = x.StorageTypeNo,
+ AreaCode = x.AreaCode,
+ AreaName = x.AreaName,
+ IsLock = x.IsLock,
+ Id = x.Id,
+ EmptyContainer = x.EmptyContainer,
+ InStockTime = x.InStockTime,
+ RedundantField1 = x.RedundantField1,
+ RedundantField2 = x.RedundantField2,
+ RedundantField3 = x.RedundantField3,
+ Remark = x.Remark,
+ OrderInPlace = index+1
+
+ })).ToList();
+
+ return new PagedResultDto<WmsMaterialStockDto>(count, result);
+ }
+
+ /// <summary>
+ /// 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+ /// </summary>
+ /// <param name="input">杈撳叆鍙傛暟</param>
+ /// <returns></returns>
+ private FunReturnResultModel<Expression<Func<WmsMaterialStock, bool>>> DynamicGetQueryParams(GetWmsMaterialStockInput input)
+ {
+ //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+ var whereConditions = WhereConditionsExtensions.GetWhereConditions<WmsMaterialStock, GetWmsMaterialStockInput>(input);
+ if (!whereConditions.IsSuccess)
+ {
+ throw new Exception("鍔ㄦ�佹瀯閫犳煡璇㈡潯浠跺け璐�:" + whereConditions.ErrMsg);
+ }
+
+ //涔熷彲鍐嶆鑷畾涔夋瀯寤烘煡璇㈡潯浠�
+ Expression<Func<WmsMaterialStock, bool>> extendExpression = a => a.IsDeleted == false;
+ // 浣跨敤 System.Linq.PredicateBuilder 鐨� And
+ var pres = (System.Linq.Expressions.Expression<Func<WmsMaterialStock, bool>>)(whereConditions.data);
+ whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression);
+
+ return whereConditions;
}
/// <inheritdoc />
@@ -85,24 +168,47 @@
// throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialNo]);
//}
var material = await _wmsMaterialRepository.FindByNameAsync(input.MaterialNo);
- if(material == null)
+ if (material == null)
{
throw new UserFriendlyException("鐗╂枡淇℃伅涓嶅瓨鍦�");
}
- var container = await _wmscontainerRepository.FindByNameAsync(input.ContainerNo);
- if (container == null)
+ var container = await _wmscontainerRepository.FindByNameAsync(input.ContainerNo);
+ //if (container == null)
+ //{
+ // throw new UserFriendlyException("鎵樼洏淇℃伅涓嶅瓨鍦�");
+ //}
+
+ var wmsmaterialstock = ObjectMapper.Map<WmsMaterialStockCreateDto, WmsMaterialStock>(input);
+ input.MapExtraPropertiesTo(wmsmaterialstock, MappingPropertyDefinitionChecks.None);
+ wmsmaterialstock.MaterialId = Guid.NewGuid().ToString("N");
+ wmsmaterialstock.MaterialName = material.MaterialName;
+
+ wmsmaterialstock.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;
+ wmsmaterialstock.ContainerType = container == null ? Domain.Shared.Enums.ContainerTypeEnum.XUNI : container.ContainerType;
+ wmsmaterialstock.StorageTypeNo = Domain.Shared.Enums.PlaceTypeEnum.XUNIKUWEI;
+ wmsmaterialstock.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.DAIRU;
+ if (!string.IsNullOrEmpty(input.PlaceNo))
{
- throw new UserFriendlyException("鎵樼洏淇℃伅涓嶅瓨鍦�");
- }
- var place = await _wmsplaceRepository.FindByNameAsync(input.PlaceNo);
- if(place == null)
- {
- throw new UserFriendlyException("搴撲綅淇℃伅涓嶅瓨鍦�");
- }
- var area = await _wmsareaRepository.FindByNameAsync(place.AreaCode);
- if(area == null)
- {
- throw new UserFriendlyException("搴撲綅搴撳尯淇℃伅涓嶅瓨鍦�");
+ var place = await _wmsplaceRepository.FindByNameAsync(input.PlaceNo);
+ if (place == null)
+ {
+ throw new UserFriendlyException("搴撲綅淇℃伅涓嶅瓨鍦�");
+ }
+ var area = await _wmsareaRepository.FindByNameAsync(place.AreaCode);
+ if (area == null)
+ {
+ throw new UserFriendlyException("搴撲綅搴撳尯淇℃伅涓嶅瓨鍦�");
+ }
+
+ wmsmaterialstock.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO;
+ wmsmaterialstock.StorageTypeNo = place.StorageTypeNo;
+ wmsmaterialstock.AreaCode = place.AreaCode;
+ wmsmaterialstock.AreaName = area.AreaName;
+
+ place.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO;
+ place.Islock = input.IsLock;
+
+ await _wmsplaceRepository.UpdateAsync(place);
}
var wmsmaterialstockList = await _wmsmaterialstockRepository.GetStockListAsync(new WmsMaterialStock { PlaceNo = input.PlaceNo });
if (wmsmaterialstockList.Count > 0)
@@ -115,18 +221,6 @@
var maxSort = await _wmsmaterialstockRepository.GetMaxSortAsync();
var sort = input.Sort ?? maxSort;
- var wmsmaterialstock = ObjectMapper.Map<WmsMaterialStockCreateDto, WmsMaterialStock>(input);
- input.MapExtraPropertiesTo(wmsmaterialstock, MappingPropertyDefinitionChecks.None);
- wmsmaterialstock.MaterialId = Guid.NewGuid().ToString("N");
- wmsmaterialstock.MaterialName = material.MaterialName;
-
- wmsmaterialstock.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;
- wmsmaterialstock.ContainerType = container.ContainerType;
-
- wmsmaterialstock.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO;
- wmsmaterialstock.StorageTypeNo = place.StorageTypeNo;
- wmsmaterialstock.AreaCode = place.AreaCode;
- wmsmaterialstock.AreaName = area.AreaName;
wmsmaterialstock.MaterialModel = material.MaterialModel;
wmsmaterialstock.MaterialBatch = input.MaterialBatch;
@@ -135,7 +229,7 @@
wmsmaterialstock.InStockTime = DateTime.Now;
var stockList = new List<WmsMaterialStock>();
- for (int i = 0; i< input.StockNumber; i++)
+ for (int i = 0; i < input.StockNumber; i++)
{
var stock = new WmsMaterialStock();
var json = JsonSerializer.Serialize(wmsmaterialstock);
@@ -147,13 +241,22 @@
await _wmsmaterialstockRepository.InsertManyAsync(stockList);
+ if (container == null)
+ {
+ container = new WmsContainer
+ {
+ ContainerNo = input.ContainerNo,
+ ContainerType = Domain.Shared.Enums.ContainerTypeEnum.XUNI,
+ ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI,
+ };
+ var result = await _wmscontainerRepository.InsertAsync(container);
+ }
+ else
+ {
+ container.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;
- container.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;
- place.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO;
- place.Islock = input.IsLock;
-
- await _wmscontainerRepository.UpdateAsync(container);
- await _wmsplaceRepository.UpdateAsync(place);
+ await _wmscontainerRepository.UpdateAsync(container);
+ }
//if (input.Sort.HasValue && wmsmaterialstock.Sort != maxSort)
//{
@@ -199,9 +302,9 @@
throw new UserFriendlyException("搴撲綅搴撳尯淇℃伅涓嶅瓨鍦�");
}
- foreach(var wmsmaterialstock in wmsmaterialstockList)
+ foreach (var wmsmaterialstock in wmsmaterialstockList)
{
- if(input.StockNumber< wmsmaterialstockList.Count)
+ if (input.StockNumber < wmsmaterialstockList.Count)
{
wmsmaterialstock.IsDeleted = true;
input.StockNumber += 1;
@@ -229,7 +332,7 @@
wmsmaterialstock.MaterialModel = material.MaterialModel;
wmsmaterialstock.MaterialBatch = input.MaterialBatch;
}
- if(input.StockNumber > wmsmaterialstockList.Count)
+ if (input.StockNumber > wmsmaterialstockList.Count)
{
var stockList = new List<WmsMaterialStock>();
for (int i = 0; i < input.StockNumber - wmsmaterialstockList.Count; i++)
@@ -346,7 +449,7 @@
/// <inheritdoc />
public virtual async Task AdjustSortAsync(Guid id, int sort)
{
- var list = await _wmsmaterialstockRepository.GetListAsync(null, null, null, nameof(WmsMaterialStock.Sort));
+ var list = await _wmsmaterialstockRepository.GetListAsync(null, "", 0, 999);
if (list != null && list.Any())
{
var initSort = 1;
@@ -526,7 +629,7 @@
}
/// <inheritdoc />
- public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialStocksInput input)
+ public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialStockInput input)
{
Check.NotNull(input, nameof(input));
@@ -535,9 +638,9 @@
input.Sorting = nameof(WmsMaterialStock.Sort);
}
- var specification = new WmsMaterialStockSpecification(input.Name);
- var stock = ObjectMapper.Map<GetWmsMaterialStocksInput, WmsMaterialStock>(input);
- var list = await _wmsmaterialstockRepository.GetListAsync(stock, input.StartTime, input.EndTime, input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);
+ var whereConditions = DynamicGetQueryParams(input);
+ var stock = ObjectMapper.Map<GetWmsMaterialStockInput, WmsMaterialStock>(input);
+ var list = await _wmsmaterialstockRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
var result = ObjectMapper.Map<List<WmsMaterialStock>, List<WmsMaterialStockDto>>(list);
var sheets = new Dictionary<string, object>
--
Gitblit v1.9.3