From 847e7a89974cb6f5bcfbf7fc8fbe84f085502af6 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 11 5月 2025 15:41:44 +0800
Subject: [PATCH] 222
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs | 118 +++++++
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Services/ICallMaterialOrderAppService.cs | 7
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/CallMaterialOrder/ICallMaterialOrderRepository.cs | 7
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.CallMaterialOrderRecord.cs | 1
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs | 1
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/IWorkPlanRepository.cs | 17
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Repositories/EfCoreWorkPlanRepository.cs | 163 +++++----
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderController.cs | 11
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/CallMaterialOrderAppService.cs | 592 ++++++++++++++++++------------------
9 files changed, 539 insertions(+), 378 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Services/ICallMaterialOrderAppService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Services/ICallMaterialOrderAppService.cs
index 9f1e30e..17a352b 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Services/ICallMaterialOrderAppService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Services/ICallMaterialOrderAppService.cs
@@ -20,8 +20,11 @@
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
- Task DeleteManyAsync(IEnumerable<Guid> ids);
-
+ Task DeleteManyAsync(IEnumerable<Guid> ids);
+
+
+ Task CallMaterialByDataIdentifier(Guid id);
+
/// <summary>
/// 璋冩暣鎺掑簭鍙枡鍗曡〃
/// </summary>
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/CallMaterialOrderAppService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/CallMaterialOrderAppService.cs
index 6be99b8..ed7b19f 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/CallMaterialOrderAppService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/CallMaterialOrderAppService.cs
@@ -1,127 +1,135 @@
-using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.CallMaterialOrder;
-using CMS.Plugin.PipeLineLems.Application.Contracts.Services;
-using CMS.Plugin.PipeLineLems.Domain.Shared;
-using CmsQueryExtensions;
-using CMS.Plugin.PipeLineLems.Domain.CallMaterialOrder;
-using CmsQueryExtensions.Extension;
-using System.Linq.Expressions;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Data;
-using Volo.Abp.ObjectExtending;
-using Volo.Abp.ObjectMapping;
-
-namespace CMS.Plugin.PipeLineLems.Application.Implements;
-
+using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.CallMaterialOrder;
+using CMS.Plugin.PipeLineLems.Application.Contracts.Services;
+using CMS.Plugin.PipeLineLems.Domain.Shared;
+using CmsQueryExtensions;
+using CMS.Plugin.PipeLineLems.Domain.CallMaterialOrder;
+using CmsQueryExtensions.Extension;
+using System.Linq.Expressions;
+using Volo.Abp;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending;
+using Volo.Abp.ObjectMapping;
+
+namespace CMS.Plugin.PipeLineLems.Application.Implements;
+
/// <summary>
/// 鍙枡鍗曡〃搴旂敤鏈嶅姟
/// </summary>
-public class CallMaterialOrderAppService : CMSPluginAppService, ICallMaterialOrderAppService
-{
- private readonly ICallMaterialOrderRepository callMaterialOrderRepository;
-
+public class CallMaterialOrderAppService : CMSPluginAppService, ICallMaterialOrderAppService
+{
+ private readonly ICallMaterialOrderRepository callMaterialOrderRepository;
+ private readonly SharedService _sharedService;
+ private readonly IServiceProvider _serviceProvider;
/// <summary>
/// Initializes a new instance of the <see cref="CallMaterialOrderAppService"/> class.
/// </summary>
/// <param name="CallMaterialOrderRepository">The task job repository.</param>
- public CallMaterialOrderAppService(ICallMaterialOrderRepository _CallMaterialOrderRepository)
- {
- callMaterialOrderRepository = _CallMaterialOrderRepository;
- }
-
+ public CallMaterialOrderAppService(ICallMaterialOrderRepository _CallMaterialOrderRepository, SharedService sharedService, IServiceProvider serviceProvider)
+ {
+ callMaterialOrderRepository = _CallMaterialOrderRepository;
+ _sharedService = sharedService;
+ _serviceProvider = serviceProvider;
+ }
+
/// <summary>
/// 鑾峰彇鎸囧畾鍙枡鍗曡〃
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public virtual async Task<CallMaterialOrderDto> GetAsync(Guid id)
- {
- return ObjectMapper.Map<CallMaterialOrder, CallMaterialOrderDto>(await callMaterialOrderRepository.GetAsync(id));
- }
-
+ public virtual async Task<CallMaterialOrderDto> GetAsync(Guid id)
+ {
+ return ObjectMapper.Map<CallMaterialOrder, CallMaterialOrderDto>(await callMaterialOrderRepository.GetAsync(id));
+ }
+
+ public virtual async Task CallMaterialByDataIdentifier(Guid id)
+ {
+ await _sharedService.CallMaterialByDataIdentifier(id, _serviceProvider);
+ }
+
/// <summary>
/// 鍒嗛〉鑾峰彇鍙枡鍗曡〃
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public virtual async Task<PagedResultDto<CallMaterialOrderDto>> GetListAsync(GetCallMaterialOrderInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(CallMaterialOrder.Sort);
- }
-
+ public virtual async Task<PagedResultDto<CallMaterialOrderDto>> GetListAsync(GetCallMaterialOrderInput input)
+ {
+ Check.NotNull(input, nameof(input));
+
+ if (input.Sorting.IsNullOrWhiteSpace())
+ {
+ input.Sorting = nameof(CallMaterialOrder.Sort);
+ }
+
#region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
-
+
//鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = DynamicGetQueryParams(input);
-
- #endregion
-
- var count = await callMaterialOrderRepository.GetCountAsync(whereConditions);
- var list = await callMaterialOrderRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
-
- return new PagedResultDto<CallMaterialOrderDto>(count, ObjectMapper.Map<List<CallMaterialOrder>, List<CallMaterialOrderDto>>(list));
- }
-
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+ var count = await callMaterialOrderRepository.GetCountAsync(whereConditions);
+ var list = await callMaterialOrderRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
+
+ return new PagedResultDto<CallMaterialOrderDto>(count, ObjectMapper.Map<List<CallMaterialOrder>, List<CallMaterialOrderDto>>(list));
+ }
+
/// <summary>
/// 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
/// </summary>
/// <param name="input">杈撳叆鍙傛暟</param>
/// <returns></returns>
- private FunReturnResultModel<Expression<Func<CallMaterialOrder, bool>>> DynamicGetQueryParams(GetCallMaterialOrderInput input)
- {
+ private FunReturnResultModel<Expression<Func<CallMaterialOrder, bool>>> DynamicGetQueryParams(GetCallMaterialOrderInput input)
+ {
//鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = WhereConditionsExtensions.GetWhereConditions<CallMaterialOrder, GetCallMaterialOrderInput>(input);
- if (!whereConditions.IsSuccess)
- {
- throw new Exception("鍔ㄦ�佹瀯閫犳煡璇㈡潯浠跺け璐�:" + whereConditions.ErrMsg);
- }
-
+ var whereConditions = WhereConditionsExtensions.GetWhereConditions<CallMaterialOrder, GetCallMaterialOrderInput>(input);
+ if (!whereConditions.IsSuccess)
+ {
+ throw new Exception("鍔ㄦ�佹瀯閫犳煡璇㈡潯浠跺け璐�:" + whereConditions.ErrMsg);
+ }
+
//涔熷彲鍐嶆鑷畾涔夋瀯寤烘煡璇㈡潯浠�
- Expression<Func<CallMaterialOrder, bool>> extendExpression = a => a.IsDeleted == false;
+ Expression<Func<CallMaterialOrder, bool>> extendExpression = a => a.IsDeleted == false;
// 浣跨敤 System.Linq.PredicateBuilder 鐨� And
- var pres = (System.Linq.Expressions.Expression<Func<CallMaterialOrder, bool>>)(whereConditions.data);
- whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression);
-
- return whereConditions;
- }
-
+ var pres = (System.Linq.Expressions.Expression<Func<CallMaterialOrder, bool>>)(whereConditions.data);
+ whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression);
+
+ return whereConditions;
+ }
+
/// <summary>
/// 鏂板缓鍙枡鍗曡〃
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public virtual async Task<CallMaterialOrderDto> CreateAsync(CallMaterialOrderCreateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var exist = await callMaterialOrderRepository.NameExistAsync(input.DataIdentifier);
- if (exist)
- {
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.DataIdentifier]);
- }
-
- var maxSort = await callMaterialOrderRepository.GetMaxSortAsync();
- var sort = input.Sort ?? maxSort;
-
- var insertObj = ObjectMapper.Map<CallMaterialOrderCreateDto, CallMaterialOrder>(input);
- insertObj.Sort = sort;
- input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None);
-
- await callMaterialOrderRepository.InsertAsync(insertObj);
-
+ public virtual async Task<CallMaterialOrderDto> CreateAsync(CallMaterialOrderCreateDto input)
+ {
+ await CheckCreateOrUpdateDtoAsync(input);
+
+ var exist = await callMaterialOrderRepository.NameExistAsync(input.DataIdentifier);
+ if (exist)
+ {
+ throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.DataIdentifier]);
+ }
+
+ var maxSort = await callMaterialOrderRepository.GetMaxSortAsync();
+ var sort = input.Sort ?? maxSort;
+
+ var insertObj = ObjectMapper.Map<CallMaterialOrderCreateDto, CallMaterialOrder>(input);
+ insertObj.Sort = sort;
+ input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None);
+
+ await callMaterialOrderRepository.InsertAsync(insertObj);
+
//if (input.Sort.HasValue && insertObj.Sort != maxSort)
//{
// await AdjustSortAsync(insertObj.Id, insertObj.Sort);
//}
-
- return ObjectMapper.Map<CallMaterialOrder, CallMaterialOrderDto>(insertObj);
- }
-
+
+ return ObjectMapper.Map<CallMaterialOrder, CallMaterialOrderDto>(insertObj);
+ }
+
/// <summary>
/// 鏇存柊鍙枡鍗曡〃
/// </summary>
@@ -129,41 +137,41 @@
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public virtual async Task<CallMaterialOrderDto> UpdateAsync(Guid id, CallMaterialOrderUpdateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var updateObj = await callMaterialOrderRepository.GetAsync(id);
- var exist = await callMaterialOrderRepository.NameExistAsync(input.DataIdentifier, updateObj.Id);
- if (exist)
- {
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.DataIdentifier]);
- }
-
- updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
- input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
-
- updateObj.DataIdentifier = input.DataIdentifier;
+ public virtual async Task<CallMaterialOrderDto> UpdateAsync(Guid id, CallMaterialOrderUpdateDto input)
+ {
+ await CheckCreateOrUpdateDtoAsync(input);
+
+ var updateObj = await callMaterialOrderRepository.GetAsync(id);
+ var exist = await callMaterialOrderRepository.NameExistAsync(input.DataIdentifier, updateObj.Id);
+ if (exist)
+ {
+ throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.DataIdentifier]);
+ }
+
+ updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
+ input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
+
+ updateObj.DataIdentifier = input.DataIdentifier;
updateObj.MaterialMode = input.MaterialMode;
updateObj.CallMaterialStatus = input.CallMaterialStatus;
updateObj.Quantity = input.Quantity;
updateObj.WmsRetResult = input.WmsRetResult;
updateObj.WmsTaskNo = input.WmsTaskNo;
updateObj.Remark = input.Remark;
-
-
- await callMaterialOrderRepository.UpdateAsync(updateObj);
-
- return ObjectMapper.Map<CallMaterialOrder, CallMaterialOrderDto>(updateObj);
- }
-
+
+
+ await callMaterialOrderRepository.UpdateAsync(updateObj);
+
+ return ObjectMapper.Map<CallMaterialOrder, CallMaterialOrderDto>(updateObj);
+ }
+
/// <summary>
/// 鍏嬮殕鍙枡鍗曡〃
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
- public async Task<List<CallMaterialOrderDto>> CloneAsync(IEnumerable<Guid> ids)
- {
+ public async Task<List<CallMaterialOrderDto>> CloneAsync(IEnumerable<Guid> ids)
+ {
//var callMaterialOrders = new List<CallMaterialOrder>();
//if (ids != null)
//{
@@ -183,234 +191,234 @@
// name += CallMaterialOrderConsts.CloneTag;
// continue;
// }
-
+
// notExist = true;
// }
-
+
// //CallMaterialOrder = await callMaterialOrderRepository.InsertAsync(CallMaterialOrder.Clone(GuidGenerator.Create(), name, sort++));
// callMaterialOrders.Add(CallMaterialOrder);
// }
// }
//}
-
+
//return ObjectMapper.Map<List<CallMaterialOrder>, List<CallMaterialOrderDto>>(callMaterialOrders);
- return new List<CallMaterialOrderDto>();
- }
-
+ return new List<CallMaterialOrderDto>();
+ }
+
/// <summary>
/// 鍒犻櫎鍗曚釜鍙枡鍗曡〃
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public virtual Task DeleteAsync(Guid id)
- {
- return callMaterialOrderRepository.DeleteAsync(id);
- }
-
+ public virtual Task DeleteAsync(Guid id)
+ {
+ return callMaterialOrderRepository.DeleteAsync(id);
+ }
+
/// <summary>
/// 鍒犻櫎澶氫釜鍙枡鍗曡〃
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
- public async Task DeleteManyAsync(IEnumerable<Guid> ids)
- {
- foreach (var id in ids)
- {
- await DeleteAsync(id);
- }
- }
-
+ public async Task DeleteManyAsync(IEnumerable<Guid> ids)
+ {
+ foreach (var id in ids)
+ {
+ await DeleteAsync(id);
+ }
+ }
+
/// <summary>
/// 璋冩暣鎺掑簭鍙枡鍗曡〃
/// </summary>
/// <param name="id"></param>
/// <param name="sort"></param>
/// <returns></returns>
- public virtual async Task AdjustSortAsync(Guid id, int sort)
- {
- var list = await callMaterialOrderRepository.GetListAsync(null, nameof(CallMaterialOrder.Sort));
- if (list != null && list.Any())
- {
- var initSort = 1;
- list.ForEach(x => x.AdjustSort(initSort++));
- var entity = list.FirstOrDefault(x => x.Id == id);
- if (entity != null)
- {
- if (sort == 1)
- {
- list.Where(x => x.Id != id).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- }
- else if (entity.Sort > sort)
- {
- list.Where(x => x.Id != id && x.Sort >= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- list.Where(x => x.Id != id && x.Sort < sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
- }
- else if (entity.Sort < sort)
- {
- list.Where(x => x.Id != id && x.Sort > sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
- list.Where(x => x.Id != id && x.Sort <= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
- }
-
- entity.AdjustSort(sort);
- }
- }
-
- await callMaterialOrderRepository.UpdateManyAsync(list);
- }
-
+ public virtual async Task AdjustSortAsync(Guid id, int sort)
+ {
+ var list = await callMaterialOrderRepository.GetListAsync(null, nameof(CallMaterialOrder.Sort));
+ if (list != null && list.Any())
+ {
+ var initSort = 1;
+ list.ForEach(x => x.AdjustSort(initSort++));
+ var entity = list.FirstOrDefault(x => x.Id == id);
+ if (entity != null)
+ {
+ if (sort == 1)
+ {
+ list.Where(x => x.Id != id).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
+ }
+ else if (entity.Sort > sort)
+ {
+ list.Where(x => x.Id != id && x.Sort >= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
+ list.Where(x => x.Id != id && x.Sort < sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
+ }
+ else if (entity.Sort < sort)
+ {
+ list.Where(x => x.Id != id && x.Sort > sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
+ list.Where(x => x.Id != id && x.Sort <= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
+ }
+
+ entity.AdjustSort(sort);
+ }
+ }
+
+ await callMaterialOrderRepository.UpdateManyAsync(list);
+ }
+
/// <summary>
/// 瀵煎叆鍙枡鍗曡〃
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public async Task ImportAsync(CallMaterialOrdersImportModel input)
- {
- Check.NotNull(input, nameof(input));
-
- var callMaterialOrderCreateDtos = new List<(int RowIndex, CallMaterialOrderCreateDto Item)>();
- var callMaterialOrderUpdateDtos = new List<(int RowIndex, Guid Id, CallMaterialOrderUpdateDto Item)>();
- var importItems = input.CallMaterialOrders;
-
- if (importItems != null && importItems.Any())
- {
+ public async Task ImportAsync(CallMaterialOrdersImportModel input)
+ {
+ Check.NotNull(input, nameof(input));
+
+ var callMaterialOrderCreateDtos = new List<(int RowIndex, CallMaterialOrderCreateDto Item)>();
+ var callMaterialOrderUpdateDtos = new List<(int RowIndex, Guid Id, CallMaterialOrderUpdateDto Item)>();
+ var importItems = input.CallMaterialOrders;
+
+ if (importItems != null && importItems.Any())
+ {
#region 瀵煎叆鏍￠獙
-
+
// 鍒ゆ柇鍚嶇О鏄惁閲嶅锛屽苟杈撳嚭绗嚑琛岄噸澶�
- var duplicateCallMaterialOrders = importItems.GroupBy(x => x.DataIdentifier).Where(x => x.Count() > 1).ToList();
- if (duplicateCallMaterialOrders?.Any() == true)
- {
- var duplicateCallMaterialOrderMsgs = duplicateCallMaterialOrders.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝 {string.Join(",", duplicateCallMaterialOrderMsgs)}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
-
- #endregion
-
- foreach (var impItem in importItems)
- {
- if (impItem.DataIdentifier.IsNullOrWhiteSpace())
- {
- continue;
- }
-
- if (impItem.DataIdentifier.IsNullOrWhiteSpace())
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊impItem.RowIndex}琛岋細CallMaterialOrder鍚嶇О涓嶈兘涓虹┖";
- throw new UserFriendlyException(errorMsg);
- }
-
- var oldCallMaterialOrder = await callMaterialOrderRepository.FindByNameAsync(impItem.DataIdentifier);
- if (oldCallMaterialOrder != null)
- {
- var callMaterialOrderUpdateDto = new CallMaterialOrderUpdateDto
- {
+ var duplicateCallMaterialOrders = importItems.GroupBy(x => x.DataIdentifier).Where(x => x.Count() > 1).ToList();
+ if (duplicateCallMaterialOrders?.Any() == true)
+ {
+ var duplicateCallMaterialOrderMsgs = duplicateCallMaterialOrders.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝 {string.Join(",", duplicateCallMaterialOrderMsgs)}锛岀粓姝㈠鍏�";
+ throw new UserFriendlyException(errorMsg);
+ }
+
+ #endregion
+
+ foreach (var impItem in importItems)
+ {
+ if (impItem.DataIdentifier.IsNullOrWhiteSpace())
+ {
+ continue;
+ }
+
+ if (impItem.DataIdentifier.IsNullOrWhiteSpace())
+ {
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊impItem.RowIndex}琛岋細CallMaterialOrder鍚嶇О涓嶈兘涓虹┖";
+ throw new UserFriendlyException(errorMsg);
+ }
+
+ var oldCallMaterialOrder = await callMaterialOrderRepository.FindByNameAsync(impItem.DataIdentifier);
+ if (oldCallMaterialOrder != null)
+ {
+ var callMaterialOrderUpdateDto = new CallMaterialOrderUpdateDto
+ {
DataIdentifier = impItem.DataIdentifier,
-MaterialMode = impItem.MaterialMode,
-CallMaterialStatus = impItem.CallMaterialStatus,
-Quantity = impItem.Quantity,
-WmsRetResult = impItem.WmsRetResult,
-WmsTaskNo = impItem.WmsTaskNo,
-Remark = impItem.Remark,
-
- };
-
- callMaterialOrderUpdateDtos.Add((impItem.RowIndex, oldCallMaterialOrder.Id, callMaterialOrderUpdateDto));
- }
- else
- {
- var callMaterialOrderCreateDto = new CallMaterialOrderCreateDto
- {
+ MaterialMode = impItem.MaterialMode,
+ CallMaterialStatus = impItem.CallMaterialStatus,
+ Quantity = impItem.Quantity,
+ WmsRetResult = impItem.WmsRetResult,
+ WmsTaskNo = impItem.WmsTaskNo,
+ Remark = impItem.Remark,
+
+ };
+
+ callMaterialOrderUpdateDtos.Add((impItem.RowIndex, oldCallMaterialOrder.Id, callMaterialOrderUpdateDto));
+ }
+ else
+ {
+ var callMaterialOrderCreateDto = new CallMaterialOrderCreateDto
+ {
DataIdentifier = impItem.DataIdentifier,
-MaterialMode = impItem.MaterialMode,
-CallMaterialStatus = impItem.CallMaterialStatus,
-Quantity = impItem.Quantity,
-WmsRetResult = impItem.WmsRetResult,
-WmsTaskNo = impItem.WmsTaskNo,
-Remark = impItem.Remark,
-
- };
-
- callMaterialOrderCreateDtos.Add((impItem.RowIndex, callMaterialOrderCreateDto));
- }
- }
- }
-
+ MaterialMode = impItem.MaterialMode,
+ CallMaterialStatus = impItem.CallMaterialStatus,
+ Quantity = impItem.Quantity,
+ WmsRetResult = impItem.WmsRetResult,
+ WmsTaskNo = impItem.WmsTaskNo,
+ Remark = impItem.Remark,
+
+ };
+
+ callMaterialOrderCreateDtos.Add((impItem.RowIndex, callMaterialOrderCreateDto));
+ }
+ }
+ }
+
// 鏂板
- foreach (var callMaterialOrderDto in callMaterialOrderCreateDtos)
- {
- try
- {
- await CreateAsync(callMaterialOrderDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊callMaterialOrderDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
-
+ foreach (var callMaterialOrderDto in callMaterialOrderCreateDtos)
+ {
+ try
+ {
+ await CreateAsync(callMaterialOrderDto.Item);
+ }
+ catch (Exception e)
+ {
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊callMaterialOrderDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
+ throw new UserFriendlyException(errorMsg);
+ }
+ }
+
// 鏇存柊
- foreach (var callMaterialOrderDto in callMaterialOrderUpdateDtos)
- {
- try
- {
- await UpdateAsync(callMaterialOrderDto.Id, callMaterialOrderDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊callMaterialOrderDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
- }
-
+ foreach (var callMaterialOrderDto in callMaterialOrderUpdateDtos)
+ {
+ try
+ {
+ await UpdateAsync(callMaterialOrderDto.Id, callMaterialOrderDto.Item);
+ }
+ catch (Exception e)
+ {
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊callMaterialOrderDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
+ throw new UserFriendlyException(errorMsg);
+ }
+ }
+ }
+
/// <summary>
/// 瀵煎嚭鍙枡鍗曡〃
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetCallMaterialOrderInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(CallMaterialOrder.Sort);
- }
-
+ public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetCallMaterialOrderInput input)
+ {
+ Check.NotNull(input, nameof(input));
+
+ if (input.Sorting.IsNullOrWhiteSpace())
+ {
+ input.Sorting = nameof(CallMaterialOrder.Sort);
+ }
+
#region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
-
+
//鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = DynamicGetQueryParams(input);
-
- #endregion
-
-
- var list = await callMaterialOrderRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
- var result = ObjectMapper.Map<List<CallMaterialOrder>, List<CallMaterialOrderDto>>(list);
-
- var sheets = new Dictionary<string, object>
- {
- ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
- };
-
- var fileName = "鍙枡鍗�";
- return (sheets, fileName);
- }
-
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+
+ var list = await callMaterialOrderRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
+ var result = ObjectMapper.Map<List<CallMaterialOrder>, List<CallMaterialOrderDto>>(list);
+
+ var sheets = new Dictionary<string, object>
+ {
+ ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
+ };
+
+ var fileName = "鍙枡鍗�";
+ return (sheets, fileName);
+ }
+
/// <summary>
/// 鏍￠獙鍙枡鍗曡〃锛屽綋鏂板缓鎴栨洿鏂版椂
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- protected Task CheckCreateOrUpdateDtoAsync(CallMaterialOrderCreateOrUpdateDtoBase input)
- {
- Check.NotNull(input, nameof(input));
- Check.NotNullOrWhiteSpace(input.DataIdentifier, "鍘熸枡鏍囪瘑", 256);
+ protected Task CheckCreateOrUpdateDtoAsync(CallMaterialOrderCreateOrUpdateDtoBase input)
+ {
+ Check.NotNull(input, nameof(input));
+ Check.NotNullOrWhiteSpace(input.DataIdentifier, "鍘熸枡鏍囪瘑", 256);
Check.NotNull(input.CallMaterialStatus, "鍙枡鐘舵��");
Check.NotNull(input.Quantity, "鍙枡鏁伴噺");
-
- return Task.CompletedTask;
- }
-}
+
+ return Task.CompletedTask;
+ }
+}
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
index 63676a1..e8fe2be 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
@@ -12,6 +12,9 @@
using CMS.Plugin.PipeLineLems.Application.Contracts.Services;
using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.CallMaterialOrder;
using Volo.Abp.Uow;
+using System.Text;
+using CMS.Plugin.PipeLineLems.Domain.WorkPlan;
+using CMS.Plugin.PipeLineLems.Domain.CallMaterialOrderRecord;
namespace CMS.Plugin.PipeLineLems.Application.Implements;
@@ -20,6 +23,14 @@
/// </summary>
public class SharedService : CMSPluginAppService
{
+ /// <summary>
+ /// 鍒涘缓浣滀笟璁″垝
+ /// </summary>
+ /// <param name="input"></param>
+ /// <param name="_serviceProvider"></param>
+ /// <param name="workPlanAppService"></param>
+ /// <returns></returns>
+ /// <exception cref="UserFriendlyException"></exception>
public async Task<MesOrderResponse> CommonCreatebyApsAsync(List<WorkPlanInput> input, IServiceProvider _serviceProvider,
WorkPlanAppService workPlanAppService
@@ -191,12 +202,12 @@
}
catch (Exception)
{
-
+ await uow.RollbackAsync();
throw;
}
finally
{
- await uow.RollbackAsync();
+
}
@@ -255,4 +266,107 @@
return (true, string.Empty);
}
+
+
+ /// <summary>
+ /// 鏍规嵁鍘熸枡鏍囪瘑杩涜鍙枡鎿嶄綔
+ /// </summary>
+ /// <param name="dataIdentifier">鍘熸枡鏍囪瘑</param>
+ /// <param name="_serviceProvider">鏈嶅姟鎻愪緵鑰�</param>
+ /// <returns>鎿嶄綔缁撴灉</returns>
+ /// <exception cref="UserFriendlyException">褰撴暟鎹笉瀛樺湪鎴栫姸鎬佷笉鍏佽鍙枡鏃舵姏鍑�</exception>
+ public async Task<MesOrderResponse> CallMaterialByDataIdentifier(Guid id, IServiceProvider _serviceProvider)
+ {
+ if (string.IsNullOrEmpty(id.ToString()))
+ {
+ throw new UserFriendlyException("鍘熸枡鏍囪瘑涓嶈兘涓虹┖");
+ }
+
+ var callMaterialOrderRepository = _serviceProvider.GetRequiredService<ICallMaterialOrderRepository>();
+ var workPlanRepository = _serviceProvider.GetRequiredService<IWorkPlanRepository>();
+ var callMaterialOrderRecordRepository = _serviceProvider.GetRequiredService<ICallMaterialOrderRecordRepository>();
+ var orderManager = _serviceProvider.GetRequiredService<IOrderManager>();
+
+ // 鏌ユ壘鏁版嵁
+
+ var callMaterialOrder = await callMaterialOrderRepository.GetAsync(id);
+ if (callMaterialOrder == null)
+ {
+ throw new UserFriendlyException($"鎵句笉鍒板彨鏂欒褰�");
+ }
+
+ // 楠岃瘉鐘舵��
+ //if (callMaterialOrder.CallMaterialStatus != Domain.Shared.Enums.CallMaterialStatusEnum.鏈墽琛�)
+ //{
+ // throw new UserFriendlyException($"鍘熸枡鏍囪瘑涓� '{callMaterialOrder.DataIdentifier}' 鐨勫彨鏂欒褰曠姸鎬佷负 '{callMaterialOrder.CallMaterialStatus}'锛屼笉鍏佽鍙枡");
+ //}
+
+ // 鏇存柊鏁版嵁
+ callMaterialOrder.WmsRetResult = "鎴愬姛";
+ callMaterialOrder.WmsTaskNo = GenerateRandomTaskNo();
+ callMaterialOrder.CallMaterialStatus = Domain.Shared.Enums.CallMaterialStatusEnum.鍙枡瀹屾垚;
+ callMaterialOrder.LastModifierName = "SuperAdmin";
+
+ await callMaterialOrderRepository.UpdateAsync(callMaterialOrder);
+
+ //鏇存柊浣滀笟璁″垝琛�
+ var workPlanList = await workPlanRepository.FindByDataIdentifierAsync(callMaterialOrder.DataIdentifier);
+ foreach (var item in workPlanList)
+ {
+ item.CallMaterialStatus = Domain.Shared.Enums.CallMaterialStatusEnum.鍙枡瀹屾垚;
+ item.LastModifierName = "SuperAdmin";
+ }
+ await workPlanRepository.UpdateManyAsync(workPlanList);
+
+ //鏂板鍙枡璁板綍琛�
+ var callMaterialOrderRecord = new CallMaterialOrderRecord()
+ {
+ CallMaterialStatus = Domain.Shared.Enums.CallMaterialStatusEnum.鍙枡瀹屾垚,
+ MaterialMode = callMaterialOrder.MaterialMode,
+ DataIdentifier = callMaterialOrder.DataIdentifier,
+ Quantity = 1,
+ WmsRetResult = callMaterialOrder.WmsRetResult,
+ WmsTaskNo = callMaterialOrder.WmsTaskNo,
+ CreatorName = "SuperAdmin"
+ };
+ await callMaterialOrderRecordRepository.InsertAsync(callMaterialOrderRecord);
+
+ //鏇存柊宸ュ崟琛ㄧ殑鐘舵��
+ var pipeSpecCodeList = workPlanList.Select(x => x.PipeSpecCode).Distinct().ToList();
+ foreach (var item in pipeSpecCodeList)
+ {
+ var prodOrderNo = "Order_" + item;
+ var order = await orderManager.GetByCodeAsync(prodOrderNo);
+ if (order != null)
+ {
+ order.ExtraProperties["CallMaterialStatus"] = Domain.Shared.Enums.CallMaterialStatusEnum.鍙枡瀹屾垚.ToString();
+ }
+ await orderManager.UpdateAsync(order);
+ }
+
+
+ // 杩斿洖缁撴灉
+ var response = new MesOrderResponse
+ {
+ Code = "000000",
+ Fail = false,
+ Mesg = "鍙枡鎴愬姛",
+ Success = true,
+ Time = DateTime.UtcNow
+ };
+ return response;
+ }
+
+ /// <summary>
+ /// 鐢熸垚闅忔満鐨刉msTaskNo
+ /// </summary>
+ /// <returns>闅忔満鐢熸垚鐨勪换鍔＄紪鍙�</returns>
+ private string GenerateRandomTaskNo()
+ {
+ // 鑾峰彇褰撳墠鏃堕棿鎴筹紙浠�1970-01-01 00:00:00 UTC鍒扮幇鍦ㄧ殑绉掓暟锛�
+ long timestamp = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds();
+
+ // 鐢熸垚鍓嶇紑
+ return $"WMS{timestamp}";
+ }
}
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs
index bc1a9cd..f9c257a 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs
@@ -113,6 +113,7 @@
var insertObj = ObjectMapper.Map<WorkPlanCreateDto, WorkPlan>(input);
insertObj.Sort = sort;
+ insertObj.CreatorName = "SuperAdmin";
input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None);
await workPlanRepository.InsertAsync(insertObj);
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/CallMaterialOrder/ICallMaterialOrderRepository.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/CallMaterialOrder/ICallMaterialOrderRepository.cs
index 54c3638..71fbfb4 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/CallMaterialOrder/ICallMaterialOrderRepository.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/CallMaterialOrder/ICallMaterialOrderRepository.cs
@@ -29,8 +29,11 @@
/// 鑾峰彇鏈�澶ф帓搴忓彨鏂欏崟琛�
/// </summary>
/// <returns></returns>
- Task<int> GetMaxSortAsync();
-
+ Task<int> GetMaxSortAsync();
+
+
+
+
/// <summary>
/// 鑾峰彇鍒嗛〉鍒楄〃鍙枡鍗曡〃
/// </summary>
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/IWorkPlanRepository.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/IWorkPlanRepository.cs
index 471bb03..1380e17 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/IWorkPlanRepository.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/IWorkPlanRepository.cs
@@ -23,14 +23,23 @@
/// <param name="name"></param>
/// <param name="id"></param>
/// <returns></returns>
- Task<bool> NameExistAsync(string name, Guid? id = null);
-
+ Task<bool> NameExistAsync(string name, Guid? id = null);
+
/// <summary>
/// 鑾峰彇鏈�澶ф帓搴忎綔涓氳鍒掕〃
/// </summary>
/// <returns></returns>
- Task<int> GetMaxSortAsync();
-
+ Task<int> GetMaxSortAsync();
+
+
+ /// <summary>
+ /// 鎸夌収 鍘熸枡鏍囪 鏌ユ壘浣滀笟璁″垝琛�
+ /// </summary>
+ /// <param name="name"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ Task<List<WorkPlan>> FindByDataIdentifierAsync(string dataIdentifier, CancellationToken cancellationToken = default);
+
/// <summary>
/// 鑾峰彇鍒嗛〉鍒楄〃浣滀笟璁″垝琛�
/// </summary>
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.CallMaterialOrderRecord.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.CallMaterialOrderRecord.cs
index 75005f6..f29913b 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.CallMaterialOrderRecord.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.CallMaterialOrderRecord.cs
@@ -56,7 +56,6 @@
b.ConfigureMyCmsEntityForRecord();
// Configure indexes
- b.HasIndex(u => u.DataIdentifier).IsUnique();
b.HasIndex(u => u.DataIdentifier);
b.ApplyObjectExtensionMappings();
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Repositories/EfCoreWorkPlanRepository.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Repositories/EfCoreWorkPlanRepository.cs
index cf8294f..caade5e 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Repositories/EfCoreWorkPlanRepository.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Repositories/EfCoreWorkPlanRepository.cs
@@ -1,73 +1,90 @@
-using CMS.Plugin.PipeLineLems.Domain.WorkPlan;
-using CMS.Plugin.PipeLineLems.EntityFrameworkCore.Extensions;
-using CmsQueryExtensions.Extension;
-using Microsoft.EntityFrameworkCore;
-using System.Linq.Dynamic.Core;
-using System.Linq.Expressions;
-using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore;
-
-
-namespace CMS.Plugin.PipeLineLems.EntityFrameworkCore.Repositories;
-
+using CMS.Plugin.PipeLineLems.Domain.WorkPlan;
+using CMS.Plugin.PipeLineLems.EntityFrameworkCore.Extensions;
+using CmsQueryExtensions.Extension;
+using Microsoft.EntityFrameworkCore;
+using System.Linq.Dynamic.Core;
+using System.Linq.Expressions;
+using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+
+namespace CMS.Plugin.PipeLineLems.EntityFrameworkCore.Repositories;
+
/// <summary>
/// 浣滀笟璁″垝琛ㄤ粨鍌ㄥ疄鐜�
/// </summary>
-public class EfCoreWorkPlanRepository : EfCoreRepository<ICMSPluginDbContext, WorkPlan, Guid>, IWorkPlanRepository
-{
+public class EfCoreWorkPlanRepository : EfCoreRepository<ICMSPluginDbContext, WorkPlan, Guid>, IWorkPlanRepository
+{
/// <summary>
/// Initializes a new instance of the <see cref="EfCoreWorkPlanRepository"/> class.
/// </summary>
/// <param name="dbContextProvider">The database context provider.</param>
- public EfCoreWorkPlanRepository(IDbContextProvider<ICMSPluginDbContext> dbContextProvider)
- : base(dbContextProvider)
- {
- }
-
+ public EfCoreWorkPlanRepository(IDbContextProvider<ICMSPluginDbContext> dbContextProvider)
+ : base(dbContextProvider)
+ {
+ }
+
/// <summary>
/// 鎸夌収鍚嶇О鏌ユ壘浣滀笟璁″垝琛�
/// </summary>
/// <param name="name"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
- public virtual async Task<WorkPlan> FindByNameAsync(string name, CancellationToken cancellationToken = default)
- {
- return await (await GetDbSetAsync())
- .IncludeDetails()
- .Where(x => !x.IsDeleted)
- .OrderByDescending(x=>x.CreationTime)
- .FirstOrDefaultAsync(t => t.TaskCode == name, GetCancellationToken(cancellationToken));
- }
-
+ public virtual async Task<WorkPlan> FindByNameAsync(string name, CancellationToken cancellationToken = default)
+ {
+ return await (await GetDbSetAsync())
+ .IncludeDetails()
+ .Where(x => !x.IsDeleted)
+ .OrderByDescending(x => x.CreationTime)
+ .FirstOrDefaultAsync(t => t.TaskCode == name, GetCancellationToken(cancellationToken));
+ }
+
+
+ /// <summary>
+ /// 鎸夌収 鍘熸枡鏍囪 鏌ユ壘浣滀笟璁″垝琛�
+ /// </summary>
+ /// <param name="name"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public virtual async Task<List<WorkPlan>> FindByDataIdentifierAsync(string dataIdentifier, CancellationToken cancellationToken = default)
+ {
+ return await (await GetDbSetAsync())
+ .IncludeDetails()
+ .Where(x => !x.IsDeleted)
+ .Where(t => t.DataIdentifier == dataIdentifier)
+ .OrderByDescending(x => x.CreationTime)
+ .ToListAsync(GetCancellationToken(cancellationToken));
+ }
+
/// <summary>
/// 楠岃瘉鍚嶇О鏄惁瀛樺湪浣滀笟璁″垝琛�
/// </summary>
/// <param name="name">鏍￠獙鍊�</param>
/// <param name="id"></param>
/// <returns></returns>
- public async Task<bool> NameExistAsync(string name, Guid? id = null)
- {
- return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id).Where(x => !x.IsDeleted).AnyAsync(x => x.TaskCode == name);
- }
-
+ public async Task<bool> NameExistAsync(string name, Guid? id = null)
+ {
+ return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id).Where(x => !x.IsDeleted).AnyAsync(x => x.TaskCode == name);
+ }
+
/// <summary>
/// 鑾峰彇鏈�澶ф帓搴忎綔涓氳鍒掕〃
/// </summary>
/// <returns></returns>
- public async Task<int> GetMaxSortAsync()
- {
- var hasAny = await (await GetQueryableAsync())
- .Where(x => !x.IsDeleted).AnyAsync();
- if (!hasAny)
- {
- return 1;
- }
-
- var sort = await (await GetQueryableAsync())
- .Where(x => !x.IsDeleted).MaxAsync(x => x.Sort);
- return sort + 1;
- }
-
+ public async Task<int> GetMaxSortAsync()
+ {
+ var hasAny = await (await GetQueryableAsync())
+ .Where(x => !x.IsDeleted).AnyAsync();
+ if (!hasAny)
+ {
+ return 1;
+ }
+
+ var sort = await (await GetQueryableAsync())
+ .Where(x => !x.IsDeleted).MaxAsync(x => x.Sort);
+ return sort + 1;
+ }
+
/// <summary>
/// 鑾峰彇鍒嗛〉鍒楄〃浣滀笟璁″垝琛�
/// </summary>
@@ -78,36 +95,36 @@
/// <param name="includeDetails"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
- public async Task<List<WorkPlan>> GetListAsync(FunReturnResultModel<Expression<Func<WorkPlan, bool>>> whereConditions, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, bool includeDetails = false, CancellationToken cancellationToken = default)
- {
- return await (await GetDbSetAsync())
- .IncludeDetails(includeDetails)
- .WhereIf(whereConditions != null, whereConditions.data)
- .Where(x => !x.IsDeleted)
- .OrderByDescending(x=>x.CreationTime)
- .PageBy(skipCount, maxResultCount)
- .ToListAsync(GetCancellationToken(cancellationToken));
- }
-
+ public async Task<List<WorkPlan>> GetListAsync(FunReturnResultModel<Expression<Func<WorkPlan, bool>>> whereConditions, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, bool includeDetails = false, CancellationToken cancellationToken = default)
+ {
+ return await (await GetDbSetAsync())
+ .IncludeDetails(includeDetails)
+ .WhereIf(whereConditions != null, whereConditions.data)
+ .Where(x => !x.IsDeleted)
+ .OrderByDescending(x => x.CreationTime)
+ .PageBy(skipCount, maxResultCount)
+ .ToListAsync(GetCancellationToken(cancellationToken));
+ }
+
/// <summary>
/// 鑾峰彇鎬绘暟浣滀笟璁″垝琛�
/// </summary>
/// <param name="whereConditions"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
- public async Task<long> GetCountAsync(FunReturnResultModel<Expression<Func<WorkPlan, bool>>> whereConditions, CancellationToken cancellationToken = default)
- {
- return await (await GetQueryableAsync())
- .WhereIf(whereConditions != null, whereConditions.data)
- .Where(x => !x.IsDeleted)
- .CountAsync(cancellationToken: GetCancellationToken(cancellationToken));
- }
-
-
+ public async Task<long> GetCountAsync(FunReturnResultModel<Expression<Func<WorkPlan, bool>>> whereConditions, CancellationToken cancellationToken = default)
+ {
+ return await (await GetQueryableAsync())
+ .WhereIf(whereConditions != null, whereConditions.data)
+ .Where(x => !x.IsDeleted)
+ .CountAsync(cancellationToken: GetCancellationToken(cancellationToken));
+ }
+
+
/// <inheritdoc />
- public override async Task<IQueryable<WorkPlan>> WithDetailsAsync()
- {
- return (await GetQueryableAsync())
- .Where(x => !x.IsDeleted).IncludeDetails();
- }
-}
+ public override async Task<IQueryable<WorkPlan>> WithDetailsAsync()
+ {
+ return (await GetQueryableAsync())
+ .Where(x => !x.IsDeleted).IncludeDetails();
+ }
+}
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderController.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderController.cs
index 7d66f61..afdd362 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderController.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/CallMaterialOrderController.cs
@@ -44,8 +44,15 @@
public virtual Task<CallMaterialOrderDto> GetAsync(Guid id)
{
return _callMaterialOrderAppService.GetAsync(id);
- }
-
+ }
+
+ [HttpPut]
+ [Route("CallMaterialByDataIdentifier/{id}")]
+ public virtual Task CallMaterialByDataIdentifier(Guid id)
+ {
+ return _callMaterialOrderAppService.CallMaterialByDataIdentifier(id);
+ }
+
/// <summary>
/// 鍒嗛〉鑾峰彇鍙枡鍗曡〃鐨勫垪琛�.
/// </summary>
--
Gitblit v1.9.3