ALD自动小车搬运项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
heshaofeng
10 天以前 b6a40a2d8fdcffb3accfc7e424c0726a87a59ddf 
 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundBatchPickingService.cs


@@ -21,6 +21,7 @@


using WIDESEA_IBasicService;


using WIDESEA_IOutboundService;


using WIDESEA_IStockService;


using WIDESEA_ITaskInfoService;


using WIDESEA_Model.Models;


using WIDESEA_Model.Models.Basic;


using WIDESEA_Model.Models.Outbound;


@@ -49,6 +50,7 @@


        private readonly IDailySequenceService _dailySequenceService;


        private readonly IAllocateService _allocateService;


        private readonly IRepository<Dt_OutboundBatch> _outboundBatchRepository;


        private readonly ITask_HtyService _task_HtyService;


        private readonly ILogger<OutboundPickingService> _logger;




        private Dictionary<string, string> stations = new Dictionary<string, string>


@@ -68,7 +70,7 @@


        public OutboundBatchPickingService(IRepository<Dt_PickingRecord> BaseDal, IUnitOfWorkManage unitOfWorkManage, IStockInfoService stockInfoService, IStockService stockService,


            IOutStockLockInfoService outStockLockInfoService, IStockInfoDetailService stockInfoDetailService, ILocationInfoService locationInfoService,


            IOutboundOrderDetailService outboundOrderDetailService, ISplitPackageService splitPackageService, IOutboundOrderService outboundOrderService,


            IRepository<Dt_Task> taskRepository, IESSApiService eSSApiService, ILogger<OutboundPickingService> logger, IInvokeMESService invokeMESService, IDailySequenceService dailySequenceService, IAllocateService allocateService, IRepository<Dt_OutboundBatch> outboundBatchRepository) : base(BaseDal)


            IRepository<Dt_Task> taskRepository, IESSApiService eSSApiService, ILogger<OutboundPickingService> logger, IInvokeMESService invokeMESService, IDailySequenceService dailySequenceService, IAllocateService allocateService, IRepository<Dt_OutboundBatch> outboundBatchRepository, ITask_HtyService task_HtyService) : base(BaseDal)


        {


            _unitOfWorkManage = unitOfWorkManage;


            _stockInfoService = stockInfoService;


@@ -86,6 +88,7 @@


            _dailySequenceService = dailySequenceService;


            _allocateService = allocateService;


            _outboundBatchRepository = outboundBatchRepository;


            _task_HtyService = task_HtyService;


        }




        // <summary>


@@ -1798,7 +1801,7 @@




                // æ›´æ–°é”å®šè®°å½•çŠ¶æ€ä¸ºå·²å›žåº“


                lockInfo.Status = (int)OutLockStockStatusEnum.已回库;


                lockInfo.Operator = App.User.UserName; 


                lockInfo.Operator = App.User.UserName;




                await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();




@@ -1854,7 +1857,7 @@




                    // æ›´æ–°é”å®šè®°å½•çŠ¶æ€ä¸ºå·²å›žåº“


                    lockInfo.Status = (int)OutLockStockStatusEnum.已回库;


                    lockInfo.Operator = App.User.UserName; 


                    lockInfo.Operator = App.User.UserName;




                    await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();




@@ -1945,11 +1948,33 @@


                    PalletType = stockInfo.PalletType,


                    WarehouseId = currentTask.WarehouseId


                };


                var targetAddress = currentTask.TargetAddress;




                await _taskRepository.Db.Insertable(returnTask).ExecuteCommandAsync();


                try


                {


                    await _taskRepository.Db.Insertable(returnTask).ExecuteCommandAsync();


                 


                    _logger.LogInformation($"CreateReturnTaskAndHandleESS  åˆ†æ‰¹åˆ é™¤åŽ†å²ä»»åŠ¡: {orderNo} ï¼Œ {currentTask.TaskNum}");


                    // åˆ é™¤åŽŸå§‹å‡ºåº“任务


                    //_taskRepository.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.自动完成);


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


                    await _taskRepository.Db.Deleteable(currentTask).ExecuteCommandAsync();




                    if (!result)


                    {


                        await _taskRepository.Db.Deleteable(currentTask).ExecuteCommandAsync();


                    }


                    _logger.LogInformation($"CreateReturnTaskAndHandleESS  åˆ†æ‰¹åˆ é™¤åŽ†å²ä»»åŠ¡: {orderNo} ï¼Œ {currentTask.TaskNum},影响行  {result}");




                }


                catch (Exception ex)


                {


                    _logger.LogInformation($"创建回库任务失败 - è®¢å•: {orderNo}, æ‰˜ç›˜: {palletCode}");


                    throw new Exception($"创建回库任务失败 - è®¢å•: {orderNo}, æ‰˜ç›˜: {palletCode}");


                  


                }


                // å‘送ESS命令


                await SendESSCommands(palletCode, currentTask.TargetAddress, returnTask);


                await SendESSCommands(palletCode, targetAddress, returnTask);




                _logger.LogInformation($"创建回库任务成功 - è®¢å•: {orderNo}, æ‰˜ç›˜: {palletCode}");


            }


@@ -2037,7 +2062,7 @@




            if (unfinishedLocks.Any())


            {


                // é‡è¦ï¼šåŒºåˆ†å·²åˆ†é…å’Œæœªåˆ†é…çš„锁定记录


                //  åŒºåˆ†å·²åˆ†é…å’Œæœªåˆ†é…çš„锁定记录


                var allocatedLocks = unfinishedLocks.Where(x => x.IsUnallocated != 1 && x.OrderDetailId > 0).ToList();


                var unallocatedLocks = unfinishedLocks.Where(x => x.IsUnallocated == 1 || x.OrderDetailId == 0).ToList();




@@ -2223,7 +2248,7 @@


                    // åˆ†é…æ•°é‡åœ¨è®¢å•æ˜Žç»†å±‚面统一处理


                    var originalStatus = lockInfo.Status;


                    lockInfo.Status = (int)OutLockStockStatusEnum.已回库;


                    lockInfo.Operator = App.User.UserName; 


                    lockInfo.Operator = App.User.UserName;




                    await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();




@@ -2550,7 +2575,7 @@


        /// <summary>


        /// å¤„理未分拣的锁定记录回库


        /// </summary>


  






        /// <summary>


        /// å¤„理托盘上的库存货物回库


@@ -2886,11 +2911,11 @@


                    $"库存数量不足，需要拣选：{remainingToPick}，实际库存：{stockDetail.StockQuantity}");




            // éªŒè¯åº“存状态


            if (stockDetail.Status != (int)StockStatusEmun.出库锁定)


            {


                return ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>.Error(


                    $"库存状态异常，当前状态：{stockDetail.Status}，期望状态：出库锁定");


            }


            //if (stockDetail.Status != (int)StockStatusEmun.出库锁定)


            //{


            //    return ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>.Error(


            //        $"库存状态异常，当前状态：{stockDetail.Status}，期望状态：出库锁定");


            //}




            // ä½¿ç”¨ OutboundBatchNo æŸ¥æ‰¾æ‰¹æ¬¡


            var batch = await _outboundBatchRepository.Db.Queryable<Dt_OutboundBatch>()


@@ -3478,13 +3503,24 @@




            };


            // ä¿å­˜å›žåº“任务


            await _taskRepository.Db.Insertable(returnTask).ExecuteCommandAsync();


            var insertcount = await _taskRepository.Db.Insertable(returnTask).ExecuteCommandAsync();


            if (insertcount <= 0)


            {


                throw new Exception("创建任务失败！");


            }


            var targetAddress = originalTask.TargetAddress;




            _logger.LogInformation($"CreateReturnTaskAndHandleESS  åˆ†æ‰¹åˆ é™¤åŽ†å²ä»»åŠ¡: {orderNo} ï¼Œ {originalTask.TaskNum}");


            // åˆ é™¤åŽŸå§‹å‡ºåº“任务


            _taskRepository.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.自动完成);


            // await _taskRepository.Db.Deleteable(originalTask).ExecuteCommandAsync();


            //_taskRepository.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.自动完成);


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


            await _taskRepository.Db.Deleteable(originalTask).ExecuteCommandAsync();




            if (!result)


            {


                await _taskRepository.Db.Deleteable(originalTask).ExecuteCommandAsync();


            }


            _logger.LogInformation($"CreateReturnTaskAndHandleESS  åˆ†æ‰¹åˆ é™¤åŽ†å²ä»»åŠ¡: {orderNo} ï¼Œ {originalTask.TaskNum},影响行  {result}");






            // ç»™ ESS å‘送流动信号和创建任务