HIA24016N管子线DEMO开发
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
schangxiang@126.com
2025-05-13 25246d39da4b74b54a844b36d8a50752917b81cc 
 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsCommonAppService.cs


@@ -5,9 +5,11 @@


using CMS.Plugin.HIAWms.Domain.WmsMaterials;


using CMS.Plugin.HIAWms.Domain.WmsMaterialStocks;


using CMS.Plugin.HIAWms.Domain.WmsPlaces;


using CmsQueryExtensions.Extension;


using System;


using System.Collections.Generic;


using System.Linq;


using System.Linq.Expressions;


using System.Text;


using System.Threading.Tasks;


using Volo.Abp;


@@ -44,8 +46,10 @@


        /// <exception cref="UserFriendlyException"></exception>


        public async Task<Dictionary<WmsPlaceDto, int>> FindAvailablePlacesAsync(string materialModel,int requiredNum, string materialNo="" )


        {




            var whereConditions = DynamicGetQueryParams(new GetWmsMaterialStockInput { StorageTypeNo = Domain.Shared.Enums.PlaceTypeEnum.YUANLIAOKUWEI });


            // 1. 获取所有库存和库位信息


            var stockList = await _wmsMaterialStockRepository.GetListAsync(new WmsMaterialStock { StorageTypeNo = Domain.Shared.Enums.PlaceTypeEnum.YUANLIAOKUWEI});


            var stockList = await _wmsMaterialStockRepository.GetListAsync(whereConditions);




            var placeList = await _wmsPlaceRepository.GetListAsync(new WmsPlace { StorageTypeNo = Domain.Shared.Enums.PlaceTypeEnum.YUANLIAOKUWEI});


            var allPlaceList = ObjectMapper.Map<List<WmsPlace>, List<WmsPlaceDto>>(placeList);


@@ -113,7 +117,8 @@


        public async Task<Dictionary<WmsMaterialStockDto, int>> FindStockAsync(string materialModel, int requiredNum, string materialNo = "")


        {


            // 1. 获取所有库存（排除锁定库存）


            var stockList = (await _wmsMaterialStockRepository.GetListAsync(new WmsMaterialStock()))


            var whereConditions = DynamicGetQueryParams(new GetWmsMaterialStockInput());


            var stockList = (await _wmsMaterialStockRepository.GetListAsync(whereConditions))


                .Where(x => x.IsLock == Domain.Shared.Enums.YesNoEnum.N)


                .Where(x=>x.StorageTypeNo == Domain.Shared.Enums.PlaceTypeEnum.YUANLIAOKUWEI)


                .ToList();


@@ -150,5 +155,23 @@




            return allocation;


        }




        private FunReturnResultModel<Expression<Func<WmsMaterialStock, bool>>> DynamicGetQueryParams(GetWmsMaterialStockInput 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;


            // 使用 System.Linq.PredicateBuilder 的 And 


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


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




            return whereConditions;


        }


    }


}