修改物料类型

zs

2025-05-15 9d23331a1bdb4b4d38216d61cd9707ef13f30aa4

修改物料类型

 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>

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/CommonDto/MaterialTypeOutput.cs

ÎļþÃû´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MaterialType/WmsMaterialType.cs ÐÞ¸Ä
@@ -1,13 +1,15 @@
using CMS.Plugin.MyExtension.Domain;
using System;
using 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>
        /// ç±»åž‹æè¿°

 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();
    }
}

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsMaterialTypeAppService.cs

@@ -1,8 +1,9 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialType; 
using CMS.Plugin.HIAWms.Application.Contracts.Dtos;
using Volo.Abp.Application.Services; 
using CmsQueryExtensions.Entitys; 
using System.Linq.Expressions; 
using CMS.Plugin.HIAWms.Domain.WmsMaterialType; 
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialType;
using CMS.Plugin.HIAWms.Domain.WmsMaterialTypes;
 
namespace CMS.Plugin.HIAWms.Application.Contracts.Services; 
 
@@ -72,14 +73,12 @@
    /// <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="isMultipleThrowException"></param>
    /// <param name="cancellationToken"></param> 
    /// <returns></returns> 
    /// <exception cref="UserFriendlyException"></exception> 
    Task<WmsMaterialType> GetSingleByFilterAsync(Expression<Func<WmsMaterialType, bool>> whereConditions, bool is​MultipleThrowException = false, CancellationToken cancellationToken = default); 
} 

 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs

@@ -1,18 +1,23 @@
using 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;
        }
    }
}

 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialTypeAppService.cs

@@ -2,15 +2,14 @@
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; 
using CMS.Plugin.HIAWms.Domain.WmsMaterialTypes;
 
namespace CMS.Plugin.HIAWms.Application.Implements; 
 

 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; 

 HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterialType/IWmsMaterialTypeRepository.cs

@@ -2,7 +2,7 @@
using System.Linq.Expressions; 
using Volo.Abp.Domain.Repositories; 
 
namespace CMS.Plugin.HIAWms.Domain.WmsMaterialType; 
namespace CMS.Plugin.HIAWms.Domain.WmsMaterialTypes;
 
/// <summary> 
/// ç‰©æ–™l类型信息仓储 

 HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterialType/WmsMaterialType.cs

copy from HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MaterialType/WmsMaterialType.cs
copy to HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterialType/WmsMaterialType.cs
Îļþ´Ó HIAWms/server/src/CMS.Plugin.HIAWms.Domain/MaterialType/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;
        }
    }
}

 HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterialType.cs

@@ -1,6 +1,6 @@
using 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;

 HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialTypeRepository.cs

@@ -1,4 +1,5 @@
using CMS.Plugin.HIAWms.Domain.WmsMaterialType; 

using CMS.Plugin.HIAWms.Domain.WmsMaterialTypes;
using CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions; 
using CmsQueryExtensions.Extension; 
using Microsoft.EntityFrameworkCore; 

 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();
        }
    }
}

 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> 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Templete/ControllerÄ£°å.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>