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


@@ -37,10 +37,11 @@


        private readonly IRepository<Dt_StockInfoDetail> _stockDetailRepository;


        private readonly IRepository<Dt_InboundOrder> _inboundOrderRepository;


        private readonly IRepository<Dt_WarehouseArea> _warehouseAreaRepository;


        private readonly IRepository<Dt_LocationType> _locationTypeRepository;


        private readonly IRepository<Dt_StockInfo> _stockRepository;


        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) : 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) : base(BaseDal)


        {


            _mapper = mapper;


            _unitOfWorkManage = unitOfWorkManage;


@@ -53,6 +54,7 @@


            _inboundOrderRepository = inboundOrderRepository;


            _warehouseAreaRepository = warehouseAreaRepository;


            _stockRepository = stockRepository;


            _locationTypeRepository = locationTypeRepository;


        }




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


@@ -431,10 +433,10 @@


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


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




                bool code = _warehouseAreaRepository.Db.Queryable<Dt_WarehouseArea>().Where(x => x.Id == materielGroupDTO.WarehouseCode).Any();


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


                if (!code)


                {


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


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


                }




                if(_stockRepository.QueryFirst(x=>x.PalletCode == materielGroupDTO.PalletCode)!=null){


@@ -637,7 +639,7 @@


            {


                return WebResponseContent.Instance.Error("托盘号不能为空");


            }


           var stock= _stockRepository.Db.Queryable<Dt_StockInfo>().Includes(o=>o.Details).First(x => x.PalletCode == palletCode && x.StockStatus==3);


           var stock= _stockRepository.Db.Queryable<Dt_StockInfo>().Includes(o=>o.Details).First(x => x.PalletCode == palletCode );


            if (stock == null)


            {


                return WebResponseContent.Instance.Error($"未找到托盘号{palletCode}对应的库存记录");


@@ -652,7 +654,6 @@




            var barcodes = stock.Details.Select(d => d.Barcode).ToList();




            


                // åŒ¹é…åº“存条码对应的入库单明细


                var matchedInboundDetails = inboundOrders.Details


                    ?.Where(d => barcodes.Contains(d.Barcode))