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


@@ -47,9 +47,10 @@


        private readonly IRepository<Dt_StockInfo> _stockRepository;


        private readonly IRepository<Dt_LocationInfo> _locationInfoRepository;


        private readonly IBasicService _basicService;


        private readonly IRepository<Dt_AllocateOrder> _allocateOrderRepository;


        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, IBasicService basicService, IRepository<Dt_LocationInfo> locationInfoRepository) : 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, IRepository<Dt_AllocateOrder> allocateOrderRepository) : base(BaseDal)


        {


            _mapper = mapper;


            _unitOfWorkManage = unitOfWorkManage;


@@ -66,6 +67,7 @@


            _materielInfoService = materielInfoService;


            _basicService = basicService;


            _locationInfoRepository = locationInfoRepository;


            _allocateOrderRepository = allocateOrderRepository;


        }




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


@@ -968,14 +970,18 @@


            return content.OK(data: details);


        }




        public WebResponseContent HandCloseOrder(List<int> orderIds)


        public WebResponseContent HandCloseOrder(List<string> orderNos)


        {


            try


            {


                foreach (int id in orderIds)


                foreach (var orderNo in orderNos)


                {


                    var inbound = _inboundOrderRepository.QueryFirst(x => x.Id == id);


                    if(inbound.OrderStatus !=(int)InOrderStatusEnum.未开始 && inbound.OrderStatus != (int)InOrderStatusEnum.入库中)


                    var inbound = _inboundOrderRepository.QueryFirst(x => x.InboundOrderNo == orderNo);


                    if(inbound == null)


                    {


                        return WebResponseContent.Instance.Error($"该单据不存在，无法进行关闭");


                    }


                    if (inbound.OrderStatus != (int)InOrderStatusEnum.未开始 && inbound.OrderStatus != (int)InOrderStatusEnum.入库中)


                    {


                        return WebResponseContent.Instance.Error($"该单据状态不可以关闭");


                    }