ALD自动小车搬运项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
1
huangxiaoqiang
2025-12-25 544014da344afc67f1671cdc38f4f732890e10c8 
 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs


@@ -4,6 +4,7 @@


using System.Text.RegularExpressions;


using System.Threading.Tasks;


using WIDESEA_Common.CommonEnum;


using WIDESEA_Common.LocationEnum;


using WIDESEA_Common.OrderEnum;


using WIDESEA_Common.StockEnum;


using WIDESEA_Core;


@@ -15,6 +16,7 @@


using WIDESEA_Core.Helper;


using WIDESEA_Core.Seed;


using WIDESEA_Core.Utilities;


using WIDESEA_DTO.Base;


using WIDESEA_DTO.Inbound;


using WIDESEA_IBasicService;


using WIDESEA_IInboundService;


@@ -42,9 +44,11 @@


        private readonly IRepository<Dt_WarehouseArea> _warehouseAreaRepository;


        private readonly IRepository<Dt_LocationType> _locationTypeRepository;


        private readonly IRepository<Dt_StockInfo> _stockRepository;


        private readonly IRepository<Dt_LocationInfo> _locationInfoRepository;


        private readonly IBasicService _basicService;


        public IRepository<Dt_InboundOrder> Repository => BaseDal;




        public InboundOrderService(IRepository<Dt_InboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository, IRepository<Dt_Task> taskRepository, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService, IMaterialUnitService materialUnitService, IRepository<Dt_StockInfoDetail> stockDetailRepository, IRepository<Dt_InboundOrder> inboundOrderRepository, IRepository<Dt_WarehouseArea> warehouseAreaRepository, IRepository<Dt_StockInfo> stockRepository, IRepository<Dt_LocationType> locationTypeRepository, IMaterielInfoService materielInfoService) : base(BaseDal)


        public InboundOrderService(IRepository<Dt_InboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository, IRepository<Dt_Task> taskRepository, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService, IMaterialUnitService materialUnitService, IRepository<Dt_StockInfoDetail> stockDetailRepository, IRepository<Dt_InboundOrder> inboundOrderRepository, IRepository<Dt_WarehouseArea> warehouseAreaRepository, IRepository<Dt_StockInfo> stockRepository, IRepository<Dt_LocationType> locationTypeRepository, IMaterielInfoService materielInfoService, IBasicService basicService, IRepository<Dt_LocationInfo> locationInfoRepository) : base(BaseDal)


        {


            _mapper = mapper;


            _unitOfWorkManage = unitOfWorkManage;


@@ -59,6 +63,8 @@


            _stockRepository = stockRepository;


            _locationTypeRepository = locationTypeRepository;


            _materielInfoService = materielInfoService;


            _basicService = basicService;


            _locationInfoRepository = locationInfoRepository;


        }




        public async Task<WebResponseContent> ReceiveInboundOrder(List<Dt_InboundOrder> models, int operateType)


@@ -99,9 +105,11 @@




                    foreach (var item in model.Details)


                    {


                        var purchaseToStockResult = await _materialUnitService.ConvertPurchaseToStockAsync(item.MaterielCode, item.BarcodeQty);


                        item.Unit = purchaseToStockResult.Unit;


                        item.OrderQuantity = purchaseToStockResult.Quantity;


                        //var purchaseToStockResult = await _materialUnitService.ConvertPurchaseToStockAsync(item.MaterielCode, item.BarcodeQty);




                        UnitConvertResultDTO totalResult = _basicService.UnitQuantityConvert(item.MaterielCode, item.Unit, item.BarcodeUnit, item.OrderQuantity);


                        item.Unit = totalResult.ToUnit;


                        item.OrderQuantity = totalResult.ToQuantity;


                        if (materielInfos.Any())


                        {


                            item.MaterielName = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterielCode)?.MaterielName ?? "";


@@ -458,10 +466,16 @@


            WebResponseContent content = new WebResponseContent();


            try


            {


                


                (bool, string, object?) result2 = ModelValidate.ValidateModelData(materielGroupDTO);


                if (!result2.Item1) return content = WebResponseContent.Instance.Error(result2.Item2);




                bool code = _locationTypeRepository.Db.Queryable<Dt_LocationType>().Where(x => x.LocationType == materielGroupDTO.WarehouseCode).Any();


                bool statu = _locationInfoRepository.Db.Queryable<Dt_LocationInfo>().Where(x => x.LocationType == materielGroupDTO.WarehouseCode && x.LocationStatus == (int)LocationStatusEnum.Free).Any();


                if (!statu)


                {


                    return content = WebResponseContent.Instance.Error($"该区域无货位可分配");


                }


                if (!code)


                {


                    return content = WebResponseContent.Instance.Error($"区域中没有该{materielGroupDTO.WarehouseCode}编号。");


@@ -645,15 +659,19 @@


                {


                    resultDTO.UniqueUnit = "";


                }


                var validDetails = _stockDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(s => s.OrderNo == orderNo).ToList();


                resultDTO.StockSumQuantity = orderDetail.Details.Sum(d => d.OrderQuantity);


                resultDTO.StockCount = orderDetail.Details.Count;


                if (validDetails.Any())


                {


                    resultDTO.StockSumQuantity -= validDetails.Sum(d => d.StockQuantity);


                    // æ˜Žç»†è®°å½•æ•°ï¼šç¬¦åˆæ¡ä»¶çš„有效记录条数


                    resultDTO.StockCount -= validDetails.Count;


                }


                var inbound =_inboundOrderRepository.Db.Queryable<Dt_InboundOrder>().Where(x => x.InboundOrderNo == orderNo);


                var inboundDetails = _inboundOrderDetailRepository.Db.Queryable<Dt_InboundOrderDetail>().Where(x => x.OrderId == inbound.First().Id).ToList();


                resultDTO.StockSumQuantity = inboundDetails.Where(x=>x.ReceiptQuantity==0).Sum(x=>x.OrderQuantity);


                resultDTO.StockCount = inboundDetails.Where(x => x.ReceiptQuantity == 0).Count();


                //var validDetails = _stockDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(s => s.OrderNo == orderNo).ToList();


                //resultDTO.StockSumQuantity = orderDetail.Details.Sum(d => d.OrderQuantity);


                //resultDTO.StockCount = orderDetail.Details.Count;


                //if (validDetails.Any())


                //{


                //    resultDTO.StockSumQuantity -= validDetails.Sum(d => d.StockQuantity);


                //    // æ˜Žç»†è®°å½•æ•°ï¼šç¬¦åˆæ¡ä»¶çš„有效记录条数


                //    resultDTO.StockCount -= validDetails.Count;


                //}


                return content.OK("", resultDTO);


            }


            catch (Exception ex)