美瑞安淮安立体仓库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
wangxinhui
2025-03-15 efaf0b8aeb26aca6536a4b384c912cc3cac4d070 
 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/¸ÉĤ²Ö/ConveyorLineJob_GM.cs


@@ -1,4 +1,5 @@


using Quartz;


using Newtonsoft.Json;


using Quartz;


using System;


using System.Collections.Generic;


using System.Linq;


@@ -8,6 +9,7 @@


using WIDESEAWCS_Common.Helper;


using WIDESEAWCS_Common.TaskEnum;


using WIDESEAWCS_Core;


using WIDESEAWCS_Core.Caches;


using WIDESEAWCS_Core.Helper;


using WIDESEAWCS_IBasicInfoRepository;


using WIDESEAWCS_ITaskInfoRepository;


@@ -24,20 +26,33 @@


    [DisallowConcurrentExecution]


    public class ConveyorLineJob_GM : JobBase, IJob


    {




        private readonly ICacheService _cacheService;


        private readonly ITaskService _taskService;


        private readonly ITaskExecuteDetailService _taskExecuteDetailService;


        private readonly ITaskRepository _taskRepository;


        private readonly IStationMangerRepository _stationMangerRepository;


        private readonly IRouterRepository _routerRepository;


        private readonly List<Dt_WarehouseDevice> warehouseDevices;




        public ConveyorLineJob_GM(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IStationMangerRepository stationMangerRepository, IRouterRepository routerRepository)


        public ConveyorLineJob_GM(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IStationMangerRepository stationMangerRepository, IRouterRepository routerRepository, ICacheService


            cacheService)


        {


            _cacheService = cacheService;


            _taskService = taskService;


            _taskExecuteDetailService = taskExecuteDetailService;


            _taskRepository = taskRepository;


            _stationMangerRepository = stationMangerRepository;


            _routerRepository = routerRepository;




            string? warehouseDevicesStr = _cacheService.Get<string>(nameof(Dt_WarehouseDevice));


            if (!string.IsNullOrEmpty(warehouseDevicesStr))


            {


                warehouseDevices = JsonConvert.DeserializeObject<List<Dt_WarehouseDevice>>(warehouseDevicesStr) ?? new List<Dt_WarehouseDevice>();


            }


            else


            {


                warehouseDevices = new List<Dt_WarehouseDevice>();


            }


        }




        public Task Execute(IJobExecutionContext context)


@@ -46,6 +61,12 @@


            if (flag && value != null)


            {


                OtherDevice device = (OtherDevice)value;


                Dt_WarehouseDevice? warehouseDevice = warehouseDevices.FirstOrDefault(x => x.DeviceCode == device.DeviceCode);


                if (warehouseDevice == null)


                {


                    WriteError(device.DeviceName, $"请配置仓库设备信息");


                    return Task.CompletedTask;


                }


                List<string> deviceStations = device.DeviceProDTOs.Select(x => x.DeviceChildCode).ToList();


                List<Dt_StationManger> stationMangers = _stationMangerRepository.QueryData(x => x.StationDeviceCode == device.DeviceCode);


                foreach (var item in stationMangers.Where(x => deviceStations.Contains(x.StationCode)))


@@ -75,6 +96,7 @@


                            {


                                if (!string.IsNullOrEmpty(conveyorLineInfoRead.Barcode))


                                {


                                    //入库申请任务


                                    WebResponseContent content = _taskService.RequestWMSTask(conveyorLineInfoRead.Barcode, item.StationCode);


                                    if (content.Status)


                                    {


@@ -98,7 +120,7 @@


                        {


                            if (!conveyorLineSignalRead.STB && !conveyorLineSignalRead.ACK && conveyorLineStatus.Online && !conveyorLineStatus.Goods && !conveyorLineStatus.Alarm && !conveyorLineSignalWrite.STB && !conveyorLineSignalWrite.ACK)


                            {


                                Dt_Task task = _taskRepository.QueryFirst(x => _taskService.TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == TaskStatusEnum.New.ObjToInt() && string.IsNullOrEmpty(x.TargetAddress) && !string.IsNullOrEmpty(x.NextAddress));


                                Dt_Task task = _taskRepository.QueryFirst(x => x.WarehouseId== warehouseDevice.WarehouseId && _taskService.TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == TaskStatusEnum.New.ObjToInt() && string.IsNullOrEmpty(x.TargetAddress) && !string.IsNullOrEmpty(x.NextAddress));


                                if (task != null)


                                {


                                    _taskService.UpdateTask(task, TaskStatusEnum.SC_Execute, nextAddress: item.StationCode, deviceCode: item.StackerCraneCode, targetAddress: item.StationCode);


@@ -116,6 +138,7 @@


                                        WriteError(item.StationName, $"未找到对应站台信息,设备编号:{item.StationCode},任务号:{task.TaskNum}");


                                        continue;


                                    }


                                    //入库申请分配货位


                                    string? locationCode = _taskService.RequestAssignLocation(task.TaskNum, stationManger.StackerCraneCode);


                                    if (string.IsNullOrEmpty(locationCode))


                                    {