From 9d23331a1bdb4b4d38216d61cd9707ef13f30aa4 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周四, 15 5月 2025 14:59:44 +0800
Subject: [PATCH] 修改物料类型
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/CMS.Plugin.HIAWms.Application.Contracts.csproj | 1
HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialTypeAutoMapperProfile.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialTypeRepository.cs | 27 +
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterialType/WmsMaterialType.cs | 14
HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs | 10
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialTypeAppService.cs | 615 +++++++++++++++++++++----------------------
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsMaterialTypeAppService.cs | 87 +++---
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs | 40 ++
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterialType.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsEnumAppService.cs | 6
HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialTypeController.cs | 4
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/CommonDto/MaterialTypeOutput.cs | 10
Weben_CMS专用代码生成器/Code/Templete/Controller模板.txt | 4
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterialType/IWmsMaterialTypeRepository.cs | 12
14 files changed, 451 insertions(+), 383 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/CMS.Plugin.HIAWms.Application.Contracts.csproj b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/CMS.Plugin.HIAWms.Application.Contracts.csproj
index 4b0028e..53f2dee 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/CMS.Plugin.HIAWms.Application.Contracts.csproj
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/CMS.Plugin.HIAWms.Application.Contracts.csproj
@@ -16,6 +16,7 @@
<ItemGroup>
<ProjectReference Include="..\CMS.Plugin.HIAWms.Domain.Shared\CMS.Plugin.HIAWms.Domain.Shared.csproj" />
+ <ProjectReference Include="..\CMS.Plugin.HIAWms.Domain\CMS.Plugin.HIAWms.Domain.csproj" />
</ItemGroup>
<ItemGroup>
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MaterialType/WmsMaterialType.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/CommonDto/MaterialTypeOutput.cs
similarity index 65%
rename from HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MaterialType/WmsMaterialType.cs
rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/CommonDto/MaterialTypeOutput.cs
index 50f49c3..437c7f6 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MaterialType/WmsMaterialType.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/CommonDto/MaterialTypeOutput.cs
@@ -1,13 +1,15 @@
-锘縰sing CMS.Plugin.MyExtension.Domain;
-using System;
+锘縰sing System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace CMS.Plugin.HIAWms.Domain.MaterialType
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.CommonDto
{
- public class WmsMaterialType : MyFullAuditedAggregateRoot<Guid>
+ /// <summary>
+ /// 鐗╂枡绫诲瀷閫夋嫨绫�
+ /// </summary>
+ public class MaterialTypeOutput
{
/// <summary>
/// 绫诲瀷鎻忚堪
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsEnumAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsEnumAppService.cs
index 5878c0b..7145962 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsEnumAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsEnumAppService.cs
@@ -50,5 +50,11 @@
/// <param name="placeType"></param>
/// <returns></returns>
Task<List<PlaceListOutput>> GetPlaceListForSelectAsync(PlaceTypeEnum placeType);
+
+ /// <summary>
+ /// 鑾峰彇鐗╂枡绫诲瀷
+ /// </summary>
+ /// <returns></returns>
+ Task<List<MaterialTypeOutput>> GetMaterialTypeListAsync();
}
}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsMaterialTypeAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsMaterialTypeAppService.cs
index 7e40c10..714ea71 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsMaterialTypeAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsMaterialTypeAppService.cs
@@ -1,85 +1,84 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialType;
-using Volo.Abp.Application.Services;
-using CmsQueryExtensions.Entitys;
-using System.Linq.Expressions;
-using CMS.Plugin.HIAWms.Domain.WmsMaterialType;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Services;
-
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos;
+using Volo.Abp.Application.Services;
+using CmsQueryExtensions.Entitys;
+using System.Linq.Expressions;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialType;
+using CMS.Plugin.HIAWms.Domain.WmsMaterialTypes;
+
+namespace CMS.Plugin.HIAWms.Application.Contracts.Services;
+
/// <summary>
/// 鐗╂枡l绫诲瀷淇℃伅搴旂敤鏈嶅姟鎺ュ彛
/// </summary>
-public interface IWmsMaterialTypeAppService : ICrudAppService<WmsMaterialTypeDto, Guid, GetWmsMaterialTypeInput, WmsMaterialTypeCreateDto, WmsMaterialTypeUpdateDto>
-{
+public interface IWmsMaterialTypeAppService : ICrudAppService<WmsMaterialTypeDto, Guid, GetWmsMaterialTypeInput, WmsMaterialTypeCreateDto, WmsMaterialTypeUpdateDto>
+{
/// <summary>
/// 鍏嬮殕鐗╂枡l绫诲瀷淇℃伅
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
- Task<List<WmsMaterialTypeDto>> CloneAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser);
-
+ Task<List<WmsMaterialTypeDto>> CloneAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser);
+
/// <summary>
/// 鍒犻櫎鐗╂枡l绫诲瀷淇℃伅
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
- Task DeleteManyAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser);
-
+ Task DeleteManyAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser);
+
/// <summary>
/// 鐗╃悊鍒犻櫎鐗╂枡l绫诲瀷淇℃伅
/// </summary>
/// <param name="id">涓婚敭ID</param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
- Task DeletePermanentlyAsync(Guid id, MyCurrentUser myCurrentUser, CancellationToken cancellationToken = default);
-
-
+ Task DeletePermanentlyAsync(Guid id, MyCurrentUser myCurrentUser, CancellationToken cancellationToken = default);
+
+
/// <summary>
/// 鎵归噺鐗╃悊鍒犻櫎鐗╂枡l绫诲瀷淇℃伅锛堢洿鎺ュ垹闄わ紝涓嶈蒋鍒犻櫎锛�
/// </summary>
/// <param name="ids">瑕佸垹闄ょ殑涓婚敭ID鍒楄〃</param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
- Task BatchDeletePermanentlyAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser, CancellationToken cancellationToken = default);
-
+ Task BatchDeletePermanentlyAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser, CancellationToken cancellationToken = default);
+
/// <summary>
/// 璋冩暣鎺掑簭鐗╂枡l绫诲瀷淇℃伅
/// </summary>
/// <param name="id"></param>
/// <param name="sort"></param>
/// <returns></returns>
- Task AdjustSortAsync(Guid id, int sort);
-
+ Task AdjustSortAsync(Guid id, int sort);
+
/// <summary>
/// 瀵煎叆鐗╂枡l绫诲瀷淇℃伅
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- Task ImportAsync(WmsMaterialTypesImportModel input, MyCurrentUser myCurrentUser);
-
+ Task ImportAsync(WmsMaterialTypesImportModel input, MyCurrentUser myCurrentUser);
+
/// <summary>
/// 瀵煎嚭鐗╂枡l绫诲瀷淇℃伅
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialTypeInput input);
-
- /// <summary>
- /// 鏍规嵁鏉′欢鑾峰彇鐗╂枡l绫诲瀷淇℃伅鍒楄〃
- /// </summary>
- /// <param name="whereConditions"></param>
- /// <param name="cancellationToken"></param>
- /// <returns></returns>
- Task<List<WmsMaterialType>> GetListByFilterAsync(Expression<Func<WmsMaterialType, bool>> whereConditions, CancellationToken cancellationToken = default);
-
-
- /// <summary>
- /// 鏍规嵁鏉′欢鑾峰彇鍗曚釜鐗╂枡l绫诲瀷淇℃伅
- /// </summary>
- /// <param name="whereConditions"></param>
- /// <param name="isMultipleThrowException">鏄惁鏌ヨ鍑哄鏉″氨鎶ラ敊</param>
- /// <param name="cancellationToken"></param>
- /// <returns></returns>
- /// <exception cref="UserFriendlyException"></exception>
- Task<WmsMaterialType> GetSingleByFilterAsync(Expression<Func<WmsMaterialType, bool>> whereConditions, bool is鈥婱ultipleThrowException = false, CancellationToken cancellationToken = default);
-}
+ Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialTypeInput input);
+
+ /// <summary>
+ /// 鏍规嵁鏉′欢鑾峰彇鐗╂枡l绫诲瀷淇℃伅鍒楄〃
+ /// </summary>
+ /// <param name="whereConditions"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ Task<List<WmsMaterialType>> GetListByFilterAsync(Expression<Func<WmsMaterialType, bool>> whereConditions, CancellationToken cancellationToken = default);
+
+ /// <summary>
+ /// 鏍规嵁鏉′欢鑾峰彇鍗曚釜鐗╂枡l绫诲瀷淇℃伅
+ /// </summary>
+ /// <param name="whereConditions"></param>
+ /// <param name="isMultipleThrowException"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ Task<WmsMaterialType> GetSingleByFilterAsync(Expression<Func<WmsMaterialType, bool>> whereConditions, bool is鈥婱ultipleThrowException = false, CancellationToken cancellationToken = default);
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs
index 2e8431a..5bb3deb 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs
@@ -1,18 +1,23 @@
锘縰sing CMS.Plugin.HIAWms.Application.Contracts.Dtos.CommonDto;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialType;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CMS.Plugin.HIAWms.Domain.WmsAreas;
using CMS.Plugin.HIAWms.Domain.WmsMaterials;
+using CMS.Plugin.HIAWms.Domain.WmsMaterialTypes;
using CMS.Plugin.HIAWms.Domain.WmsPlaces;
using CMS.Plugin.HIAWms.Domain.WmsStores;
using CmsQueryExtensions;
+using CmsQueryExtensions.Extension;
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Linq.Expressions;
using System.Text;
using System.Threading.Tasks;
+using CMS.Plugin.HIAWms.Domain.WmsMaterialTypes;
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea.WmsAreaCreateOrUpdateDtoBase;
using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace.WmsPlaceCreateOrUpdateDtoBase;
@@ -27,13 +32,15 @@
private readonly IWmsAreaRepository _wmsAreaRepository;
private readonly IWmsPlaceRepository _wmsPlaceRepository;
private readonly IWmsMaterialRepository _wmsMaterialRepository;
+ private readonly IWmsMaterialTypeRepository _WmsMaterialTypeRepository;
- public WmsEnumAppService(IWmsStoreRepository storeRepository, IWmsAreaRepository wmsAreaRepository, IWmsPlaceRepository wmsPlaceRepository, IWmsMaterialRepository wmsMaterialRepository)
+ public WmsEnumAppService(IWmsStoreRepository storeRepository, IWmsAreaRepository wmsAreaRepository, IWmsPlaceRepository wmsPlaceRepository, IWmsMaterialRepository wmsMaterialRepository, IWmsMaterialTypeRepository wmsMaterialTypeRepository)
{
_storeRepository = storeRepository;
_wmsAreaRepository = wmsAreaRepository;
_wmsPlaceRepository = wmsPlaceRepository;
_wmsMaterialRepository = wmsMaterialRepository;
+ _WmsMaterialTypeRepository = wmsMaterialTypeRepository;
}
public List<EnumItem> GetEnumDataList(WmsEnumInput enumInput)
@@ -126,5 +133,36 @@
PlaceNoDesc = place.PlaceNo
}).ToList();
}
+
+ /// <summary>
+ /// 鑾峰彇绫诲瀷鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public async Task<List<MaterialTypeOutput>> GetMaterialTypeListAsync()
+ {
+ var queryInput = new GetWmsMaterialTypeInput();
+ var whereConditions = DynamicGetQueryParams(queryInput);
+ var list = await _WmsMaterialTypeRepository.GetListAsync(whereConditions);
+
+ return ObjectMapper.Map<List<WmsMaterialType>, List<MaterialTypeOutput>>(list);
+ }
+
+ private FunReturnResultModel<Expression<Func<WmsMaterialType, bool>>> DynamicGetQueryParams(GetWmsMaterialTypeInput input)
+ {
+ //鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
+ var whereConditions = WhereConditionsExtensions.GetWhereConditions<WmsMaterialType, GetWmsMaterialTypeInput>(input);
+ if (!whereConditions.IsSuccess)
+ {
+ throw new Exception("鍔ㄦ�佹瀯閫犳煡璇㈡潯浠跺け璐�:" + whereConditions.ErrMsg);
+ }
+
+ //涔熷彲鍐嶆鑷畾涔夋瀯寤烘煡璇㈡潯浠�
+ Expression<Func<WmsMaterialType, bool>> extendExpression = a => a.IsDeleted == false;
+ // 浣跨敤 System.Linq.PredicateBuilder 鐨� And
+ var pres = (System.Linq.Expressions.Expression<Func<WmsMaterialType, bool>>)(whereConditions.data);
+ whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression);
+
+ return whereConditions;
+ }
}
}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialTypeAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialTypeAppService.cs
index 9813bf7..23ffe2a 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialTypeAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialTypeAppService.cs
@@ -1,129 +1,128 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialType;
-using CMS.Plugin.HIAWms.Application.Contracts.Services;
-using CMS.Plugin.HIAWms.Domain.Shared;
-using CmsQueryExtensions;
-using CMS.Plugin.HIAWms.Domain.WmsMaterialType;
-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;
-using CmsQueryExtensions.Entitys;
-
-namespace CMS.Plugin.HIAWms.Application.Implements;
-
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialType;
+using CMS.Plugin.HIAWms.Application.Contracts.Services;
+using CMS.Plugin.HIAWms.Domain.Shared;
+using CmsQueryExtensions;
+using CmsQueryExtensions.Extension;
+using System.Linq.Expressions;
+using Volo.Abp;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Data;
+using Volo.Abp.ObjectExtending;
+using CmsQueryExtensions.Entitys;
+using CMS.Plugin.HIAWms.Domain.WmsMaterialTypes;
+
+namespace CMS.Plugin.HIAWms.Application.Implements;
+
/// <summary>
/// 鐗╂枡l绫诲瀷淇℃伅搴旂敤鏈嶅姟
/// </summary>
-public class WmsMaterialTypeAppService : CMSPluginAppService, IWmsMaterialTypeAppService
-{
- private readonly IWmsMaterialTypeRepository _WmsMaterialTypeRepository;
-
+public class WmsMaterialTypeAppService : CMSPluginAppService, IWmsMaterialTypeAppService
+{
+ private readonly IWmsMaterialTypeRepository _WmsMaterialTypeRepository;
+
/// <summary>
/// Initializes a new instance of the <see cref="WmsMaterialTypeAppService"/> class.
/// </summary>
/// <param name="WmsMaterialTypeRepository">The task job repository.</param>
- public WmsMaterialTypeAppService(IWmsMaterialTypeRepository WmsMaterialTypeRepository)
- {
- _WmsMaterialTypeRepository = WmsMaterialTypeRepository;
- }
-
+ public WmsMaterialTypeAppService(IWmsMaterialTypeRepository WmsMaterialTypeRepository)
+ {
+ _WmsMaterialTypeRepository = WmsMaterialTypeRepository;
+ }
+
/// <summary>
/// 鑾峰彇鎸囧畾鐗╂枡l绫诲瀷淇℃伅
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public virtual async Task<WmsMaterialTypeDto> GetAsync(Guid id)
- {
- return ObjectMapper.Map<WmsMaterialType, WmsMaterialTypeDto>(await _WmsMaterialTypeRepository.GetAsync(id));
- }
-
+ public virtual async Task<WmsMaterialTypeDto> GetAsync(Guid id)
+ {
+ return ObjectMapper.Map<WmsMaterialType, WmsMaterialTypeDto>(await _WmsMaterialTypeRepository.GetAsync(id));
+ }
+
/// <summary>
/// 鍒嗛〉鑾峰彇鐗╂枡l绫诲瀷淇℃伅
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public virtual async Task<PagedResultDto<WmsMaterialTypeDto>> GetListAsync(GetWmsMaterialTypeInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WmsMaterialType.Sort);
- }
-
+ public virtual async Task<PagedResultDto<WmsMaterialTypeDto>> GetListAsync(GetWmsMaterialTypeInput input)
+ {
+ Check.NotNull(input, nameof(input));
+
+ if (input.Sorting.IsNullOrWhiteSpace())
+ {
+ input.Sorting = nameof(WmsMaterialType.Sort);
+ }
+
#region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
-
+
//鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = DynamicGetQueryParams(input);
-
- #endregion
-
- var count = await _WmsMaterialTypeRepository.GetCountAsync(whereConditions);
- var list = await _WmsMaterialTypeRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
-
- return new PagedResultDto<WmsMaterialTypeDto>(count, ObjectMapper.Map<List<WmsMaterialType>, List<WmsMaterialTypeDto>>(list));
- }
-
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+ var count = await _WmsMaterialTypeRepository.GetCountAsync(whereConditions);
+ var list = await _WmsMaterialTypeRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
+
+ return new PagedResultDto<WmsMaterialTypeDto>(count, ObjectMapper.Map<List<WmsMaterialType>, List<WmsMaterialTypeDto>>(list));
+ }
+
/// <summary>
/// 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
/// </summary>
/// <param name="input">杈撳叆鍙傛暟</param>
/// <returns></returns>
- private FunReturnResultModel<Expression<Func<WmsMaterialType, bool>>> DynamicGetQueryParams(GetWmsMaterialTypeInput input)
- {
+ private FunReturnResultModel<Expression<Func<WmsMaterialType, bool>>> DynamicGetQueryParams(GetWmsMaterialTypeInput input)
+ {
//鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = WhereConditionsExtensions.GetWhereConditions<WmsMaterialType, GetWmsMaterialTypeInput>(input);
- if (!whereConditions.IsSuccess)
- {
- throw new Exception("鍔ㄦ�佹瀯閫犳煡璇㈡潯浠跺け璐�:" + whereConditions.ErrMsg);
- }
-
+ var whereConditions = WhereConditionsExtensions.GetWhereConditions<WmsMaterialType, GetWmsMaterialTypeInput>(input);
+ if (!whereConditions.IsSuccess)
+ {
+ throw new Exception("鍔ㄦ�佹瀯閫犳煡璇㈡潯浠跺け璐�:" + whereConditions.ErrMsg);
+ }
+
//涔熷彲鍐嶆鑷畾涔夋瀯寤烘煡璇㈡潯浠�
- Expression<Func<WmsMaterialType, bool>> extendExpression = a => a.IsDeleted == false;
+ Expression<Func<WmsMaterialType, bool>> extendExpression = a => a.IsDeleted == false;
// 浣跨敤 System.Linq.PredicateBuilder 鐨� And
- var pres = (System.Linq.Expressions.Expression<Func<WmsMaterialType, bool>>)(whereConditions.data);
- whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression);
-
- return whereConditions;
- }
-
+ var pres = (System.Linq.Expressions.Expression<Func<WmsMaterialType, bool>>)(whereConditions.data);
+ whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression);
+
+ return whereConditions;
+ }
+
/// <summary>
/// 鏂板缓鐗╂枡l绫诲瀷淇℃伅
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public virtual async Task<WmsMaterialTypeDto> CreateAsync(WmsMaterialTypeCreateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var exist = await _WmsMaterialTypeRepository.NameExistAsync(input.MaterialTypeCode);
- if (exist)
- {
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialTypeCode]);
- }
-
- var maxSort = await _WmsMaterialTypeRepository.GetMaxSortAsync();
- var sort = input.Sort ?? maxSort;
-
- var insertObj = ObjectMapper.Map<WmsMaterialTypeCreateDto, WmsMaterialType>(input);
- insertObj.Sort = sort;
- input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None);
-
+ public virtual async Task<WmsMaterialTypeDto> CreateAsync(WmsMaterialTypeCreateDto input)
+ {
+ await CheckCreateOrUpdateDtoAsync(input);
+
+ var exist = await _WmsMaterialTypeRepository.NameExistAsync(input.MaterialTypeCode);
+ if (exist)
+ {
+ throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialTypeCode]);
+ }
+
+ var maxSort = await _WmsMaterialTypeRepository.GetMaxSortAsync();
+ var sort = input.Sort ?? maxSort;
+
+ var insertObj = ObjectMapper.Map<WmsMaterialTypeCreateDto, WmsMaterialType>(input);
+ insertObj.Sort = sort;
+ input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None);
+
insertObj.CreatorName = input.CreatorName;//鍒涘缓浜�
- await _WmsMaterialTypeRepository.InsertAsync(insertObj);
-
+ await _WmsMaterialTypeRepository.InsertAsync(insertObj);
+
//if (input.Sort.HasValue && insertObj.Sort != maxSort)
//{
// await AdjustSortAsync(insertObj.Id, insertObj.Sort);
//}
-
- return ObjectMapper.Map<WmsMaterialType, WmsMaterialTypeDto>(insertObj);
- }
-
+
+ return ObjectMapper.Map<WmsMaterialType, WmsMaterialTypeDto>(insertObj);
+ }
+
/// <summary>
/// 鏇存柊鐗╂枡l绫诲瀷淇℃伅
/// </summary>
@@ -131,39 +130,39 @@
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public virtual async Task<WmsMaterialTypeDto> UpdateAsync(Guid id, WmsMaterialTypeUpdateDto input)
- {
- await CheckCreateOrUpdateDtoAsync(input);
-
- var updateObj = await _WmsMaterialTypeRepository.GetAsync(id);
- var exist = await _WmsMaterialTypeRepository.NameExistAsync(input.MaterialTypeCode, updateObj.Id);
- if (exist)
- {
- throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialTypeCode]);
- }
-
- updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
- input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
-
- updateObj.MaterialTypeDesc = input.MaterialTypeDesc;
+ public virtual async Task<WmsMaterialTypeDto> UpdateAsync(Guid id, WmsMaterialTypeUpdateDto input)
+ {
+ await CheckCreateOrUpdateDtoAsync(input);
+
+ var updateObj = await _WmsMaterialTypeRepository.GetAsync(id);
+ var exist = await _WmsMaterialTypeRepository.NameExistAsync(input.MaterialTypeCode, updateObj.Id);
+ if (exist)
+ {
+ throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialTypeCode]);
+ }
+
+ updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
+ input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
+
+ updateObj.MaterialTypeDesc = input.MaterialTypeDesc;
updateObj.MaterialTypeCode = input.MaterialTypeCode;
updateObj.Remark = input.Remark;
-
-
+
+
updateObj.LastModifierName = input.LastModifierName;//淇敼浜�
-
- await _WmsMaterialTypeRepository.UpdateAsync(updateObj);
-
- return ObjectMapper.Map<WmsMaterialType, WmsMaterialTypeDto>(updateObj);
- }
-
+
+ await _WmsMaterialTypeRepository.UpdateAsync(updateObj);
+
+ return ObjectMapper.Map<WmsMaterialType, WmsMaterialTypeDto>(updateObj);
+ }
+
/// <summary>
/// 鍏嬮殕鐗╂枡l绫诲瀷淇℃伅
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
- public async Task<List<WmsMaterialTypeDto>> CloneAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser)
- {
+ public async Task<List<WmsMaterialTypeDto>> CloneAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser)
+ {
//var WmsMaterialTypes = new List<WmsMaterialType>();
//if (ids != null)
//{
@@ -183,263 +182,263 @@
// name += WmsMaterialTypeConsts.CloneTag;
// continue;
// }
-
+
// notExist = true;
// }
-
+
// //WmsMaterialType = await _WmsMaterialTypeRepository.InsertAsync(WmsMaterialType.Clone(GuidGenerator.Create(), name, sort++));
// WmsMaterialTypes.Add(WmsMaterialType);
// }
// }
//}
-
+
//return ObjectMapper.Map<List<WmsMaterialType>, List<WmsMaterialTypeDto>>(WmsMaterialTypes);
- return new List<WmsMaterialTypeDto>();
- }
-
+ return new List<WmsMaterialTypeDto>();
+ }
+
/// <summary>
/// 鍒犻櫎鍗曚釜鐗╂枡l绫诲瀷淇℃伅
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public virtual Task DeleteAsync(Guid id)
- {
- return _WmsMaterialTypeRepository.DeleteAsync(id);
- }
-
+ public virtual Task DeleteAsync(Guid id)
+ {
+ return _WmsMaterialTypeRepository.DeleteAsync(id);
+ }
+
/// <summary>
/// 鍒犻櫎澶氫釜鐗╂枡l绫诲瀷淇℃伅
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
- public async Task DeleteManyAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser)
- {
- foreach (var id in ids)
- {
- await DeleteAsync(id);
- }
- }
-
- /// <summary>
+ public async Task DeleteManyAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser)
+ {
+ foreach (var id in ids)
+ {
+ await DeleteAsync(id);
+ }
+ }
+
+ /// <summary>
/// 鐗╃悊鍒犻櫎鐗╂枡l绫诲瀷淇℃伅
/// </summary>
/// <param name="id">涓婚敭ID</param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
- public virtual async Task DeletePermanentlyAsync(Guid id, MyCurrentUser myCurrentUser, CancellationToken cancellationToken = default)
- {
- _WmsMaterialTypeRepository.DeletePermanentlyAsync(id);
- }
-
+ public virtual async Task DeletePermanentlyAsync(Guid id, MyCurrentUser myCurrentUser, CancellationToken cancellationToken = default)
+ {
+ _WmsMaterialTypeRepository.DeletePermanentlyAsync(id);
+ }
+
/// <summary>
/// 鎵归噺鐗╃悊鍒犻櫎鐗╂枡l绫诲瀷淇℃伅锛堢洿鎺ュ垹闄わ紝涓嶈蒋鍒犻櫎锛�
/// </summary>
/// <param name="ids">瑕佸垹闄ょ殑涓婚敭ID鍒楄〃</param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
- public virtual async Task BatchDeletePermanentlyAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser, CancellationToken cancellationToken = default)
- {
- _WmsMaterialTypeRepository.BatchDeletePermanentlyAsync(ids);
- }
-
+ public virtual async Task BatchDeletePermanentlyAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser, CancellationToken cancellationToken = default)
+ {
+ _WmsMaterialTypeRepository.BatchDeletePermanentlyAsync(ids);
+ }
+
/// <summary>
/// 璋冩暣鎺掑簭鐗╂枡l绫诲瀷淇℃伅
/// </summary>
/// <param name="id"></param>
/// <param name="sort"></param>
/// <returns></returns>
- public virtual async Task AdjustSortAsync(Guid id, int sort)
- {
- var list = await _WmsMaterialTypeRepository.GetListAsync(null, nameof(WmsMaterialType.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 _WmsMaterialTypeRepository.UpdateManyAsync(list);
- }
-
+ public virtual async Task AdjustSortAsync(Guid id, int sort)
+ {
+ var list = await _WmsMaterialTypeRepository.GetListAsync(null, nameof(WmsMaterialType.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 _WmsMaterialTypeRepository.UpdateManyAsync(list);
+ }
+
/// <summary>
/// 瀵煎叆鐗╂枡l绫诲瀷淇℃伅
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public async Task ImportAsync(WmsMaterialTypesImportModel input, MyCurrentUser myCurrentUser)
- {
- Check.NotNull(input, nameof(input));
-
- var WmsMaterialTypeCreateDtos = new List<(int RowIndex, WmsMaterialTypeCreateDto Item)>();
- var WmsMaterialTypeUpdateDtos = new List<(int RowIndex, Guid Id, WmsMaterialTypeUpdateDto Item)>();
- var importItems = input.WmsMaterialTypes;
-
- if (importItems != null && importItems.Any())
- {
+ public async Task ImportAsync(WmsMaterialTypesImportModel input, MyCurrentUser myCurrentUser)
+ {
+ Check.NotNull(input, nameof(input));
+
+ var WmsMaterialTypeCreateDtos = new List<(int RowIndex, WmsMaterialTypeCreateDto Item)>();
+ var WmsMaterialTypeUpdateDtos = new List<(int RowIndex, Guid Id, WmsMaterialTypeUpdateDto Item)>();
+ var importItems = input.WmsMaterialTypes;
+
+ if (importItems != null && importItems.Any())
+ {
#region 瀵煎叆鏍￠獙
-
+
// 鍒ゆ柇鍚嶇О鏄惁閲嶅锛屽苟杈撳嚭绗嚑琛岄噸澶�
- var duplicateWmsMaterialTypes = importItems.GroupBy(x => x.MaterialTypeCode).Where(x => x.Count() > 1).ToList();
- if (duplicateWmsMaterialTypes?.Any() == true)
- {
- var duplicateWmsMaterialTypeMsgs = duplicateWmsMaterialTypes.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝 {string.Join(",", duplicateWmsMaterialTypeMsgs)}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
-
- #endregion
-
- foreach (var impItem in importItems)
- {
- if (impItem.MaterialTypeCode.IsNullOrWhiteSpace())
- {
- continue;
- }
-
- if (impItem.MaterialTypeCode.IsNullOrWhiteSpace())
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊impItem.RowIndex}琛岋細WmsMaterialType鍚嶇О涓嶈兘涓虹┖";
- throw new UserFriendlyException(errorMsg);
- }
-
- var oldWmsMaterialType = await _WmsMaterialTypeRepository.FindByNameAsync(impItem.MaterialTypeCode);
- if (oldWmsMaterialType != null)
- {
- var WmsMaterialTypeUpdateDto = new WmsMaterialTypeUpdateDto
- {
+ var duplicateWmsMaterialTypes = importItems.GroupBy(x => x.MaterialTypeCode).Where(x => x.Count() > 1).ToList();
+ if (duplicateWmsMaterialTypes?.Any() == true)
+ {
+ var duplicateWmsMaterialTypeMsgs = duplicateWmsMaterialTypes.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝 {string.Join(",", duplicateWmsMaterialTypeMsgs)}锛岀粓姝㈠鍏�";
+ throw new UserFriendlyException(errorMsg);
+ }
+
+ #endregion
+
+ foreach (var impItem in importItems)
+ {
+ if (impItem.MaterialTypeCode.IsNullOrWhiteSpace())
+ {
+ continue;
+ }
+
+ if (impItem.MaterialTypeCode.IsNullOrWhiteSpace())
+ {
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊impItem.RowIndex}琛岋細WmsMaterialType鍚嶇О涓嶈兘涓虹┖";
+ throw new UserFriendlyException(errorMsg);
+ }
+
+ var oldWmsMaterialType = await _WmsMaterialTypeRepository.FindByNameAsync(impItem.MaterialTypeCode);
+ if (oldWmsMaterialType != null)
+ {
+ var WmsMaterialTypeUpdateDto = new WmsMaterialTypeUpdateDto
+ {
MaterialTypeDesc = impItem.MaterialTypeDesc,
-MaterialTypeCode = impItem.MaterialTypeCode,
-Remark = impItem.Remark,
-
- };
-
- WmsMaterialTypeUpdateDtos.Add((impItem.RowIndex, oldWmsMaterialType.Id, WmsMaterialTypeUpdateDto));
- }
- else
- {
- var WmsMaterialTypeCreateDto = new WmsMaterialTypeCreateDto
- {
+ MaterialTypeCode = impItem.MaterialTypeCode,
+ Remark = impItem.Remark,
+
+ };
+
+ WmsMaterialTypeUpdateDtos.Add((impItem.RowIndex, oldWmsMaterialType.Id, WmsMaterialTypeUpdateDto));
+ }
+ else
+ {
+ var WmsMaterialTypeCreateDto = new WmsMaterialTypeCreateDto
+ {
MaterialTypeDesc = impItem.MaterialTypeDesc,
-MaterialTypeCode = impItem.MaterialTypeCode,
-Remark = impItem.Remark,
-
- };
-
- WmsMaterialTypeCreateDtos.Add((impItem.RowIndex, WmsMaterialTypeCreateDto));
- }
- }
- }
-
+ MaterialTypeCode = impItem.MaterialTypeCode,
+ Remark = impItem.Remark,
+
+ };
+
+ WmsMaterialTypeCreateDtos.Add((impItem.RowIndex, WmsMaterialTypeCreateDto));
+ }
+ }
+ }
+
// 鏂板
- foreach (var WmsMaterialTypeDto in WmsMaterialTypeCreateDtos)
- {
- try
- {
+ foreach (var WmsMaterialTypeDto in WmsMaterialTypeCreateDtos)
+ {
+ try
+ {
WmsMaterialTypeDto.Item.CreatorName = myCurrentUser.UserAccount;//鍒涘缓浜�
- await CreateAsync(WmsMaterialTypeDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊WmsMaterialTypeDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
-
+ await CreateAsync(WmsMaterialTypeDto.Item);
+ }
+ catch (Exception e)
+ {
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊WmsMaterialTypeDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
+ throw new UserFriendlyException(errorMsg);
+ }
+ }
+
// 鏇存柊
- foreach (var WmsMaterialTypeDto in WmsMaterialTypeUpdateDtos)
- {
- try
- {
+ foreach (var WmsMaterialTypeDto in WmsMaterialTypeUpdateDtos)
+ {
+ try
+ {
WmsMaterialTypeDto.Item.LastModifierName = myCurrentUser.UserAccount;//淇敼浜�
- await UpdateAsync(WmsMaterialTypeDto.Id, WmsMaterialTypeDto.Item);
- }
- catch (Exception e)
- {
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊WmsMaterialTypeDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- throw new UserFriendlyException(errorMsg);
- }
- }
- }
-
+ await UpdateAsync(WmsMaterialTypeDto.Id, WmsMaterialTypeDto.Item);
+ }
+ catch (Exception e)
+ {
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊WmsMaterialTypeDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
+ throw new UserFriendlyException(errorMsg);
+ }
+ }
+ }
+
/// <summary>
/// 瀵煎嚭鐗╂枡l绫诲瀷淇℃伅
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialTypeInput input)
- {
- Check.NotNull(input, nameof(input));
-
- if (input.Sorting.IsNullOrWhiteSpace())
- {
- input.Sorting = nameof(WmsMaterialType.Sort);
- }
-
+ public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialTypeInput input)
+ {
+ Check.NotNull(input, nameof(input));
+
+ if (input.Sorting.IsNullOrWhiteSpace())
+ {
+ input.Sorting = nameof(WmsMaterialType.Sort);
+ }
+
#region 鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
-
+
//鍔ㄦ�佹瀯閫犳煡璇㈡潯浠�
- var whereConditions = DynamicGetQueryParams(input);
-
- #endregion
-
-
- var list = await _WmsMaterialTypeRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
- var result = ObjectMapper.Map<List<WmsMaterialType>, List<WmsMaterialTypeDto>>(list);
-
- var sheets = new Dictionary<string, object>
- {
- ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
- };
-
- var fileName = "鐗╂枡绫诲瀷";
- return (sheets, fileName);
- }
-
+ var whereConditions = DynamicGetQueryParams(input);
+
+ #endregion
+
+
+ var list = await _WmsMaterialTypeRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
+ var result = ObjectMapper.Map<List<WmsMaterialType>, List<WmsMaterialTypeDto>>(list);
+
+ var sheets = new Dictionary<string, object>
+ {
+ ["閰嶇疆"] = ExportHelper.ConvertListToExportData(result),
+ };
+
+ var fileName = "鐗╂枡绫诲瀷";
+ return (sheets, fileName);
+ }
+
/// <summary>
/// 鏍￠獙鐗╂枡l绫诲瀷淇℃伅锛屽綋鏂板缓鎴栨洿鏂版椂
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- protected Task CheckCreateOrUpdateDtoAsync(WmsMaterialTypeCreateOrUpdateDtoBase input)
- {
- Check.NotNull(input, nameof(input));
- Check.NotNullOrWhiteSpace(input.MaterialTypeDesc, "绫诲瀷鎻忚堪", 128);
+ protected Task CheckCreateOrUpdateDtoAsync(WmsMaterialTypeCreateOrUpdateDtoBase input)
+ {
+ Check.NotNull(input, nameof(input));
+ Check.NotNullOrWhiteSpace(input.MaterialTypeDesc, "绫诲瀷鎻忚堪", 128);
Check.NotNullOrWhiteSpace(input.MaterialTypeCode, "绫诲瀷缂栫爜", 64);
-
- return Task.CompletedTask;
- }
-
- /// <summary>
+
+ return Task.CompletedTask;
+ }
+
+ /// <summary>
/// 鏍规嵁鏉′欢鑾峰彇鐗╂枡l绫诲瀷淇℃伅鍒楄〃
/// </summary>
/// <param name="whereConditions"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
- public async Task<List<WmsMaterialType>> GetListByFilterAsync(Expression<Func<WmsMaterialType, bool>> whereConditions, CancellationToken cancellationToken = default)
- {
- return await _WmsMaterialTypeRepository.GetListByFilterAsync(whereConditions);
- }
-
+ public async Task<List<WmsMaterialType>> GetListByFilterAsync(Expression<Func<WmsMaterialType, bool>> whereConditions, CancellationToken cancellationToken = default)
+ {
+ return await _WmsMaterialTypeRepository.GetListByFilterAsync(whereConditions);
+ }
+
/// <summary>
/// 鏍规嵁鏉′欢鑾峰彇鍗曚釜鐗╂枡l绫诲瀷淇℃伅
/// </summary>
@@ -448,8 +447,8 @@
/// <param name="cancellationToken"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public async Task<WmsMaterialType> GetSingleByFilterAsync(Expression<Func<WmsMaterialType, bool>> whereConditions, bool is鈥婱ultipleThrowException = false, CancellationToken cancellationToken = default)
- {
- return await _WmsMaterialTypeRepository.GetSingleByFilterAsync(whereConditions, is鈥婱ultipleThrowException);
- }
-}
+ public async Task<WmsMaterialType> GetSingleByFilterAsync(Expression<Func<WmsMaterialType, bool>> whereConditions, bool is鈥婱ultipleThrowException = false, CancellationToken cancellationToken = default)
+ {
+ return await _WmsMaterialTypeRepository.GetSingleByFilterAsync(whereConditions, is鈥婱ultipleThrowException);
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialTypeAutoMapperProfile.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialTypeAutoMapperProfile.cs
index 21a9ea9..cf9d797 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialTypeAutoMapperProfile.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialTypeAutoMapperProfile.cs
@@ -1,6 +1,6 @@
using AutoMapper;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialType;
-using CMS.Plugin.HIAWms.Domain.WmsMaterialType;
+using CMS.Plugin.HIAWms.Domain.WmsMaterialTypes;
using Volo.Abp.ObjectExtending;
namespace CMS.Plugin.HIAWms.Application.MapperProfiles;
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterialType/IWmsMaterialTypeRepository.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterialType/IWmsMaterialTypeRepository.cs
index 808eb8e..b9155a5 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterialType/IWmsMaterialTypeRepository.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterialType/IWmsMaterialTypeRepository.cs
@@ -1,9 +1,9 @@
-using CmsQueryExtensions.Extension;
-using System.Linq.Expressions;
-using Volo.Abp.Domain.Repositories;
-
-namespace CMS.Plugin.HIAWms.Domain.WmsMaterialType;
-
+using CmsQueryExtensions.Extension;
+using System.Linq.Expressions;
+using Volo.Abp.Domain.Repositories;
+
+namespace CMS.Plugin.HIAWms.Domain.WmsMaterialTypes;
+
/// <summary>
/// 鐗╂枡l绫诲瀷淇℃伅浠撳偍
/// </summary>
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MaterialType/WmsMaterialType.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterialType/WmsMaterialType.cs
similarity index 60%
copy from HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MaterialType/WmsMaterialType.cs
copy to HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterialType/WmsMaterialType.cs
index 50f49c3..b6f6e25 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MaterialType/WmsMaterialType.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterialType/WmsMaterialType.cs
@@ -5,8 +5,11 @@
using System.Text;
using System.Threading.Tasks;
-namespace CMS.Plugin.HIAWms.Domain.MaterialType
+namespace CMS.Plugin.HIAWms.Domain.WmsMaterialTypes
{
+ /// <summary>
+ /// 鐗╂枡绫诲瀷
+ /// </summary>
public class WmsMaterialType : MyFullAuditedAggregateRoot<Guid>
{
/// <summary>
@@ -18,5 +21,14 @@
/// 绫诲瀷缂栫爜
/// </summary>
public string MaterialTypeCode { get; set; }
+
+ /// <summary>
+ /// Adjusts the sort.
+ /// </summary>
+ /// <param name="sort">The sort.</param>
+ public void AdjustSort(int sort)
+ {
+ Sort = sort;
+ }
}
}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterialType.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterialType.cs
index 8c7f612..9383fef 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterialType.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterialType.cs
@@ -1,6 +1,6 @@
锘縰sing CMS.Plugin.HIAWms.Domain;
-using CMS.Plugin.HIAWms.Domain.MaterialType;
using CMS.Plugin.HIAWms.Domain.WmsMaterials;
+using CMS.Plugin.HIAWms.Domain.WmsMaterialTypes;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialTypeRepository.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialTypeRepository.cs
index f3c1fef..716ab5d 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialTypeRepository.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialTypeRepository.cs
@@ -1,16 +1,17 @@
-using CMS.Plugin.HIAWms.Domain.WmsMaterialType;
-using CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions;
-using CmsQueryExtensions.Extension;
-using Microsoft.EntityFrameworkCore;
-using System.Linq.Dynamic.Core;
-using System.Linq.Expressions;
-using Volo.Abp;
-using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore;
-
-
-namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Repositories;
-
+
+using CMS.Plugin.HIAWms.Domain.WmsMaterialTypes;
+using CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions;
+using CmsQueryExtensions.Extension;
+using Microsoft.EntityFrameworkCore;
+using System.Linq.Dynamic.Core;
+using System.Linq.Expressions;
+using Volo.Abp;
+using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+
+namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Repositories;
+
/// <summary>
/// 鐗╂枡l绫诲瀷淇℃伅浠撳偍瀹炵幇
/// </summary>
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs
index ab3ba2c..af07b4e 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs
@@ -103,5 +103,15 @@
{
return await _wmsEnumAppService.GetPlaceListForSelectAsync(placeType);
}
+ /// <summary>
+ /// 鑾峰彇鐗╂枡绫诲瀷鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [Route("MaterialTypeList")]
+ public async Task<List<MaterialTypeOutput>> GetMaterialTypeListAsync()
+ {
+ return await _wmsEnumAppService.GetMaterialTypeListAsync();
+ }
}
}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialTypeController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialTypeController.cs
index 2ade70b..485f893 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialTypeController.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialTypeController.cs
@@ -124,7 +124,7 @@
UserId = _currentUser.UserId
};
//return _wmsMaterialAppService.DeleteAsync(id,myCurrentUser);//閫昏緫鍒犻櫎
- return _wmsMaterialAppService.DeletePermanentlyAsync(id, myCurrentUser);//鐗╃悊鍒犻櫎
+ return _WmsMaterialTypeAppService.DeletePermanentlyAsync(id, myCurrentUser);//鐗╃悊鍒犻櫎
}
/// <summary>
@@ -142,7 +142,7 @@
UserId = _currentUser.UserId
};
// return _wmsMaterialAppService.DeleteManyAsync(ids,myCurrentUser);//閫昏緫鍒犻櫎
- return _wmsMaterialAppService.BatchDeletePermanentlyAsync(ids, myCurrentUser);//鐗╃悊鍒犻櫎
+ return _WmsMaterialTypeAppService.BatchDeletePermanentlyAsync(ids, myCurrentUser);//鐗╃悊鍒犻櫎
}
/// <summary>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Controller\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Controller\346\250\241\346\235\277.txt"
index 7bfd47d..59f98c4 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Controller\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Controller\346\250\241\346\235\277.txt"
@@ -124,7 +124,7 @@
UserId = _currentUser.UserId
};
//return _wmsMaterialAppService.DeleteAsync(id,myCurrentUser);//逻辑删除
- return _wmsMaterialAppService.DeletePermanentlyAsync(id, myCurrentUser);//物理删除
+ return _$EntityInstanceName$AppService.DeletePermanentlyAsync(id, myCurrentUser);//物理删除
}
/// <summary>
@@ -142,7 +142,7 @@
UserId = _currentUser.UserId
};
// return _wmsMaterialAppService.DeleteManyAsync(ids,myCurrentUser);//逻辑删除
- return _wmsMaterialAppService.BatchDeletePermanentlyAsync(ids, myCurrentUser);//物理删除
+ return _$EntityInstanceName$AppService.BatchDeletePermanentlyAsync(ids, myCurrentUser);//物理删除
}
/// <summary>
--
Gitblit v1.9.3