Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPu...

dengjunjie

7 天以前 5ecbc9996ab71593cb69ed21034de57f7cd162d7

Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs

@@ -103,11 +103,22 @@
                                    if (device == null) task.ExceptionMessage = "未找到提升机信息";
                                    else
                                    {
                                        DeviceProDTO? deviceProDTO = device.DeviceProDTOs.FirstOrDefault((DeviceProDTO x) => x.DeviceProParamName == HoistEnum.Inboundboxon.ToString());//放到位了
                                        bool Work = false;
                                        if (device.IsConnected)
                                            device.SetValue(HoistEnum.Inboundboxon, 1);
                                        else
                                            task.ExceptionMessage = "提升机信息设备连接失败";
                                        {
                                            int i = 0;
                                            while (!Work && i <= 3)
                                            {
                                                i++;
                                                Work = device.SetValue(HoistEnum.Inboundboxon, 1, task.TargetAddress);
                                                Thread.Sleep(500);
                                            }
                                        }
                                        if (!Work)
                                        {
                                            task.ExceptionMessage = $"【{task.TargetAddress}】写入3楼入库箱放到位失败";
                                            task.Remark = $"{device.DeviceCode}_Inboundboxon_{1}_{task.TargetAddress}";
                                        }
                                    }
                                    BaseDal.UpdateData(task);
                                }
@@ -119,10 +130,22 @@
                                    if (device == null) task.ExceptionMessage = "未找到提升机信息";
                                    else
                                    {
                                        bool Work = false;
                                        if (device.IsConnected)
                                            device.SetValue(HoistEnum.Outboundboxon, 1);//出库完成
                                        else
                                            task.ExceptionMessage = "提升机信息设备连接失败";
                                        {
                                            int i = 0;
                                            while (!Work && i <= 3)
                                            {
                                                i++;
                                                Work = device.SetValue(HoistEnum.Outboundboxon, 1, task.SourceAddress);//出库完成
                                                Thread.Sleep(500);
                                            }
                                        }
                                        if (!Work)
                                        {
                                            task.ExceptionMessage = $"【{task.SourceAddress}】写入3楼出库箱放到位失败";
                                            task.Remark = $"{device.DeviceCode}_Outboundboxon_{1}_{task.SourceAddress}";
                                        }
                                    }
                                    BaseDal.UpdateData(task);
                                }
@@ -133,10 +156,22 @@
                                    if (device == null) task.ExceptionMessage = "未找到提升机信息";
                                    else
                                    {
                                        bool Work = false;
                                        if (device.IsConnected)
                                            device.SetValue(HoistEnum.Emptyboxplacedinposition, 1);
                                        else
                                            task.ExceptionMessage = "提升机信息设备连接失败";
                                        {
                                            int i = 0;
                                            while (!Work && i <= 3)
                                            {
                                                i++;
                                                Work = device.SetValue(HoistEnum.Emptyboxplacedinposition, 1, task.TargetAddress);
                                                Thread.Sleep(500);
                                            }
                                        }
                                        if (!Work)
                                        {
                                            task.ExceptionMessage = $"【{task.TargetAddress}】写入4楼空箱放到位失败";
                                            task.Remark = $"{device.DeviceCode}_Emptyboxplacedinposition_{1}_{task.TargetAddress}";
                                        }
                                    }
                                    BaseDal.UpdateData(task);
                                }
@@ -147,11 +182,22 @@
                                    if (device == null) task.ExceptionMessage = "未找到提升机信息";
                                    else
                                    {
                                        bool Work = false;
                                        if (device.IsConnected)
                                            //写以一个出库完成信号
                                            device.SetValue(HoistEnum.Outboundboxretrievalcompleted, 1, task.SourceAddress);
                                        else
                                            task.ExceptionMessage = "提升机信息设备连接失败";
                                        {
                                            int i = 0;
                                            while (!Work && i <= 3)
                                            {
                                                i++;
                                                Work = device.SetValue(HoistEnum.Outboundboxretrievalcompleted, 1, task.SourceAddress);
                                                Thread.Sleep(500);
                                            }
                                        }
                                        if (!Work)
                                        {
                                            task.ExceptionMessage = $"【{task.SourceAddress}】写入4楼出库取箱完成失败";
                                            task.Remark = $"{device.DeviceCode}_Outboundboxretrievalcompleted_{1}_{task.SourceAddress}";
                                        }
                                    }
                                    BaseDal.UpdateData(task);
                                }
@@ -197,11 +243,22 @@
                                if (device == null) task.ExceptionMessage = "未找到提升机信息";
                                else
                                {
                                    bool Wok = false;
                                    if (device.IsConnected)
                                        //打开扫码器
                                        device.SetValue<HoistEnum, short>(HoistEnum.Codereadingtriggered, 1);
                                    else
                                        task.ExceptionMessage = "提升机信息设备连接失败";
                                    {
                                        int i = 0;
                                        while (!Wok && i <= 3)
                                        {
                                            i++;
                                            Wok = device.SetValue<HoistEnum, short>(HoistEnum.Codereadingtriggered, 1, "TSJR3F");
                                            Thread.Sleep(500);
                                        }
                                    }
                                    if (!Wok)
                                    {
                                        task.ExceptionMessage = $"【TSJR3F】3楼读码触发失败！";
                                        task.Remark = $"{device.DeviceCode}_Codereadingtriggered_{1}_TSJR3F";
                                    }
                                }
                                task.TaskState = (int)TaskStatusEnum.CheckPalletCodeing;
                                BaseDal.UpdateData(task);