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

yanjinhui

10 小时以前 0875bfa35d389e238ae82142ce45b71c9715133b

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

@@ -102,36 +102,39 @@
                                //入提升机
                                if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt() && task.TaskState == (int)TaskStatusEnum.CheckPalletCodeFinish)
                                {
                                    var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
                                    if (device == null) task.ExceptionMessage = "未找到提升机信息";
                                    else
                                    if (task.CurrentAddress==task.TargetAddress)
                                    {
                                        bool Work = false;
                                        try
                                        var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
                                        if (device == null) task.ExceptionMessage = "未找到提升机信息";
                                        else
                                        {
                                            if (device.IsConnected)
                                            bool Work = false;
                                            try
                                            {
                                                int i = 0;
                                                while (!Work && i <= 3)
                                                if (device.IsConnected)
                                                {
                                                    i++;
                                                    Work = device.SetValue(HoistEnum.Inboundboxon, 1, task.TargetAddress);
                                                    Thread.Sleep(500);
                                                    int i = 0;
                                                    while (!Work && i <= 3)
                                                    {
                                                        i++;
                                                        Work = device.SetValue(HoistEnum.Inboundboxon, 1, task.CurrentAddress);
                                                        Thread.Sleep(500);
                                                    }
                                                }
                                                if (!Work)
                                                {
                                                    task.ExceptionMessage = $"【{task.CurrentAddress}】写入3楼入库箱放到位失败";
                                                    task.Remark = $"{device.DeviceCode}_Inboundboxon_{1}_{task.CurrentAddress}";
                                                }
                                            }
                                            if (!Work)
                                            catch (Exception ex)
                                            {
                                                task.ExceptionMessage = $"【{task.TargetAddress}】写入3楼入库箱放到位失败";
                                                task.Remark = $"{device.DeviceCode}_Inboundboxon_{1}_{task.TargetAddress}";
                                                task.ExceptionMessage = $"【{task.CurrentAddress}】写入3楼入库箱放到位失败！{ex.Message}";
                                                task.Remark = $"{device.DeviceCode}_Inboundboxon_{1}_{task.CurrentAddress}";
                                            }
                                        }
                                        catch (Exception ex)
                                        {
                                            task.ExceptionMessage = $"【{task.TargetAddress}】写入3楼入库箱放到位失败！{ex.Message}";
                                            task.Remark = $"{device.DeviceCode}_Inboundboxon_{1}_{task.TargetAddress}";
                                        }
                                        BaseDal.UpdateData(task);
                                    }
                                    BaseDal.UpdateData(task);
                                }

                                //3 å‡ºæå‡æœº ä¹‹å‰æ˜¯AGV_ToExecute
@@ -162,7 +165,7 @@
                                        }
                                        catch (Exception ex)
                                        {
                                            task.ExceptionMessage = $"【{task.SourceAddress}】写入3楼出库箱放到位失败";
                                            task.ExceptionMessage = $"【{task.SourceAddress}】写入3楼出库箱放到位失败{ex.Message}";
                                            task.Remark = $"{device.DeviceCode}_Outboundboxon_{1}_{task.SourceAddress}"; throw;
                                        }

@@ -198,7 +201,7 @@
                                        catch (Exception ex)
                                        {

                                            task.ExceptionMessage = $"【{task.TargetAddress}】写入4楼空箱放到位失败";
                                            task.ExceptionMessage = $"【{task.TargetAddress}】写入4楼空箱放到位失败{ex.Message}";
                                            task.Remark = $"{device.DeviceCode}_Emptyboxplacedinposition_{1}_{task.TargetAddress}";
                                        }

@@ -234,7 +237,7 @@
                                        catch (Exception ex)
                                        {

                                            task.ExceptionMessage = $"【{task.SourceAddress}】写入4楼出库取箱完成失败";
                                            task.ExceptionMessage = $"【{task.SourceAddress}】写入4楼出库取箱完成失败{ex.Message}";
                                            task.Remark = $"{device.DeviceCode}_Outboundboxretrievalcompleted_{1}_{task.SourceAddress}";
                                        }

@@ -271,7 +274,7 @@
                                        catch (Exception ex)
                                        {

                                            task.ExceptionMessage = $"【{Address}】关闭请求进入失败！";
                                            task.ExceptionMessage = $"【{Address}】关闭请求进入失败！{ex.Message}";
                                            task.Remark = $"{device.DeviceCode}_RequestToEnter_{false}_{Address}";
                                        }

@@ -315,7 +318,7 @@
                                    catch (Exception ex)
                                    {

                                        task.ExceptionMessage = $"【TSJR3F】3楼读码触发失败！";
                                        task.ExceptionMessage = $"【TSJR3F】3楼读码触发失败！{ex.Message}";
                                        task.Remark = $"{device.DeviceCode}_Codereadingtriggered_{1}_TSJR3F";
                                    }