From 92d989c80246f16ea94466d1ce60ef9f6dc7e675 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周一, 05 5月 2025 23:43:41 +0800
Subject: [PATCH] 库存管理
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs | 145 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 116 insertions(+), 29 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 4f3b9ee..7aace56 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs
@@ -12,6 +12,10 @@
using CMS.Plugin.HIAWms.Domain.WmsContainers;
using CMS.Plugin.HIAWms.Domain.WmsPlaces;
using CMS.Plugin.HIAWms.Domain.WmsAreas;
+using Volo.Abp.Uow;
+using Microsoft.Extensions.DependencyInjection;
+using NPOI.POIFS.Storage;
+using System.Text.Json;
namespace CMS.Plugin.HIAWms.Application.Implements;
@@ -23,23 +27,26 @@
private readonly IWmsContainerRepository _wmscontainerRepository;
private readonly IWmsPlaceRepository _wmsplaceRepository;
private readonly IWmsAreaRepository _wmsareaRepository;
+ private readonly IServiceProvider _serviceProvider;
/// <summary>
/// Initializes a new instance of the <see cref="WmsMaterialStockAppService"/> class.
/// </summary>
/// <param name="wmsmaterialstockRepository">The task job repository.</param>
- public WmsMaterialStockAppService(IWmsMaterialStockRepository wmsmaterialstockRepository,
- IWmsMaterialRepository wmsMaterialRepository,
- IWmsContainerRepository wmscontainerRepository,
- IWmsPlaceRepository wmsplaceRepository,
+ public WmsMaterialStockAppService(IWmsMaterialStockRepository wmsmaterialstockRepository,
+ IWmsMaterialRepository wmsMaterialRepository,
+ IWmsContainerRepository wmscontainerRepository,
+ IWmsPlaceRepository wmsplaceRepository,
IWmsAreaRepository wmsareaRepository
- )
+,
+ IServiceProvider serviceProvider)
{
_wmsmaterialstockRepository = wmsmaterialstockRepository;
_wmsMaterialRepository = wmsMaterialRepository;
_wmscontainerRepository = wmscontainerRepository;
_wmsplaceRepository = wmsplaceRepository;
_wmsareaRepository = wmsareaRepository;
+ _serviceProvider = serviceProvider;
}
/// <inheritdoc />
@@ -69,6 +76,9 @@
/// <inheritdoc />
public virtual async Task<WmsMaterialStockDto> CreateAsync(WmsMaterialStockCreateDto input)
{
+ using var scope = _serviceProvider.CreateScope();
+ var unitOfWorkManager = scope.ServiceProvider.GetRequiredService<IUnitOfWorkManager>();
+ using var uow = unitOfWorkManager.Begin(requiresNew: true);
await CheckCreateOrUpdateDtoAsync(input);
//var exist = await _wmsmaterialstockRepository.NameExistAsync(input.MaterialNo);
@@ -101,7 +111,7 @@
var wmsmaterialstock = ObjectMapper.Map<WmsMaterialStockCreateDto, WmsMaterialStock>(input);
input.MapExtraPropertiesTo(wmsmaterialstock, MappingPropertyDefinitionChecks.None);
wmsmaterialstock.MaterialId = Guid.NewGuid().ToString("N");
- material.MaterialName = material.MaterialName;
+ wmsmaterialstock.MaterialName = material.MaterialName;
wmsmaterialstock.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;
wmsmaterialstock.ContainerType = container.ContainerType;
@@ -116,7 +126,19 @@
wmsmaterialstock.Sort = sort;
wmsmaterialstock.InStockTime = DateTime.Now;
- await _wmsmaterialstockRepository.InsertAsync(wmsmaterialstock);
+
+ var stockList = new List<WmsMaterialStock>();
+ for (int i = 0; i< input.StockNumber; i++)
+ {
+ var stock = new WmsMaterialStock();
+ var json = JsonSerializer.Serialize(wmsmaterialstock);
+ stock = JsonSerializer.Deserialize<WmsMaterialStock>(json);
+ stock.MaterialId = Guid.NewGuid().ToString("N");
+ stock.StockNumber = 1;
+ stockList.Add(stock);
+ }
+
+ await _wmsmaterialstockRepository.InsertManyAsync(stockList);
container.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;
@@ -130,16 +152,20 @@
{
await AdjustSortAsync(wmsmaterialstock.Id, wmsmaterialstock.Sort);
}
-
+ await uow.SaveChangesAsync();
+ await uow.CompleteAsync();
return ObjectMapper.Map<WmsMaterialStock, WmsMaterialStockDto>(wmsmaterialstock);
}
/// <inheritdoc />
public virtual async Task<WmsMaterialStockDto> UpdateAsync(Guid id, WmsMaterialStockUpdateDto input)
{
+ using var scope = _serviceProvider.CreateScope();
+ var unitOfWorkManager = scope.ServiceProvider.GetRequiredService<IUnitOfWorkManager>();
+ using var uow = unitOfWorkManager.Begin(requiresNew: true);
await CheckCreateOrUpdateDtoAsync(input);
- var wmsmaterialstock = await _wmsmaterialstockRepository.GetAsync(id);
+ var wmsmaterialstockList = await _wmsmaterialstockRepository.GetStockListAsync(new WmsMaterialStock { MaterialNo = input.MaterialNo });
//var exist = await _wmsmaterialstockRepository.NameExistAsync(input.MaterialNo, wmsmaterialstock.Id);
//if (exist)
//{
@@ -165,29 +191,53 @@
{
throw new UserFriendlyException("搴撲綅搴撳尯淇℃伅涓嶅瓨鍦�");
}
- wmsmaterialstock.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
- input.MapExtraPropertiesTo(wmsmaterialstock, MappingPropertyDefinitionChecks.None);
- wmsmaterialstock.MaterialNo = input.MaterialNo;
- wmsmaterialstock.ContainerNo = input.ContainerNo;
- wmsmaterialstock.StockNumber = input.StockNumber;
- wmsmaterialstock.PlaceNo = input.PlaceNo;
- wmsmaterialstock.IsLock = input.IsLock;
- wmsmaterialstock.InStockTime = input.InStockTime;
- wmsmaterialstock.Remark = input.Remark;
- wmsmaterialstock.MaterialName = material.MaterialName;
- wmsmaterialstock.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;
- wmsmaterialstock.ContainerType = container.ContainerType;
+ foreach(var wmsmaterialstock in wmsmaterialstockList)
+ {
+ if(input.StockNumber< wmsmaterialstockList.Count)
+ {
+ wmsmaterialstock.IsDeleted = true;
+ input.StockNumber += 1;
+ }
+ wmsmaterialstock.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
+ input.MapExtraPropertiesTo(wmsmaterialstock, MappingPropertyDefinitionChecks.None);
+ wmsmaterialstock.MaterialNo = input.MaterialNo;
+ wmsmaterialstock.ContainerNo = input.ContainerNo;
+ //wmsmaterialstock.StockNumber = input.StockNumber;
+ wmsmaterialstock.PlaceNo = input.PlaceNo;
+ wmsmaterialstock.IsLock = input.IsLock;
+ wmsmaterialstock.EmptyContainer = input.EmptyContainer;
+ //wmsmaterialstock.InStockTime = input.InStockTime;
+ wmsmaterialstock.Remark = input.Remark;
- wmsmaterialstock.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO;
- wmsmaterialstock.StorageTypeNo = place.StorageTypeNo;
- wmsmaterialstock.AreaCode = place.AreaCode;
- wmsmaterialstock.AreaName = area.AreaName;
+ wmsmaterialstock.MaterialName = material.MaterialName;
+ wmsmaterialstock.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;
+ wmsmaterialstock.ContainerType = container.ContainerType;
- wmsmaterialstock.MaterialModel = material.MaterialModel;
- wmsmaterialstock.MaterialBatch = input.MaterialBatch;
+ wmsmaterialstock.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO;
+ wmsmaterialstock.StorageTypeNo = place.StorageTypeNo;
+ wmsmaterialstock.AreaCode = place.AreaCode;
+ wmsmaterialstock.AreaName = area.AreaName;
- await _wmsmaterialstockRepository.UpdateAsync(wmsmaterialstock);
+ wmsmaterialstock.MaterialModel = material.MaterialModel;
+ wmsmaterialstock.MaterialBatch = input.MaterialBatch;
+ }
+ if(input.StockNumber > wmsmaterialstockList.Count)
+ {
+ var stockList = new List<WmsMaterialStock>();
+ for (int i = 0; i < input.StockNumber - wmsmaterialstockList.Count; i++)
+ {
+ var stock = new WmsMaterialStock();
+ var json = JsonSerializer.Serialize(wmsmaterialstockList[0]);
+ stock = JsonSerializer.Deserialize<WmsMaterialStock>(json);
+ stock.MaterialId = Guid.NewGuid().ToString("N");
+ stock.StockNumber = 1;
+ stockList.Add(stock);
+ }
+ await _wmsmaterialstockRepository.InsertManyAsync(stockList);
+ }
+
+ await _wmsmaterialstockRepository.UpdateManyAsync(wmsmaterialstockList);
container.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;
place.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO;
@@ -196,7 +246,31 @@
await _wmscontainerRepository.UpdateAsync(container);
await _wmsplaceRepository.UpdateAsync(place);
- return ObjectMapper.Map<WmsMaterialStock, WmsMaterialStockDto>(wmsmaterialstock);
+ await uow.SaveChangesAsync();
+ await uow.CompleteAsync();
+
+ var result = wmsmaterialstockList.GroupBy(x => new { x.MaterialNo, x.PlaceNo, x.ContainerNo })
+ .Select(g => new WmsMaterialStock
+ {
+ MaterialNo = g.Key.MaterialNo,
+ MaterialName = g.First().MaterialName,
+ PlaceNo = g.Key.PlaceNo,
+ ContainerNo = g.Key.ContainerNo,
+ ContainerStatus = g.First().ContainerStatus,
+ PlaceStatus = g.First().PlaceStatus,
+ StorageTypeNo = g.First().StorageTypeNo,
+ MaterialBatch = g.First().MaterialBatch,
+ MaterialModel = g.First().MaterialModel,
+ AreaCode = g.First().AreaCode,
+ AreaName = g.First().AreaName,
+ CheckStatus = g.First().CheckStatus,
+ IsLock = g.First().IsLock,
+ EmptyContainer = g.First().EmptyContainer,
+ InStockTime = g.First().InStockTime,
+ StockNumber = g.Sum(x => x.StockNumber)
+ })
+ .FirstOrDefault();
+ return ObjectMapper.Map<WmsMaterialStock, WmsMaterialStockDto>(result);
}
/// <inheritdoc />
@@ -249,6 +323,19 @@
}
}
+ /// <summary>
+ /// 鍒犻櫎搴撳瓨
+ /// </summary>
+ /// <param name="materialNo"></param>
+ /// <returns></returns>
+ public async Task DeleteByMaterialAsync(string materialNo)
+ {
+ var wmsmaterialstockList = await _wmsmaterialstockRepository.GetStockListAsync(new WmsMaterialStock { MaterialNo = materialNo });
+ var ids = wmsmaterialstockList.Select(x => x.Id);
+ await DeleteManyAsync(ids);
+ }
+
+
/// <inheritdoc />
public virtual async Task AdjustSortAsync(Guid id, int sort)
{
--
Gitblit v1.9.3