From 086e8d457fb6480f126aedbd2677c7e97bdac193 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 15:49:09 +0800
Subject: [PATCH] 任务管理修改
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsInOutStockRecordAppService.cs | 177 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 147 insertions(+), 30 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsInOutStockRecordAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsInOutStockRecordAppService.cs
index de2d3f8..44af241 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsInOutStockRecordAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsInOutStockRecordAppService.cs
@@ -1,8 +1,8 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.Shared;
-using CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord;
using CmsQueryExtensions;
+using CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord;
using CmsQueryExtensions.Extension;
using System.Linq.Expressions;
using Volo.Abp;
@@ -14,33 +14,33 @@
namespace CMS.Plugin.HIAWms.Application.Implements;
/// <summary>
-/// 鍑哄叆搴撹褰曡〃搴旂敤鏈嶅姟
+/// 鍑哄叆搴撹褰曞簲鐢ㄦ湇鍔�
/// </summary>
public class WmsInOutStockRecordAppService : CMSPluginAppService, IWmsInOutStockRecordAppService
{
- private readonly IWmsInOutStockRecordRepository _wmsInOutStockRecordRepository;
+ private readonly IWmsInOutStockRecordRepository wmsInOutStockRecordRepository;
/// <summary>
/// Initializes a new instance of the <see cref="WmsInOutStockRecordAppService"/> class.
/// </summary>
/// <param name="WmsInOutStockRecordRepository">The task job repository.</param>
- public WmsInOutStockRecordAppService(IWmsInOutStockRecordRepository wmsInOutStockRecordRepository)
+ public WmsInOutStockRecordAppService(IWmsInOutStockRecordRepository _WmsInOutStockRecordRepository)
{
- _wmsInOutStockRecordRepository = wmsInOutStockRecordRepository;
+ wmsInOutStockRecordRepository = _WmsInOutStockRecordRepository;
}
/// <summary>
- /// 鑾峰彇鎸囧畾鍑哄叆搴撹褰曡〃
+ /// 鑾峰彇鎸囧畾鍑哄叆搴撹褰�
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public virtual async Task<WmsInOutStockRecordDto> GetAsync(Guid id)
{
- return ObjectMapper.Map<WmsInOutStockRecord, WmsInOutStockRecordDto>(await _wmsInOutStockRecordRepository.GetAsync(id));
+ return ObjectMapper.Map<WmsInOutStockRecord, WmsInOutStockRecordDto>(await wmsInOutStockRecordRepository.GetAsync(id));
}
/// <summary>
- /// 鍒嗛〉鑾峰彇鍑哄叆搴撹褰曡〃
+ /// 鍒嗛〉鑾峰彇鍑哄叆搴撹褰�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -60,8 +60,8 @@
#endregion
- var count = await _wmsInOutStockRecordRepository.GetCountAsync(whereConditions);
- var list = await _wmsInOutStockRecordRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
+ var count = await wmsInOutStockRecordRepository.GetCountAsync(whereConditions);
+ var list = await wmsInOutStockRecordRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
return new PagedResultDto<WmsInOutStockRecordDto>(count, ObjectMapper.Map<List<WmsInOutStockRecord>, List<WmsInOutStockRecordDto>>(list));
}
@@ -90,7 +90,7 @@
}
/// <summary>
- /// 鏂板缓鍑哄叆搴撹褰曡〃
+ /// 鏂板缓鍑哄叆搴撹褰�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -99,16 +99,20 @@
{
await CheckCreateOrUpdateDtoAsync(input);
+ //var exist = await wmsInOutStockRecordRepository.NameExistAsync(input.MaterialId);
+ //if (exist)
+ //{
+ // throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialId]);
+ //}
-
- var maxSort = await _wmsInOutStockRecordRepository.GetMaxSortAsync();
+ var maxSort = await wmsInOutStockRecordRepository.GetMaxSortAsync();
var sort = input.Sort ?? maxSort;
var insertObj = ObjectMapper.Map<WmsInOutStockRecordCreateDto, WmsInOutStockRecord>(input);
insertObj.Sort = sort;
input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None);
- await _wmsInOutStockRecordRepository.InsertAsync(insertObj);
+ await wmsInOutStockRecordRepository.InsertAsync(insertObj);
if (input.Sort.HasValue && insertObj.Sort != maxSort)
{
@@ -119,7 +123,7 @@
}
/// <summary>
- /// 鏇存柊鍑哄叆搴撹褰曡〃
+ /// 鏇存柊鍑哄叆搴撹褰�
/// </summary>
/// <param name="id"></param>
/// <param name="input"></param>
@@ -129,8 +133,12 @@
{
await CheckCreateOrUpdateDtoAsync(input);
- var updateObj = await _wmsInOutStockRecordRepository.GetAsync(id);
-
+ var updateObj = await wmsInOutStockRecordRepository.GetAsync(id);
+ //var exist = await wmsInOutStockRecordRepository.NameExistAsync(input.Id, updateObj.Id);
+ //if (exist)
+ //{
+ // throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.Id]);
+ //}
updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
@@ -147,15 +155,16 @@
updateObj.TaskNo = input.TaskNo;
updateObj.SourcePlace = input.SourcePlace;
updateObj.ToPlace = input.ToPlace;
+ updateObj.IsDisabled = input.IsDisabled;
- await _wmsInOutStockRecordRepository.UpdateAsync(updateObj);
+ await wmsInOutStockRecordRepository.UpdateAsync(updateObj);
return ObjectMapper.Map<WmsInOutStockRecord, WmsInOutStockRecordDto>(updateObj);
}
/// <summary>
- /// 鍏嬮殕鍑哄叆搴撹褰曡〃
+ /// 鍏嬮殕鍑哄叆搴撹褰�
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
@@ -195,17 +204,17 @@
}
/// <summary>
- /// 鍒犻櫎鍗曚釜鍑哄叆搴撹褰曡〃
+ /// 鍒犻櫎鍗曚釜鍑哄叆搴撹褰�
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public virtual Task DeleteAsync(Guid id)
{
- return _wmsInOutStockRecordRepository.DeleteAsync(id);
+ return wmsInOutStockRecordRepository.DeleteAsync(id);
}
/// <summary>
- /// 鍒犻櫎澶氫釜鍑哄叆搴撹褰曡〃
+ /// 鍒犻櫎澶氫釜鍑哄叆搴撹褰�
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
@@ -218,14 +227,14 @@
}
/// <summary>
- /// 璋冩暣鎺掑簭鍑哄叆搴撹褰曡〃
+ /// 璋冩暣鎺掑簭鍑哄叆搴撹褰�
/// </summary>
/// <param name="id"></param>
/// <param name="sort"></param>
/// <returns></returns>
public virtual async Task AdjustSortAsync(Guid id, int sort)
{
- var list = await _wmsInOutStockRecordRepository.GetListAsync(null, nameof(WmsInOutStockRecord.Sort));
+ var list = await wmsInOutStockRecordRepository.GetListAsync(null, nameof(WmsInOutStockRecord.Sort));
if (list != null && list.Any())
{
var initSort = 1;
@@ -252,22 +261,130 @@
}
}
- await _wmsInOutStockRecordRepository.UpdateManyAsync(list);
+ await wmsInOutStockRecordRepository.UpdateManyAsync(list);
}
/// <summary>
- /// 瀵煎叆鍑哄叆搴撹褰曡〃
+ /// 瀵煎叆鍑哄叆搴撹褰�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
public async Task ImportAsync(WmsInOutStockRecordsImportModel input)
{
+ Check.NotNull(input, nameof(input));
+ var wmsInOutStockRecordCreateDtos = new List<(int RowIndex, WmsInOutStockRecordCreateDto Item)>();
+ var wmsInOutStockRecordUpdateDtos = new List<(int RowIndex, Guid Id, WmsInOutStockRecordUpdateDto Item)>();
+ var importItems = input.WmsInOutStockRecords;
+
+ if (importItems != null && importItems.Any())
+ {
+ #region 瀵煎叆鏍￠獙
+
+ // 鍒ゆ柇鍚嶇О鏄惁閲嶅锛屽苟杈撳嚭绗嚑琛岄噸澶�
+ var duplicateWmsInOutStockRecords = importItems.GroupBy(x => x.MaterialNo).Where(x => x.Count() > 1).ToList();
+ if (duplicateWmsInOutStockRecords?.Any() == true)
+ {
+ var duplicateWmsInOutStockRecordMsgs = duplicateWmsInOutStockRecords.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝 {string.Join(",", duplicateWmsInOutStockRecordMsgs)}锛岀粓姝㈠鍏�";
+ throw new UserFriendlyException(errorMsg);
+ }
+
+ #endregion
+
+ foreach (var impItem in importItems)
+ {
+ if (impItem.MaterialNo.IsNullOrWhiteSpace())
+ {
+ continue;
+ }
+
+ if (impItem.MaterialNo.IsNullOrWhiteSpace())
+ {
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊impItem.RowIndex}琛岋細WmsInOutStockRecord鍚嶇О涓嶈兘涓虹┖";
+ throw new UserFriendlyException(errorMsg);
+ }
+
+ var oldWmsInOutStockRecord = await wmsInOutStockRecordRepository.FindByNameAsync(impItem.MaterialNo);
+ if (oldWmsInOutStockRecord != null)
+ {
+ var wmsInOutStockRecordUpdateDto = new WmsInOutStockRecordUpdateDto
+ {
+ OrderNo = impItem.OrderNo,
+ MaterialName = impItem.MaterialName,
+ MaterialNo = impItem.MaterialNo,
+ StockType = impItem.StockType,
+ ContainerNo = impItem.ContainerNo,
+ MaterialModel = impItem.MaterialModel,
+ OperateTime = impItem.OperateTime,
+ Remark = impItem.Remark,
+ MaterialId = impItem.MaterialId,
+ TaskNo = impItem.TaskNo,
+ SourcePlace = impItem.SourcePlace,
+ ToPlace = impItem.ToPlace,
+ IsDisabled = impItem.IsDisabled,
+
+ };
+
+ wmsInOutStockRecordUpdateDtos.Add((impItem.RowIndex, oldWmsInOutStockRecord.Id, wmsInOutStockRecordUpdateDto));
+ }
+ else
+ {
+ var wmsInOutStockRecordCreateDto = new WmsInOutStockRecordCreateDto
+ {
+ OrderNo = impItem.OrderNo,
+ MaterialName = impItem.MaterialName,
+ MaterialNo = impItem.MaterialNo,
+ StockType = impItem.StockType,
+ ContainerNo = impItem.ContainerNo,
+ MaterialModel = impItem.MaterialModel,
+ OperateTime = impItem.OperateTime,
+ Remark = impItem.Remark,
+ MaterialId = impItem.MaterialId,
+ TaskNo = impItem.TaskNo,
+ SourcePlace = impItem.SourcePlace,
+ ToPlace = impItem.ToPlace,
+ IsDisabled = impItem.IsDisabled,
+
+ };
+
+ wmsInOutStockRecordCreateDtos.Add((impItem.RowIndex, wmsInOutStockRecordCreateDto));
+ }
+ }
+ }
+
+ // 鏂板
+ foreach (var wmsInOutStockRecordDto in wmsInOutStockRecordCreateDtos)
+ {
+ try
+ {
+ await CreateAsync(wmsInOutStockRecordDto.Item);
+ }
+ catch (Exception e)
+ {
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmsInOutStockRecordDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
+ throw new UserFriendlyException(errorMsg);
+ }
+ }
+
+ // 鏇存柊
+ foreach (var wmsInOutStockRecordDto in wmsInOutStockRecordUpdateDtos)
+ {
+ try
+ {
+ await UpdateAsync(wmsInOutStockRecordDto.Id, wmsInOutStockRecordDto.Item);
+ }
+ catch (Exception e)
+ {
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊wmsInOutStockRecordDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
+ throw new UserFriendlyException(errorMsg);
+ }
+ }
}
/// <summary>
- /// 瀵煎嚭鍑哄叆搴撹褰曡〃
+ /// 瀵煎嚭鍑哄叆搴撹褰�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -288,7 +405,7 @@
#endregion
- var list = await _wmsInOutStockRecordRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
+ var list = await wmsInOutStockRecordRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
var result = ObjectMapper.Map<List<WmsInOutStockRecord>, List<WmsInOutStockRecordDto>>(list);
var sheets = new Dictionary<string, object>
@@ -296,12 +413,12 @@
["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
};
- var fileName = result.Count > 1 ? "WmsInOutStockRecord鍒楄〃" : result.Count == 1 ? result[0]?.MaterialName : "WmsInOutStockRecord妯＄増";
+ var fileName = result.Count > 1 ? "鍑哄叆搴撹褰曞垪琛�" : result.Count == 1 ? result[0]?.MaterialNo : "WmsInOutStockRecord妯＄増";
return (sheets, fileName);
}
/// <summary>
- /// 鏍￠獙鍑哄叆搴撹褰曡〃锛屽綋鏂板缓鎴栨洿鏂版椂
+ /// 鏍￠獙鍑哄叆搴撹褰曪紝褰撴柊寤烘垨鏇存柊鏃�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
--
Gitblit v1.9.3