伺服运动状态发送给服务器

source/ACSingleStore/ResourceCulture.cs

 using OnlineStore.Common;
 using OnlineStore.Common;
 using OnlineStore.DeviceLibrary;
 using OnlineStore.DeviceLibrary;
+using OnlineStore.LoadCSVLibrary;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Globalization;
@@ -31,7 +32,8 @@ namespace OnlineStore.ACSingleStore
         {
         {
             ResourceControl.GetStrEvent += GetString;
             ResourceControl.GetStrEvent += GetString;
             ResourceControl.GetStringEvent += GetString;
             ResourceControl.GetStringEvent += GetString;
-         
+            CSVResourceControl.GetStrEvent += GetString;
+            CSVResourceControl.GetStringEvent += GetString;
             CodeLibrary.CodeResourceControl.GetLanguageEvent += GetLanguage; 
             CodeLibrary.CodeResourceControl.GetLanguageEvent += GetLanguage; 
             if (string.IsNullOrEmpty(name))
             if (string.IsNullOrEmpty(name))
             {
             {

source/Common/bean/Bean.cs

@@ -200,5 +200,18 @@ namespace OnlineStore.Common
         /// 温度报警值
         /// 温度报警值
         /// </summary>
         /// </summary>
         public static string maxTemperature = "temp";
         public static string maxTemperature = "temp";
+
+        /// <summary>
+        /// 升降轴
+        /// </summary>
+        public static string updownAxis = "updownAxis";
+        /// <summary>
+        /// 旋转轴
+        /// </summary>
+        public static string middleAxis = "middleAxis";
+        /// <summary>
+        /// 进出轴
+        /// </summary>
+        public static string inoutAxis = "inoutAxis";
     }
     }
 }
 }

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -1683,12 +1683,47 @@ namespace OnlineStore.DeviceLibrary
                 boxStatus.humidity = param.Humidity.ToString();
                 boxStatus.humidity = param.Humidity.ToString();
                 boxStatus.temperature = param.Temperate.ToString();
                 boxStatus.temperature = param.Temperate.ToString();
             }
             }
+
+            //增加伺服的运动状态，1=运动中，0=停止
+            boxStatus.data.Add(ParamDefine.updownAxis, 0.ToString()); 
+            boxStatus.data.Add(ParamDefine.inoutAxis, 0.ToString());
+            boxStatus.data.Add(ParamDefine.middleAxis, 0.ToString());
+            try
+            {
+                if (StoreMove.IsInWait && (storeRunStatus.Equals(StoreRunStatus.HomeMoving) || storeRunStatus.Equals(StoreRunStatus.Busy) || storeRunStatus.Equals(StoreRunStatus.Reset)))
+                { 
+                    List<WaitResultInfo> waitresult = StoreMove.WaitList;
+                    foreach (WaitResultInfo wait in waitresult)
+                    {
+                        if (wait.WaitType == 1 && wait.AxisInfo != null)
+                        {
+                            if (wait.AxisInfo.IsSameAxis(Config.InOut_Axis))
+                            {
+                                boxStatus.data[ParamDefine.inoutAxis] = 1.ToString();
+                            }
+                            else if (wait.AxisInfo.IsSameAxis(Config.UpDown_Axis))
+                            {
+                                boxStatus.data[ParamDefine.updownAxis] = 1.ToString();
+                            }
+                            else if (wait.AxisInfo.IsSameAxis(Config.Middle_Axis))
+                            {
+                                boxStatus.data[ParamDefine.middleAxis] = 1.ToString();
+                            }
+                        } 
+                    }
+                }
+            }catch(Exception ex)
+            {
+                LogUtil.error("获取轴状态出错："+ex.ToString());
+            }
+
             lineOperation.boxStatus.Add(StoreID, boxStatus);
             lineOperation.boxStatus.Add(StoreID, boxStatus);
 
 
             if (!alarmType.Equals(StoreAlarmType.None))
             if (!alarmType.Equals(StoreAlarmType.None))
             {
             {
                 lineOperation.alarmList.Add(alarmInfo);
                 lineOperation.alarmList.Add(alarmInfo);
             }
             }
+           
             return lineOperation;
             return lineOperation;
         }
         }
 
 

source/LoadCVSLibrary/CSVResourceControl.cs

@@ -5,7 +5,7 @@ using System.Text;
 
 
 namespace OnlineStore.LoadCSVLibrary
 namespace OnlineStore.LoadCSVLibrary
 {
 {
-    class CSVResourceControl
+   public class CSVResourceControl
     {
     {
         public delegate string GetStrDelegate(string id, string defaultStr);
         public delegate string GetStrDelegate(string id, string defaultStr);
         public static event GetStrDelegate GetStrEvent;
         public static event GetStrDelegate GetStrEvent;

source/LoadCVSLibrary/storeConfig/ConfigItemBase.cs

@@ -141,6 +141,14 @@ namespace OnlineStore.LoadCSVLibrary
             }
             }
             return false;
             return false;
         }
         }
+        public bool IsSameAxis(ConfigMoveAxis axis)
+        {
+            if (DeviceName.Equals(axis.DeviceName) && axis.GetAxisValue().Equals(GetAxisValue()))
+            {
+                return true;
+            }
+            return false;
+        }
         public bool PositionIsHasLimit(){
         public bool PositionIsHasLimit(){
             if (PositionMin.Equals(PositionMax))
             if (PositionMin.Equals(PositionMax))
             {
             {