修改灯塔亮灯逻辑

source/ACSingleStore/Properties/Resource.zh-CN.resx

@@ -256,7 +256,9 @@
     <value> 关闭设备照明 </value>
     <value> 关闭设备照明 </value>
   </data>
   </data>
   <data name="FrmIOStatus_btnCloseDoor_Text" xml:space="preserve">
   <data name="FrmIOStatus_btnCloseDoor_Text" xml:space="preserve">
-    <value> 关闭单料门 </value>
+    <value> 关闭
+	
+门 </value>
   </data>
   </data>
   <data name="FrmIOStatus_btnCloseLed_Text" xml:space="preserve">
   <data name="FrmIOStatus_btnCloseLed_Text" xml:space="preserve">
     <value> 关闭相机辅助光源 </value>
     <value> 关闭相机辅助光源 </value>

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -971,15 +971,15 @@ namespace OnlineStore.DeviceLibrary
             try
             try
             {
             {
                 //                机器状态 顶灯显示 
                 //                机器状态 顶灯显示 
-                //                                              绿 黄  红
-                //机器复位中                             闪 灭   灭
-                //机器待机中                             亮 灭   灭
-                //机器出入库中                          闪 闪   灭
-                //温湿度超限报警中                   亮 闪   灭
-                //温湿度超限报警中超过30分钟  亮 闪   闪
-                //机器未启动                             灭 灭   灭
-                //机器设备故障(非温湿度)报警    亮   灭 闪
-                 
+                //                                    绿   黄   红
+                //机器复位中                            闪   闪   灭
+                //机器待机中                            亮   灭   灭
+                //机器出入库中                          闪   闪   灭
+                //温湿度超限报警中                       亮   闪   灭
+                //温湿度超限报警中超过30分钟              亮   闪   闪
+                //机器未启动                            灭   灭   灭
+                //机器设备故障(非温湿度)报警              亮   灭   闪
+
                 if (storeRunStatus <= StoreRunStatus.Wait)
                 if (storeRunStatus <= StoreRunStatus.Wait)
                 {
                 {
                     if (IOManager.IOValue(IO_Type.Alarm_HddLed).Equals(IO_VALUE.HIGH))
                     if (IOManager.IOValue(IO_Type.Alarm_HddLed).Equals(IO_VALUE.HIGH))
@@ -1036,15 +1036,17 @@ namespace OnlineStore.DeviceLibrary
                     if ((isBusy || isReset) && IOManager.IOValue(IO_Type.AutoRun_HddLed).Equals(IO_VALUE.HIGH))
                     if ((isBusy || isReset) && IOManager.IOValue(IO_Type.AutoRun_HddLed).Equals(IO_VALUE.HIGH))
                     {
                     {
                         IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.LOW);
                         IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.LOW);
+                        //IOManager.IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
                     }
                     }
                     else
                     else
                     {
                     {
                         //绿灯亮
                         //绿灯亮
                         IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.HIGH);
                         IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.HIGH);
+                        //IOManager.IOMove(IO_Type.RunSign_HddLed, IO_VALUE.HIGH);
                     }
                     }
 
 
                     //黄灯 复位待机时灭，出入库或温湿度报警时闪烁
                     //黄灯 复位待机时灭，出入库或温湿度报警时闪烁
-                    if (isBusy || TempOrHumidityIsAlarm || isTemp30M)
+                    if (isBusy || TempOrHumidityIsAlarm || isTemp30M || isReset)
                     {
                     {
                         if (IOManager.IOValue(IO_Type.RunSign_HddLed).Equals(IO_VALUE.HIGH))
                         if (IOManager.IOValue(IO_Type.RunSign_HddLed).Equals(IO_VALUE.HIGH))
                         {
                         {

source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs

@@ -557,11 +557,11 @@ namespace OnlineStore.DeviceLibrary
                     string singleOut = data[ParamDefine.singleOut];
                     string singleOut = data[ParamDefine.singleOut];
                     //bool isSingleOut = singleOut.ToLower().Equals("true");
                     //bool isSingleOut = singleOut.ToLower().Equals("true");
                     string[] posArray = posId.Split('#');
                     string[] posArray = posId.Split('#');
-                    if (!(posArray.Length == 2))
-                    {
-                        SetWarnMsgAndLog(ResourceControl.InStoreError, message, posId);
-                        return null;
-                    }
+                    //if (!(posArray.Length == 2))
+                    //{
+                    //    SetWarnMsgAndLog(ResourceControl.InStoreError, message, posId);
+                    //    return null;
+                    //}
 
 
                     int storeId = int.Parse(posArray[0]);
                     int storeId = int.Parse(posArray[0]);
                     //根据发送的posId获取位置列表
                     //根据发送的posId获取位置列表

source/DeviceLibrary/store/AC_Store.cs

@@ -123,7 +123,7 @@ namespace OnlineStore.DeviceLibrary
             serverConnectTimer = new System.Timers.Timer();
             serverConnectTimer = new System.Timers.Timer();
             serverConnectTimer.Interval = 1000;
             serverConnectTimer.Interval = 1000;
             serverConnectTimer.AutoReset = true;
             serverConnectTimer.AutoReset = true;
-            serverConnectTimer.Enabled = false;
+            serverConnectTimer.Enabled = true;
             //serverConnectTimer.Elapsed += server_connect_timer_Tick;
             //serverConnectTimer.Elapsed += server_connect_timer_Tick;
             IoCheckTimer = new System.Timers.Timer();
             IoCheckTimer = new System.Timers.Timer();
             IoCheckTimer.Interval = 200;
             IoCheckTimer.Interval = 200;