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

dengjunjie

22 小时以前 28a788d3fca51fb4fd2f668b90fa95e87c2633a1

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

@@ -3,6 +3,7 @@
using NetTaste;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Net.NetworkInformation;
@@ -141,6 +142,8 @@
                                    else
                                    {
                                        bool Work = false;
                                        try
                                        {
                                        if (device.IsConnected)
                                        {
                                            int i = 0;
@@ -157,6 +160,13 @@
                                            task.Remark = $"{device.DeviceCode}_Outboundboxon_{1}_{task.SourceAddress}";
                                        }
                                    }
                                        catch (Exception ex)
                                        {
                                            task.ExceptionMessage = $"【{task.SourceAddress}】写入3楼出库箱放到位失败";
                                            task.Remark = $"{device.DeviceCode}_Outboundboxon_{1}_{task.SourceAddress}"; throw;
                                        }
                                        
                                    }
                                    BaseDal.UpdateData(task);
                                }
                                //四楼 å‡ºåº“  
@@ -167,6 +177,8 @@
                                    else
                                    {
                                        bool Work = false;
                                        try
                                        {
                                        if (device.IsConnected)
                                        {
                                            int i = 0;
@@ -183,6 +195,14 @@
                                            task.Remark = $"{device.DeviceCode}_Emptyboxplacedinposition_{1}_{task.TargetAddress}";
                                        }
                                    }
                                        catch (Exception ex)
                                        {

                                            task.ExceptionMessage = $"【{task.TargetAddress}】写入4楼空箱放到位失败";
                                            task.Remark = $"{device.DeviceCode}_Emptyboxplacedinposition_{1}_{task.TargetAddress}";
                                        }
                                        
                                    }
                                    BaseDal.UpdateData(task);
                                }
                                // //四楼出提升机 å…¥åº“ ä¹‹å‰æ˜¯AGV_ToExecute  //要写成取货完成状态TakeFinish
@@ -193,6 +213,8 @@
                                    else
                                    {
                                        bool Work = false;
                                        try
                                        {
                                        if (device.IsConnected)
                                        {
                                            int i = 0;
@@ -209,6 +231,14 @@
                                            task.Remark = $"{device.DeviceCode}_Outboundboxretrievalcompleted_{1}_{task.SourceAddress}";
                                        }
                                    }
                                        catch (Exception ex)
                                        {

                                            task.ExceptionMessage = $"【{task.SourceAddress}】写入4楼出库取箱完成失败";
                                            task.Remark = $"{device.DeviceCode}_Outboundboxretrievalcompleted_{1}_{task.SourceAddress}";
                                        }
                                      
                                    }
                                    BaseDal.UpdateData(task);
                                }
                                //跨楼层
@@ -220,6 +250,8 @@
                                    {
                                        bool Wok = false;
                                        var Address = task.TaskType == TaskTypeEnum.Q3RK.ObjToInt() ? task.TargetAddress : task.SourceAddress;
                                        try
                                        {
                                        if (device.IsConnected)
                                        {
                                            int i = 0;
@@ -235,6 +267,14 @@
                                            task.ExceptionMessage = $"【{Address}】关闭请求进入失败！";
                                            task.Remark = $"{device.DeviceCode}_RequestToEnter_{false}_{Address}";
                                        }
                                        }
                                        catch (Exception ex)
                                        {

                                            task.ExceptionMessage = $"【{Address}】关闭请求进入失败！";
                                            task.Remark = $"{device.DeviceCode}_RequestToEnter_{false}_{Address}";
                                        }
                                        
                                    }
                                    BaseDal.UpdateData(task);
                                }
@@ -254,6 +294,8 @@
                                else
                                {
                                    bool Wok = false;
                                    try
                                    {
                                    if (device.IsConnected)
                                    {
                                        int i = 0;
@@ -270,6 +312,14 @@
                                        task.Remark = $"{device.DeviceCode}_Codereadingtriggered_{1}_TSJR3F";
                                    }
                                }
                                    catch (Exception ex)
                                    {

                                        task.ExceptionMessage = $"【TSJR3F】3楼读码触发失败！";
                                        task.Remark = $"{device.DeviceCode}_Codereadingtriggered_{1}_TSJR3F";
                                    }
                                    
                                }
                                task.TaskState = (int)TaskStatusEnum.CheckPalletCodeing;
                                BaseDal.UpdateData(task);
                            }