ALD自动小车搬运项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 显示空白
647556386
10 天以前 70aa9b5ca249a84e5867912d551cdafbec76e54e 
 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs


@@ -84,6 +84,7 @@


        private readonly IRecordService _recordService;


        private readonly IAllocateService _allocateService;


        private readonly IInvokeMESService _invokeMESService;


        private readonly ITask_HtyService _task_HtyService;


        public IRepository<Dt_Task> Repository => BaseDal;




        private Dictionary<string, SqlSugar.OrderByType> _taskOrderBy = new()


@@ -103,7 +104,7 @@




        public List<int> TaskOutboundTypes => typeof(TaskTypeEnum).GetEnumIndexList();




        public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_StockInfo> stockRepository, ILocationInfoService locationInfoService, IInboundOrderService inboundOrderService, ILocationStatusChangeRecordService locationStatusChangeRecordService, IESSApiService eSSApiService, ILogger<TaskService> logger, IStockService stockService, IRecordService recordService, IInboundOrderDetailService inboundOrderDetailService, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService, IInvokeMESService invokeMESService, IOutStockLockInfoService outStockLockInfoService, IAllocateService allocateService, IRepository<Dt_OutboundBatch> outboundBatchRepository, IRepository<Dt_ReCheckOrder> reCheckOrderRepository, IRepository<Dt_AllocateOrderDetail> allocateOrderDetailRepository, IRepository<Dt_AllocateOrder> allocateOrderRepository, IMaterialUnitService materialUnitService) : base(BaseDal)


        public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_StockInfo> stockRepository, ILocationInfoService locationInfoService, IInboundOrderService inboundOrderService, ILocationStatusChangeRecordService locationStatusChangeRecordService, IESSApiService eSSApiService, ILogger<TaskService> logger, IStockService stockService, IRecordService recordService, IInboundOrderDetailService inboundOrderDetailService, IOutboundOrderService outboundOrderService, IOutboundOrderDetailService outboundOrderDetailService, IInvokeMESService invokeMESService, IOutStockLockInfoService outStockLockInfoService, IAllocateService allocateService, IRepository<Dt_OutboundBatch> outboundBatchRepository, IRepository<Dt_ReCheckOrder> reCheckOrderRepository, IRepository<Dt_AllocateOrderDetail> allocateOrderDetailRepository, IRepository<Dt_AllocateOrder> allocateOrderRepository, IMaterialUnitService materialUnitService, ITask_HtyService task_HtyService) : base(BaseDal)


        {


            _mapper = mapper;


            _unitOfWorkManage = unitOfWorkManage;


@@ -126,8 +127,21 @@


            _allocateOrderDetailRepository = allocateOrderDetailRepository;


            _allocateOrderRepository = allocateOrderRepository;


            _materialUnitService = materialUnitService;


            _task_HtyService = task_HtyService;


        }




        public async Task TaskStatusChange(string taskNum,TaskStatusEnum taskStatusEnum)


        {


            if (int.TryParse(taskNum, out var newTaskNum))


            {


                await Db.Updateable<Dt_Task>().SetColumns(it => new Dt_Task {


                        TaskStatus = taskStatusEnum.ObjToInt()


                    })


                    .Where(it => it.TaskNum == newTaskNum)


                    .ExecuteCommandAsync();


            }


              


        }




        /// <summary>


        /// 


@@ -276,8 +290,12 @@




            task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();




            BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.自动完成 : OperateTypeEnum.人工完成);




            //  BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.自动完成 : OperateTypeEnum.人工完成);


            var result = _task_HtyService.DeleteAndMoveIntoHty(task, OperateTypeEnum.人工删除);


            if (!result)


            {


                await Db.Deleteable(task).ExecuteCommandAsync();


            }


            _locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);




            _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) + beforeQuantity, WIDESEA_Common.StockEnum.StockChangeType.MaterielGroup);


@@ -325,8 +343,8 @@


                               }).ToList();


                            allocatefeedmodel.Details = groupedData;




                            var result = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);


                            if (result != null && result.code == 200)


                            var feedbackresult = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);


                            if (feedbackresult != null && feedbackresult.code == 200)


                            {


                                _inboundOrderService.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 1 })


                                .Where(it => it.Id == inboundOrder.Id).ExecuteCommand();


@@ -381,8 +399,8 @@


                               }).ToList();


                            allocatefeedmodel.Details = groupedData;




                            var result = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);


                            if (result != null && result.code == 200)


                            var feedbackresult = await _invokeMESService.FeedbackAllocate(allocatefeedmodel);


                            if (feedbackresult != null && feedbackresult.code == 200)


                            {


                                _inboundOrderService.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 1 })


                                .Where(it => it.Id == inboundOrder.Id).ExecuteCommand();


@@ -429,8 +447,8 @@


                               }).ToList();


                            feedmodel.details = groupedData;




                            var result = await _invokeMESService.FeedbackInbound(feedmodel);


                            if (result != null && result.code == 200)


                            var feedbackresult = await _invokeMESService.FeedbackInbound(feedmodel);


                            if (feedbackresult != null && feedbackresult.code == 200)


                            {


                                _inboundOrderService.Db.Updateable<Dt_InboundOrder>().SetColumns(it => new Dt_InboundOrder { ReturnToMESStatus = 1 })


                                .Where(it => it.Id == inboundOrder.Id).ExecuteCommand();


@@ -536,8 +554,12 @@


                var outboundOrder = _outboundOrderService.Db.Queryable<Dt_OutboundOrder>().First(x => x.OrderNo == task.OrderNo);




                task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();


                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? WIDESEA_Core.Enums.OperateTypeEnum.自动完成 : OperateTypeEnum.人工完成);




                // BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? WIDESEA_Core.Enums.OperateTypeEnum.自动完成 : OperateTypeEnum.人工完成);


                var result = _task_HtyService.DeleteAndMoveIntoHty(task, OperateTypeEnum.人工删除);


                if (!result)


                {


                    await Db.Deleteable(task).ExecuteCommandAsync();


                }


                _locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforelocationStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);






@@ -650,9 +672,13 @@


                task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();




                // åˆ é™¤ä»»åŠ¡è®°å½•


                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.自动完成 : OperateTypeEnum.人工完成);


                BaseDal.DeleteData(task);




                //BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.自动完成 : OperateTypeEnum.人工完成);


                //BaseDal.DeleteData(task);


                var result = _task_HtyService.DeleteAndMoveIntoHty(task, OperateTypeEnum.人工删除);


                if (!result)


                {


                    await Db.Deleteable(task).ExecuteCommandAsync();


                }


                // è®°å½•è´§ä½çŠ¶æ€å˜æ›´


                _locationStatusChangeRecordService.AddLocationStatusChangeRecord(


                    locationInfo,


@@ -1227,9 +1253,18 @@






                task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();


                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.自动完成 : OperateTypeEnum.人工完成);


                _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateTypeEnum.自动完成 : OperateTypeEnum.人工完成);


                //_stockRepository.Db.Deleteable(stockInfo).ExecuteCommand();


                // BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.自动完成 : OperateTypeEnum.人工完成);


                var result = _task_HtyService.DeleteAndMoveIntoHty(task, OperateTypeEnum.人工删除);


                if (!result)


                {


                    await Db.Deleteable(task).ExecuteCommandAsync();


                }




                var stockresult = _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateTypeEnum.自动完成 : OperateTypeEnum.人工完成);


                if (!stockresult)


                { 


                    _stockRepository.Db.Deleteable(stockInfo).ExecuteCommand();


                }


                _stockService.StockInfoService.DeleteData(stockInfo);


                _locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);