Merge branch 'master' of http://115.159.85.185:8098/r/ZhuZhouYouRuiKe/YangJ...

Zhang-Hong-Lin

2025-03-07 6513c35280f2283ff53b36bdc0c9d83aba475f8d

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/OHT/OHTJob.cs

@@ -54,10 +54,10 @@
                var ZXJdevice = Storage.Devices.Find(v => v.DeviceName == "阳极整形机");
                //规整机PLC对象
                var GZJevice = Storage.Devices.Find(v => v.DeviceName == "阳极规整机");
                if (!device.Communicator.IsConnected || !ZXJdevice.Communicator.IsConnected || !GZJevice.Communicator.IsConnected)
                {
                    return Task.CompletedTask;
                }
                //if (!device.Communicator.IsConnected || !ZXJdevice.Communicator.IsConnected || !GZJevice.Communicator.IsConnected)
                //{
                //    return Task.CompletedTask;
                //}
                try
                {
                    #region å¤©è½¦å®Œæˆä»»åŠ¡é€»è¾‘
@@ -71,11 +71,13 @@
                        {
                            throw new Exception(string.Format("天车取货完成任务未查询到任务号{0}", oHTReadData.R_TaskNumber));
                        }
                        //入库
                        if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound)
                        {
                            //如果任务的状态是天车入库取货执行中
                            //如果任务的状态是否是天车入库取货执行中
                            if (nawtask.TaskState == (int)TaskInStatusEnum.Line_InGrabExecuting)
                            {
                                //修改状态
                                WebResponseContent result = _taskService.UpdateTaskStatusToLine_Ingrab(nawtask);
                                if (result.Status)
                                {
@@ -83,11 +85,13 @@
                                }
                            }
                        }
                        //出库
                        else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound)
                        {
                            //如果任务状态是天车出库取货执行中
                            //如果任务状态是否是天车出库取货执行中
                            if (nawtask.TaskState == (int)TaskOutStatusEnum.Line_OutGrabExecuting)
                            {
                                //修改状态
                                WebResponseContent result = _taskService.UpdateTaskStatusToLine_Outgrab(nawtask);
                                if (result.Status)
                                {
@@ -95,8 +99,10 @@
                                }
                            }
                        }
                        //直接出库
                        else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
                        {
                            //修改状态
                            WebResponseContent result = _taskService.UpdateTaskStatusToLine_Outgrab(nawtask);
                            if (result.Status)
                            {