高普立体库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
dengjunjie
6 天以前 3b7569285434bb38736627821f7d7eb34fabca28 
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskJob.cs


@@ -2,6 +2,7 @@


using HslCommunication;


using HslCommunication.Core;


using Microsoft.VisualBasic.FileIO;


using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;


using Quartz;


using SixLabors.ImageSharp.PixelFormats;


using SqlSugar;


@@ -15,12 +16,14 @@


using WIDESEAWCS_Common.TaskEnum;


using WIDESEAWCS_Communicator;


using WIDESEAWCS_Core.BaseRepository;


using WIDESEAWCS_Core.Enums;


using WIDESEAWCS_Core.Helper;


using WIDESEAWCS_IBasicInfoService;


using WIDESEAWCS_ITaskInfoService;


using WIDESEAWCS_Model.Models;


using WIDESEAWCS_QuartzJob;


using WIDESEAWCS_QuartzJob.DeviceBase;


using WIDESEAWCS_QuartzJob.DTO;


using WIDESEAWCS_QuartzJob.StackerCrane.Enum;




namespace WIDESEAWCS_Tasks


@@ -54,6 +57,29 @@


                SendNewTask();




                SendWaitToTask();




                #region 澶勭悊鍐欏叆璁惧淇″彿寮傚父浠诲姟


                var tasks = _taskService.Repository.QueryData(x => x.TaskState == TaskStatusEnum.Finish.ObjToInt() && !string.IsNullOrEmpty(x.Remark));


                if (tasks.Count > 0)


                {


                    List<Dt_Task> list = new List<Dt_Task>();


                    foreach (var item in tasks)


                    {


                        var infos = item.Remark.Split("_");


                        var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == infos[0]) as OtherDevice;


                        if (device != null && device.IsConnected)


                        {


                            DeviceProDTO? devicePro = device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == infos[1] && x.DeviceChildCode == infos[3]);


                            if (devicePro != null)


                            {


                                var W = device.Communicator.WriteObj(devicePro.DeviceProAddress, devicePro.DeviceDataType, infos[2]);


                                if (W) list.Add(item);


                            }


                        }


                    }


                    _taskService.Repository.DeleteAndMoveIntoHty(list, OperateTypeEnum.鑷姩鍒犻櫎);


                }


                #endregion


            }


            catch (Exception ex)


            {