HIA24016N管子线DEMO开发
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
zs
2025-05-16 0999b36321bac9e303b547b55c35b91d1546f1c4 
 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs


@@ -1,9 +1,13 @@


using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockOrderDetail;


using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;


using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialStocks;


using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask;


using CMS.Plugin.HIAWms.Application.Contracts.Services;


using CMS.Plugin.HIAWms.Domain.Shared.Enums;


using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterialStocks;


using CMS.Plugin.HIAWms.Domain.WmsAreas;


using CMS.Plugin.HIAWms.Domain.WmsContainers;


using CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord;


using CMS.Plugin.HIAWms.Domain.WmsMaterials;


using CMS.Plugin.HIAWms.Domain.WmsMaterialStocks;


using CMS.Plugin.HIAWms.Domain.WmsPlaces;


@@ -11,8 +15,10 @@


using CmsQueryExtensions;


using CmsQueryExtensions.Extension;


using Microsoft.Extensions.DependencyInjection;


using SqlKata;


using System.Linq.Expressions;


using System.Text.Json;


using System.Threading.Tasks;


using Volo.Abp;


using Volo.Abp.Application.Dtos;


using Volo.Abp.Data;


@@ -29,6 +35,8 @@


    private readonly IWmsContainerRepository _wmscontainerRepository;


    private readonly IWmsPlaceRepository _wmsplaceRepository;


    private readonly IWmsAreaRepository _wmsareaRepository;


    private readonly IWmsInOutStockRecordAppService _wmspInOutStockRecordAppService;


    private readonly IWmsInOutStockRecordRepository _wmsInOutStockRecordRepository;


    private readonly IServiceProvider _serviceProvider;




    /// <summary>


@@ -41,7 +49,10 @@


        IWmsPlaceRepository wmsplaceRepository,


        IWmsAreaRepository wmsareaRepository


,


        IServiceProvider serviceProvider)


        IServiceProvider serviceProvider,


        IWmsInOutStockRecordAppService wmspInOutStockRecordAppService,


        IWmsInOutStockRecordRepository wmsInOutStockRecordRepository


        )


    {


        _wmsmaterialstockRepository = wmsmaterialstockRepository;


        _wmsMaterialRepository = wmsMaterialRepository;


@@ -49,6 +60,8 @@


        _wmsplaceRepository = wmsplaceRepository;


        _wmsareaRepository = wmsareaRepository;


        _serviceProvider = serviceProvider;


        _wmspInOutStockRecordAppService = wmspInOutStockRecordAppService;


        _wmsInOutStockRecordRepository = wmsInOutStockRecordRepository;


    }




    /// <inheritdoc />


@@ -58,7 +71,7 @@


    }




    /// <inheritdoc />


    public virtual async Task<PagedResultDto<WmsMaterialStockDto>> GetListAsync(GetWmsMaterialStocksInput input)


    public virtual async Task<PagedResultDto<WmsMaterialStockDto>> GetListAsync(GetWmsMaterialStockInput input)


    {


        Check.NotNull(input, nameof(input));




@@ -67,15 +80,17 @@


            input.Sorting = nameof(WmsMaterialStock.Sort);


        }




        var specification = new WmsMaterialStockSpecification(input.Name);


        var stock = ObjectMapper.Map<GetWmsMaterialStocksInput, WmsMaterialStock>(input);


        var count = await _wmsmaterialstockRepository.GetCountAsync(stock, input.StartTime, input.EndTime, input.Filter, specification);


        var list = await _wmsmaterialstockRepository.GetListAsync(stock, input.StartTime, input.EndTime, input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification);


        //动态构造查询条件  


        var whereConditions = DynamicGetQueryParams(input);




        var stock = ObjectMapper.Map<GetWmsMaterialStockInput, WmsMaterialStock>(input);


        var count = await _wmsmaterialstockRepository.GetCountAsync(whereConditions);


        var list = await _wmsmaterialstockRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);




        return new PagedResultDto<WmsMaterialStockDto>(count, ObjectMapper.Map<List<WmsMaterialStock>, List<WmsMaterialStockDto>>(list));


    }




    public async Task<PagedResultDto<WmsMaterialStockDto>> GetStockDetailAsync(GetWmsMaterialStocksInput input)


    public async Task<PagedResultDto<WmsMaterialStockDto>> GetStockDetailAsync(GetWmsMaterialStockInput input)


    {


        Check.NotNull(input, nameof(input));




@@ -93,8 +108,40 @@




        var count = await _wmsmaterialstockRepository.GetDetailCountAsync(whereConditions);


        var list = await _wmsmaterialstockRepository.GetStockDetailListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);


        var result = list


        .GroupBy(x => x.PlaceNo)  // 按库位号分组


        .SelectMany(g => g


            .OrderBy(x => x.InStockTime)  // 按入库时间排序


            .Select((x, index) => new WmsMaterialStockDto


            {


                MaterialId = x.MaterialId,


                MaterialBatch = x.MaterialBatch,


                MaterialModel = x.MaterialModel,


                MaterialName = x.MaterialName,


                MaterialNo = x.MaterialNo,


                CheckStatus = x.CheckStatus,


                ContainerNo = x.ContainerNo,


                ContainerType = x.ContainerType,


                StockNumber = x.StockNumber,


                SupplierCode = x.SupplierCode,


                PlaceNo = x.PlaceNo,


                PlaceStatus = x.PlaceStatus,


                StorageTypeNo = x.StorageTypeNo,


                AreaCode = x.AreaCode,


                AreaName = x.AreaName,


                IsLock = x.IsLock,


                Id = x.Id,


                EmptyContainer = x.EmptyContainer,


                InStockTime = x.InStockTime,


                RedundantField1 = x.RedundantField1,


                RedundantField2 = x.RedundantField2,


                RedundantField3 = x.RedundantField3,


                Remark = x.Remark,


                OrderInPlace = index+1




        return new PagedResultDto<WmsMaterialStockDto>(count, ObjectMapper.Map<List<WmsMaterialStock>, List<WmsMaterialStockDto>>(list));


            })).ToList();


            


        return new PagedResultDto<WmsMaterialStockDto>(count, result);


    }




    /// <summary>  


@@ -102,17 +149,17 @@


    /// </summary>  


    /// <param name="input">输入参数</param>  


    /// <returns></returns>  


    private FunReturnResultModel<Expression<Func<WmsMaterialStock, bool>>> DynamicGetQueryParams(GetWmsMaterialStocksInput input)


    private FunReturnResultModel<Expression<Func<WmsMaterialStock, bool>>> DynamicGetQueryParams(GetWmsMaterialStockInput input)


    {


        //动态构造查询条件  


        var whereConditions = WhereConditionsExtensions.GetWhereConditions<WmsMaterialStock, GetWmsMaterialStocksInput>(input);


        var whereConditions = WhereConditionsExtensions.GetWhereConditions<WmsMaterialStock, GetWmsMaterialStockInput>(input);


        if (!whereConditions.IsSuccess)


        {


            throw new Exception("动态构造查询条件失败:" + whereConditions.ErrMsg);


        }




        //也可再次自定义构建查询条件  


        Expression<Func<WmsMaterialStock, bool>> extendExpression = a => a.IsDeleted == false ;


        Expression<Func<WmsMaterialStock, bool>> extendExpression = a => a.IsDeleted == false;


        // 使用 System.Linq.PredicateBuilder 的 And 


        var pres = (System.Linq.Expressions.Expression<Func<WmsMaterialStock, bool>>)(whereConditions.data);


        whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression);


@@ -128,31 +175,36 @@


        using var uow = unitOfWorkManager.Begin(requiresNew: true);


        await CheckCreateOrUpdateDtoAsync(input);




        //var exist = await _wmsmaterialstockRepository.NameExistAsync(input.MaterialNo);


        //if (exist)


        //{


        //    throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialNo]);


        //}


        var material = await _wmsMaterialRepository.FindByNameAsync(input.MaterialNo);


        var materialModel = await _wmsMaterialRepository.FindByModelAsync(input.MaterialModel);


        if(materialModel == null)


        {


            throw new UserFriendlyException("物料型号不存在");


        }




        var material = await _wmsMaterialRepository.FindByNameAsync(materialModel.MaterialNo);


        if (material == null)


        {


            throw new UserFriendlyException("物料信息不存在");


        }


        var palceInfo = await _wmsplaceRepository.FindByNameAsync(input.PlaceNo);




        var container = await _wmscontainerRepository.FindByNameAsync(input.ContainerNo);


        //if (container == null)


        //{


        //    throw new UserFriendlyException("托盘信息不存在");


        //}


        input.ContainerNo = string.IsNullOrEmpty(input.ContainerNo) ? "TP_" + DateTime.Now.ToString("yyMMddHHmmssfff") : input.ContainerNo;




        var wmsmaterialstock = ObjectMapper.Map<WmsMaterialStockCreateDto, WmsMaterialStock>(input);


        input.MapExtraPropertiesTo(wmsmaterialstock, MappingPropertyDefinitionChecks.None);


        wmsmaterialstock.MaterialId = Guid.NewGuid().ToString("N");


        wmsmaterialstock.MaterialNo = material.MaterialNo;


        wmsmaterialstock.MaterialName = material.MaterialName;




        wmsmaterialstock.ContainerStatus = Domain.Shared.Enums.ContainerStatusEnum.KUWEI;


        wmsmaterialstock.ContainerType = container == null ? Domain.Shared.Enums.ContainerTypeEnum.XUNI : container.ContainerType;


        wmsmaterialstock.StorageTypeNo = Domain.Shared.Enums.PlaceTypeEnum.XUNIKUWEI;


        wmsmaterialstock.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.DAIRU;


        wmsmaterialstock.ContainerStatus = ContainerStatusEnum.KUWEI;


        wmsmaterialstock.ContainerType = container == null ? ContainerTypeEnum.XUNI : container.ContainerType;


        wmsmaterialstock.StorageTypeNo = PlaceTypeEnum.XUNIKUWEI;


        wmsmaterialstock.PlaceStatus = PlaceStatusEnum.DAIRU;


        if (!string.IsNullOrEmpty(input.PlaceNo))


        {


            var place = await _wmsplaceRepository.FindByNameAsync(input.PlaceNo);


@@ -166,12 +218,12 @@


                throw new UserFriendlyException("库位库区信息不存在");


            }




            wmsmaterialstock.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO;


            wmsmaterialstock.PlaceStatus = PlaceStatusEnum.CUNHUO;


            wmsmaterialstock.StorageTypeNo = place.StorageTypeNo;


            wmsmaterialstock.AreaCode = place.AreaCode;


            wmsmaterialstock.AreaName = area.AreaName;




            place.PlaceStatus = Domain.Shared.Enums.PlaceStatusEnum.CUNHUO;


            place.PlaceStatus = PlaceStatusEnum.CUNHUO;


            place.Islock = input.IsLock;




            await _wmsplaceRepository.UpdateAsync(place);


@@ -179,7 +231,12 @@


        var wmsmaterialstockList = await _wmsmaterialstockRepository.GetStockListAsync(new WmsMaterialStock { PlaceNo = input.PlaceNo });


        if (wmsmaterialstockList.Count > 0)


        {


            if (wmsmaterialstockList[0].MaterialNo != input.MaterialNo)


            if(wmsmaterialstock.StorageTypeNo == PlaceTypeEnum.YUANLIAOKUWEI)


            {


                wmsmaterialstock.ContainerNo = wmsmaterialstockList[0].ContainerNo;


                input.ContainerNo = wmsmaterialstockList[0].ContainerNo;


            }


            if (wmsmaterialstockList[0].MaterialNo != material.MaterialNo)


            {


                throw new UserFriendlyException("当前库位已存放别的物料");


            }


@@ -195,6 +252,7 @@


        wmsmaterialstock.InStockTime = DateTime.Now;




        var stockList = new List<WmsMaterialStock>();


        var recordList = new List<WmsInOutStockRecord>();


        for (int i = 0; i < input.StockNumber; i++)


        {


            var stock = new WmsMaterialStock();


@@ -203,8 +261,27 @@


            stock.MaterialId = Guid.NewGuid().ToString("N");


            stock.StockNumber = 1;


            stockList.Add(stock);


        }




            // 添加库存记录


            var record = new WmsInOutStockRecord


            {


                TaskNo = string.IsNullOrEmpty(input.OrderNo) ? "Task_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") : input.OrderNo,


                OrderNo = input.OrderNo,


                StockType = StockTypeEnum.InBound,


                ContainerNo = stock.ContainerNo,


                MaterialId = stock.MaterialId,


                MaterialModel = stock.MaterialModel,


                MaterialName = stock.MaterialName,


                MaterialNo = stock.MaterialNo,


                MaterialBatch = stock.MaterialBatch,


                SourcePlace = "添加库存",


                ToPlace = stock.PlaceNo,


                OperateTime = DateTime.Now,


                Remark = "入库",


            };


            recordList.Add(record);


        }


        await _wmsInOutStockRecordRepository.InsertManyAsync(recordList);


        await _wmsmaterialstockRepository.InsertManyAsync(stockList);




        if (container == null)


@@ -415,7 +492,7 @@


    /// <inheritdoc />


    public virtual async Task AdjustSortAsync(Guid id, int sort)


    {


        var list = await _wmsmaterialstockRepository.GetListAsync(null, null, null, nameof(WmsMaterialStock.Sort));


        var list = await _wmsmaterialstockRepository.GetListAsync(null, "", 0, 999);


        if (list != null && list.Any())


        {


            var initSort = 1;


@@ -595,7 +672,7 @@


    }




    /// <inheritdoc />


    public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialStocksInput input)


    public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialStockInput input)


    {


        Check.NotNull(input, nameof(input));




@@ -604,9 +681,9 @@


            input.Sorting = nameof(WmsMaterialStock.Sort);


        }




        var specification = new WmsMaterialStockSpecification(input.Name);


        var stock = ObjectMapper.Map<GetWmsMaterialStocksInput, WmsMaterialStock>(input);


        var list = await _wmsmaterialstockRepository.GetListAsync(stock, input.StartTime, input.EndTime, input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true);


        var whereConditions = DynamicGetQueryParams(input);


        var stock = ObjectMapper.Map<GetWmsMaterialStockInput, WmsMaterialStock>(input);


        var list = await _wmsmaterialstockRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);


        var result = ObjectMapper.Map<List<WmsMaterialStock>, List<WmsMaterialStockDto>>(list);




        var sheets = new Dictionary<string, object>


@@ -625,8 +702,8 @@


    protected Task CheckCreateOrUpdateDtoAsync(WmsMaterialStockCreateOrUpdateDtoBase input)


    {


        Check.NotNull(input, nameof(input));


        Check.NotNullOrWhiteSpace(input.MaterialNo, "编号", WmsMaterialStockConsts.MaxCodeLength);


        Check.NotNullOrWhiteSpace(input.MaterialName, "名称", WmsMaterialStockConsts.MaxNameLength);


        //Check.NotNullOrWhiteSpace(input.MaterialNo, "编号", WmsMaterialStockConsts.MaxCodeLength);


        //Check.NotNullOrWhiteSpace(input.MaterialName, "名称", WmsMaterialStockConsts.MaxNameLength);


        Check.Length(input.Remark, "备注", WmsMaterialStockConsts.MaxRemarkLength);


        return Task.CompletedTask;


    }