3

schangxiang@126.com

2025-05-13 448177c5f07c2a63071fe3ebb5bb79894b0606ed

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs

@@ -10,6 +10,7 @@
using Volo.Abp.Data; 
using Volo.Abp.ObjectExtending; 
using Volo.Abp.ObjectMapping; 
using CmsQueryExtensions.Entitys; 
 
namespace CMS.Plugin.HIAWms.Application.Implements; 
 
@@ -18,15 +19,15 @@
/// </summary> 
public class WmsMaterialAppService : CMSPluginAppService, IWmsMaterialAppService 
{ 
    private readonly IWmsMaterialRepository wmsMaterialRepository; 
    private readonly IWmsMaterialRepository _wmsMaterialRepository; 
 
    /// <summary> 
    /// Initializes a new instance of the <see cref="WmsMaterialAppService"/> class. 
    /// </summary> 
    /// <param name="WmsMaterialRepository">The task job repository.</param> 
    public WmsMaterialAppService(IWmsMaterialRepository _WmsMaterialRepository) 
    public WmsMaterialAppService(IWmsMaterialRepository wmsMaterialRepository) 
    { 
        wmsMaterialRepository = _WmsMaterialRepository; 
        _wmsMaterialRepository = wmsMaterialRepository; 
    } 
 
    /// <summary> 
@@ -36,7 +37,7 @@
    /// <returns></returns> 
    public virtual async Task<WmsMaterialDto> GetAsync(Guid id) 
    { 
        return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(await wmsMaterialRepository.GetAsync(id)); 
        return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(await _wmsMaterialRepository.GetAsync(id)); 
    } 
 
    /// <summary> 
@@ -60,8 +61,8 @@
 
        #endregion 
 
        var count = await wmsMaterialRepository.GetCountAsync(whereConditions); 
        var list = await wmsMaterialRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount); 
        var count = await _wmsMaterialRepository.GetCountAsync(whereConditions); 
        var list = await _wmsMaterialRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount); 
 
        return new PagedResultDto<WmsMaterialDto>(count, ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list)); 
    } 
@@ -99,20 +100,21 @@
    { 
        await CheckCreateOrUpdateDtoAsync(input); 
 
        var exist = await wmsMaterialRepository.NameExistAsync(input.MaterialCode); 
        var exist = await _wmsMaterialRepository.NameExistAsync(input.MaterialCode); 
        if (exist) 
        { 
            throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialCode]); 
        } 
 
        var maxSort = await wmsMaterialRepository.GetMaxSortAsync(); 
        var maxSort = await _wmsMaterialRepository.GetMaxSortAsync(); 
        var sort = input.Sort ?? maxSort; 
 
        var insertObj = ObjectMapper.Map<WmsMaterialCreateDto, WmsMaterial>(input); 
        insertObj.Sort = sort; 
        input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None); 
 
        await wmsMaterialRepository.InsertAsync(insertObj); 
        insertObj.CreatorName = input.CreatorName;//创建人 
        await _wmsMaterialRepository.InsertAsync(insertObj); 
 
        //if (input.Sort.HasValue && insertObj.Sort != maxSort) 
        //{ 
@@ -133,8 +135,8 @@
    { 
        await CheckCreateOrUpdateDtoAsync(input); 
 
        var updateObj = await wmsMaterialRepository.GetAsync(id); 
        var exist = await wmsMaterialRepository.NameExistAsync(input.MaterialCode, updateObj.Id); 
        var updateObj = await _wmsMaterialRepository.GetAsync(id); 
        var exist = await _wmsMaterialRepository.NameExistAsync(input.MaterialCode, updateObj.Id); 
        if (exist) 
        { 
            throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialCode]); 
@@ -144,7 +146,12 @@
        input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None); 
 
                updateObj.MaterialCode = input.MaterialCode;
        updateObj.IsValid = input.IsValid;
        updateObj.IsSelfMade = input.IsSelfMade;
        updateObj.Num = input.Num;
        updateObj.SelfNum = input.SelfNum;
        updateObj.MaterialName = input.MaterialName;
        updateObj.NullLength = input.NullLength;
        updateObj.PurchaseType = input.PurchaseType;
        updateObj.MaterialType = input.MaterialType;
        updateObj.PrimaryUnit = input.PrimaryUnit;
@@ -159,21 +166,12 @@
        updateObj.RedundantField1 = input.RedundantField1;
        updateObj.RedundantField2 = input.RedundantField2;
        updateObj.RedundantField3 = input.RedundantField3;
        updateObj.CreatorName = input.CreatorName;
        updateObj.LastModifierName = input.LastModifierName;
        updateObj.Remark = input.Remark;
        updateObj.IsDisabled = input.IsDisabled;
        updateObj.ExtraField1 = input.ExtraField1;
        updateObj.ExtraField2 = input.ExtraField2;
        updateObj.ExtraField3 = input.ExtraField3;
        updateObj.IsSelfMade = input.IsSelfMade;
        updateObj.IsValid = input.IsValid;
        updateObj.NullLength = input.NullLength;
        updateObj.Num = input.Num;
        updateObj.SelfNum = input.SelfNum;
 
 
        await wmsMaterialRepository.UpdateAsync(updateObj); 
        updateObj.LastModifierName = input.LastModifierName;//修改人 
 
        await _wmsMaterialRepository.UpdateAsync(updateObj); 
 
        return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(updateObj); 
    } 
@@ -183,22 +181,22 @@
    /// </summary> 
    /// <param name="ids"></param> 
    /// <returns></returns> 
    public async Task<List<WmsMaterialDto>> CloneAsync(IEnumerable<Guid> ids) 
    public async Task<List<WmsMaterialDto>> CloneAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser) 
    { 
        //var wmsMaterials = new List<WmsMaterial>(); 
        //if (ids != null) 
        //{ 
        //    var sort = await wmsMaterialRepository.GetMaxSortAsync(); 
        //    var sort = await _wmsMaterialRepository.GetMaxSortAsync(); 
        //    foreach (var id in ids) 
        //    { 
        //        var WmsMaterial = await wmsMaterialRepository.FindAsync(id); 
        //        var WmsMaterial = await _wmsMaterialRepository.FindAsync(id); 
        //        if (WmsMaterial != null) 
        //        { 
        //            var name = WmsMaterial.Name + WmsMaterialConsts.CloneTag; 
        //            var notExist = false; 
        //            while (!notExist) 
        //            { 
        //                var exist = await wmsMaterialRepository.NameExistAsync(name); 
        //                var exist = await _wmsMaterialRepository.NameExistAsync(name); 
        //                if (exist || wmsMaterials.Any(x => x.Name == name)) 
        //                { 
        //                    name += WmsMaterialConsts.CloneTag; 
@@ -208,7 +206,7 @@
        //                notExist = true; 
        //            } 
 
        //            //WmsMaterial = await wmsMaterialRepository.InsertAsync(WmsMaterial.Clone(GuidGenerator.Create(), name, sort++)); 
        //            //WmsMaterial = await _wmsMaterialRepository.InsertAsync(WmsMaterial.Clone(GuidGenerator.Create(), name, sort++)); 
        //            wmsMaterials.Add(WmsMaterial); 
        //        } 
        //    } 
@@ -225,7 +223,7 @@
    /// <returns></returns> 
    public virtual Task DeleteAsync(Guid id) 
    { 
        return wmsMaterialRepository.DeleteAsync(id); 
        return _wmsMaterialRepository.DeleteAsync(id); 
    } 
 
    /// <summary> 
@@ -233,12 +231,34 @@
    /// </summary> 
    /// <param name="ids"></param> 
    /// <returns></returns> 
    public async Task DeleteManyAsync(IEnumerable<Guid> ids) 
    public async Task DeleteManyAsync(IEnumerable<Guid> ids, MyCurrentUser myCurrentUser) 
    { 
        foreach (var id in ids) 
        { 
            await DeleteAsync(id); 
        } 
    } 
 
     /// <summary> 
    /// ç‰©ç†åˆ é™¤ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
    /// </summary> 
    /// <param name="id">主键ID</param> 
    /// <param name="cancellationToken"></param> 
    /// <returns></returns> 
    public virtual async Task DeletePermanentlyAsync(Guid id, MyCurrentUser myCurrentUser, CancellationToken cancellationToken = default) 
    { 
        _wmsMaterialRepository.DeletePermanentlyAsync(id); 
    } 
 
    /// <summary> 
    /// æ‰¹é‡ç‰©ç†åˆ é™¤ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ï¼ˆç›´æŽ¥åˆ é™¤ï¼Œä¸è½¯åˆ é™¤ï¼‰ 
    /// </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) 
    { 
        _wmsMaterialRepository.BatchDeletePermanentlyAsync(ids); 
    } 
 
    /// <summary> 
@@ -249,7 +269,7 @@
    /// <returns></returns> 
    public virtual async Task AdjustSortAsync(Guid id, int sort) 
    { 
        var list = await wmsMaterialRepository.GetListAsync(null, nameof(WmsMaterial.Sort)); 
        var list = await _wmsMaterialRepository.GetListAsync(null, nameof(WmsMaterial.Sort)); 
        if (list != null && list.Any()) 
        { 
            var initSort = 1; 
@@ -276,7 +296,7 @@
            } 
        } 
 
        await wmsMaterialRepository.UpdateManyAsync(list); 
        await _wmsMaterialRepository.UpdateManyAsync(list); 
    } 
 
    /// <summary> 
@@ -285,7 +305,7 @@
    /// <param name="input"></param> 
    /// <returns></returns> 
    /// <exception cref="UserFriendlyException"></exception> 
    public async Task ImportAsync(WmsMaterialsImportModel input) 
    public async Task ImportAsync(WmsMaterialsImportModel input, MyCurrentUser myCurrentUser) 
    { 
        Check.NotNull(input, nameof(input)); 
 
@@ -321,13 +341,18 @@
                    throw new UserFriendlyException(errorMsg); 
                } 
 
                var oldWmsMaterial = await wmsMaterialRepository.FindByNameAsync(impItem.MaterialCode); 
                var oldWmsMaterial = await _wmsMaterialRepository.FindByNameAsync(impItem.MaterialCode); 
                if (oldWmsMaterial != null) 
                { 
                    var wmsMaterialUpdateDto = new WmsMaterialUpdateDto 
                    { 
                        MaterialCode = impItem.MaterialCode,
IsValid = impItem.IsValid,
IsSelfMade = impItem.IsSelfMade,
Num = impItem.Num,
SelfNum = impItem.SelfNum,
MaterialName = impItem.MaterialName,
NullLength = impItem.NullLength,
PurchaseType = impItem.PurchaseType,
MaterialType = impItem.MaterialType,
PrimaryUnit = impItem.PrimaryUnit,
@@ -342,18 +367,7 @@
RedundantField1 = impItem.RedundantField1,
RedundantField2 = impItem.RedundantField2,
RedundantField3 = impItem.RedundantField3,
CreatorName = impItem.CreatorName,
LastModifierName = impItem.LastModifierName,
Remark = impItem.Remark,
IsDisabled = impItem.IsDisabled,
ExtraField1 = impItem.ExtraField1,
ExtraField2 = impItem.ExtraField2,
ExtraField3 = impItem.ExtraField3,
IsSelfMade = impItem.IsSelfMade,
IsValid = impItem.IsValid,
NullLength = impItem.NullLength,
Num = impItem.Num,
SelfNum = impItem.SelfNum,
 
                    }; 
 
@@ -364,7 +378,12 @@
                    var wmsMaterialCreateDto = new WmsMaterialCreateDto 
                    { 
                        MaterialCode = impItem.MaterialCode,
IsValid = impItem.IsValid,
IsSelfMade = impItem.IsSelfMade,
Num = impItem.Num,
SelfNum = impItem.SelfNum,
MaterialName = impItem.MaterialName,
NullLength = impItem.NullLength,
PurchaseType = impItem.PurchaseType,
MaterialType = impItem.MaterialType,
PrimaryUnit = impItem.PrimaryUnit,
@@ -379,18 +398,7 @@
RedundantField1 = impItem.RedundantField1,
RedundantField2 = impItem.RedundantField2,
RedundantField3 = impItem.RedundantField3,
CreatorName = impItem.CreatorName,
LastModifierName = impItem.LastModifierName,
Remark = impItem.Remark,
IsDisabled = impItem.IsDisabled,
ExtraField1 = impItem.ExtraField1,
ExtraField2 = impItem.ExtraField2,
ExtraField3 = impItem.ExtraField3,
IsSelfMade = impItem.IsSelfMade,
IsValid = impItem.IsValid,
NullLength = impItem.NullLength,
Num = impItem.Num,
SelfNum = impItem.SelfNum,
 
                    }; 
 
@@ -404,6 +412,7 @@
        { 
            try 
            { 
                wmsMaterialDto.Item.CreatorName = myCurrentUser.UserAccount;//创建人 
                await CreateAsync(wmsMaterialDto.Item); 
            } 
            catch (Exception e) 
@@ -418,6 +427,7 @@
        { 
            try 
            { 
                wmsMaterialDto.Item.LastModifierName = myCurrentUser.UserAccount;//修改人 
                await UpdateAsync(wmsMaterialDto.Id, wmsMaterialDto.Item); 
            } 
            catch (Exception e) 
@@ -450,7 +460,7 @@
        #endregion 
 
 
        var list = await wmsMaterialRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true); 
        var list = await _wmsMaterialRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true); 
        var result = ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list); 
 
        var sheets = new Dictionary<string, object> 
@@ -458,7 +468,7 @@
            ["配置"] = ExportHelper.ConvertListToExportData(result), 
        }; 
 
        var fileName = result.Count > 1 ? "物料基础信息表列表" : result.Count == 1 ? result[0]?.MaterialCode : "WmsMaterial模版"; 
        var fileName = "物料信息"; 
        return (sheets, fileName); 
    } 
 
@@ -471,6 +481,8 @@
    { 
        Check.NotNull(input, nameof(input)); 
                Check.NotNullOrWhiteSpace(input.MaterialCode, "物料编码（唯一标识）", 64);
        Check.NotNull(input.IsValid, "是否有效物料");
        Check.NotNull(input.Num, "数量");
        Check.NotNullOrWhiteSpace(input.MaterialName, "物料名称", 128);
        Check.NotNull(input.PurchaseType, "采购类型（枚举值）");
        Check.NotNull(input.MaterialType, "物料类型（枚举值）");
@@ -478,9 +490,31 @@
        Check.NotNull(input.WallThickness, "壁厚（单位：mm）");
        Check.NotNull(input.Length, "长度（单位：m）");
        Check.NotNull(input.IsMainBranch, "是否为主支管");
        Check.NotNull(input.IsValid, "是否有效物料");
        Check.NotNull(input.Num, "是否有效物料");
 
        return Task.CompletedTask; 
    } 
 
     /// <summary> 
    /// æ ¹æ®æ¡ä»¶èŽ·å–物料基础信息表列表 
    /// </summary> 
    /// <param name="whereConditions"></param> 
    /// <param name="cancellationToken"></param> 
    /// <returns></returns> 
    public async Task<List<WmsMaterial>> GetListByFilterAsync(Expression<Func<WmsMaterial, bool>> whereConditions, CancellationToken cancellationToken = default) 
    { 
        return await _wmsMaterialRepository.GetListByFilterAsync(whereConditions); 
    } 
 
    /// <summary> 
    ///  æ ¹æ®æ¡ä»¶èŽ·å–单个物料基础信息表 
    /// </summary> 
    /// <param name="whereConditions"></param> 
    /// <param name="isMultipleThrowException">是否查询出多条就报错</param> 
    /// <param name="cancellationToken"></param> 
    /// <returns></returns> 
    /// <exception cref="UserFriendlyException"></exception> 
    public async Task<WmsMaterial> GetSingleByFilterAsync(Expression<Func<WmsMaterial, bool>> whereConditions, bool is​MultipleThrowException = false, CancellationToken cancellationToken = default) 
    { 
        return await _wmsMaterialRepository.GetSingleByFilterAsync(whereConditions, is​MultipleThrowException); 
    } 
}