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


@@ -24,6 +24,7 @@


using WIDESEA_DTO.Allocate;


using WIDESEA_DTO.Inbound;


using WIDESEA_DTO.ReturnMES;


using WIDESEA_IBasicService;


using WIDESEA_IInboundService;


using WIDESEA_IStockService;


using WIDESEA_Model.Models;


@@ -48,7 +49,8 @@


        private readonly IRepository<Dt_AllocateMaterialInfo> _allocateMaterialInfo;


        private readonly HttpClientHelper _httpClientHelper;


        private readonly IRepository<Dt_MesReturnRecord> _mesReturnRecord;


        public InboundService(IUnitOfWorkManage unitOfWorkManage, IInboundOrderDetailService inboundOrderDetailService, IInboundOrderService inbounOrderService, IRepository<Dt_InboundOrder> inboundOrderRepository, IRepository<Dt_WarehouseArea> warehouseAreaRepository, IRepository<Dt_LocationType> locationTypeRepository, IRepository<Dt_StockInfo> stockInfoRepository, IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository, IStockService stockService, IRepository<Dt_Task> taskRepository,IRepository<Dt_AllocateMaterialInfo> allocateMaterialInfo, HttpClientHelper httpClientHelper, IRepository<Dt_MesReturnRecord> mesReturnRecord)


        private readonly ILocationInfoService _locationInfoService;


        public InboundService(IUnitOfWorkManage unitOfWorkManage, IInboundOrderDetailService inboundOrderDetailService, IInboundOrderService inbounOrderService, IRepository<Dt_InboundOrder> inboundOrderRepository, IRepository<Dt_WarehouseArea> warehouseAreaRepository, IRepository<Dt_LocationType> locationTypeRepository, IRepository<Dt_StockInfo> stockInfoRepository, IRepository<Dt_InboundOrderDetail> inboundOrderDetailRepository, IStockService stockService, IRepository<Dt_Task> taskRepository,IRepository<Dt_AllocateMaterialInfo> allocateMaterialInfo, HttpClientHelper httpClientHelper, IRepository<Dt_MesReturnRecord> mesReturnRecord,ILocationInfoService locationInfoService)


        {


            _unitOfWorkManage = unitOfWorkManage;


            InboundOrderDetailService = inboundOrderDetailService;


@@ -63,6 +65,7 @@


            _allocateMaterialInfo = allocateMaterialInfo;


            _httpClientHelper = httpClientHelper;


            _mesReturnRecord = mesReturnRecord;


            _locationInfoService = locationInfoService;


        }




        public async Task<WebResponseContent> GroupPallet(GroupPalletDto palletDto)


@@ -115,6 +118,11 @@


                if (stockInfo != null && stockInfo.Details.Count > 0 && stockInfo.Details.FirstOrDefault()?.WarehouseCode != palletDto.WarehouseType)


                {


                    return content.Error($"该托盘组盘仓库为{stockInfo.Details.FirstOrDefault()?.WarehouseCode}与当前仓库{palletDto.WarehouseType}不一致，不允许组盘");


                }




                if (!_locationInfoService.QueryLocationCount(Convert.ToInt32(palletDto.locationType)))


                {


                    return content.Error($"该库区{palletDto.locationType}不存在空闲库位");


                }




                foreach (var item in details)


@@ -376,7 +384,7 @@


                                        .Where(x => x.OrderId == inboundOrder.Id && x.OrderDetailStatus==(int)OrderDetailStatusEnum.Over && x.ReturnToMESStatus == 0)


                                        .ToList();




                var stocks = _stockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.StockStatus == 6)


                var stocks = _stockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.StockStatus == (int)StockStatusEmun.入库完成)


                                            .Where(it => SqlFunc.Subqueryable<Dt_StockInfoDetail>().Where(s => s.StockId == it.Id && s.OrderNo == inboundOrder.InboundOrderNo).Any())


                                            .ToList();