Admin
2026-01-26 2046dbcbb6e69a2460c2c37ca9e25b7ffe1d1d29
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -60,6 +60,7 @@
        private readonly ILocationInfoService _locationInfoService;
        private readonly IWarehouseService _warehouseService;
        private readonly IRoadWayinfoService _roadWayinfoService;
        private readonly ITask_HtyService _task_HtyService;
        private Timer _timer;
        public IRepository<Dt_Task> Repository => BaseDal;
@@ -74,7 +75,7 @@
        public List<int> TaskOutboundTypes => typeof(TaskTypeEnum).GetEnumIndexList();
        public TaskService(ILogger<TaskService> logger, IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IStockInfoService stockInfoService, ILocationInfoService locationInfoService,
            IWarehouseService warehouseService, IRoadWayinfoService roadWayinfoService) : base(BaseDal)
            IWarehouseService warehouseService, IRoadWayinfoService roadWayinfoService, ITask_HtyService task_HtyService) : base(BaseDal)
        {
            _logger = logger;
            _mapper = mapper;
@@ -82,8 +83,8 @@
            _stockInfoService = stockInfoService;
            _locationInfoService = locationInfoService;
            _warehouseService = warehouseService;
            _roadWayinfoService=roadWayinfoService;
            _roadWayinfoService = roadWayinfoService;
            _task_HtyService = task_HtyService;
        }
        public string MES_InReporttask = WIDESEA_Core.Helper.AppSettings.Configuration["MES_InReporttask"]; //入库反馈信息
        public string MES_OutReporttask = WIDESEA_Core.Helper.AppSettings.Configuration["MES_OutReporttask"];   //出库反馈信息
@@ -192,7 +193,7 @@
            {
                Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == wCSTask.TaskNum && x.PalletCode == wCSTask.PalletCode);
                if (task == null)
                    return webResponse.Error("未找到任务信息");
                    return webResponse.Error("未找到任务信息", 404);
                return TaskCompletedtask(task, wCSTask.TaskType);
            }
            catch (Exception ex)
@@ -699,11 +700,59 @@
            return BaseDal.QueryData(x => x.TaskStatus == (int)RelocationTaskStatusEnum.RelocationNew && x.CurrentAddress == LocationCode).FirstOrDefault();
        }
        public Dt_Task GeOutCuTaskQueue(string LocationCode)
        {
            return BaseDal.QueryData(x => x.TaskStatus == (int)OutTaskStatusEnum.OutNew && x.SourceAddress == LocationCode).FirstOrDefault();
        }
        public bool RelocationTaskProgress(string deviceId)
        {
            int taskcount = BaseDal.QueryData(x => x.Roadway == deviceId && x.TaskStatus == (int)RelocationTaskStatusEnum.RelocationExecuting).Count();
            int taskcount = BaseDal.QueryData(x => x.Roadway == deviceId && (x.TaskStatus == (int)RelocationTaskStatusEnum.RelocationExecuting || x.TaskStatus == (int)RelocationTaskStatusEnum.RelocationNew) ).Count();
            if (taskcount == 0) return false;
            return true;
        }
        //仓库容量状态
        public WebResponseContent GetWarehouseCapacity()
        {
            return _locationInfoService.GetWarehouseCapacity();
        }
        //出入库类型分布
        public WebResponseContent GetInOutTypeStats()
        {
            return _task_HtyService.GetInOutTypeStats();
        }
        //流量情况统计
        public WebResponseContent GetTodayTrafficStats()
        {
            return _task_HtyService.GetTodayInOutStats();
        }
        //当前进行的任务
        public WebResponseContent GetCurrentTasks()
        {
            // æŸ¥è¯¢æ‰€ä»¥è¿”回TaskNum,TaskType,CreateDate,TaskStatus,
            var tasks = BaseDal.QueryData()
                        .Select(t => new
                        {
                            WarehouseId = t.Roadway == "1" || t.Roadway == "2" ? 1 : 2,
                            PalletType = t.PalletType,
                            TaskNum = t.TaskId,
                            TaskType = t.TaskType,
                            CreateDate = t.CreateDate,
                            TaskStatus = t.TaskStatus
                        })
                        .ToList();
            return WebResponseContent.Instance.OK("成功", tasks);
        }
        //总体进度
        public WebResponseContent GetWarehouseOperationStatistics()
        {
            /// <summary>
            /// åŽŸæ–™ä»“ï¼Œæ€»å‡ºå…¥åº“ä»»åŠ¡æ•°é‡ï¼Œä»Šæ—¥å…¥åº“ï¼Œä»Šæ—¥å‡ºåº“ï¼Œä»Šæ—¥å¾…å®Œæˆï¼Œä»Šæ—¥å¼‚å¸¸ä»»åŠ¡ï¼Œæˆå“ä»“ï¼Œæ€»å‡ºå…¥åº“æ•°é‡ï¼Œä»Šæ—¥å…¥åº“ï¼Œä»Šæ—¥å‡ºåº“ï¼Œä»Šæ—¥å¾…å®Œæˆ
            /// </summary>
            return _task_HtyService.GetWarehouseOperationStatistics();
        }
    }
}