1

source/ACSingleStore/FrmStoreBox.cs

@@ -371,6 +371,7 @@ namespace OnlineStore.ACSingleStore
                 if (IOManager.IOValue(IO_Type.Door_Limit).Equals(IO_VALUE.LOW))
                 if (IOManager.IOValue(IO_Type.Door_Limit).Equals(IO_VALUE.LOW))
                 {
                 {
                     lblWarnMsg.Text = lblWarnMsg.Text + "   " + dooropen;
                     lblWarnMsg.Text = lblWarnMsg.Text + "   " + dooropen;
+                    StoreManager.Store.SetWarnMsg("前门未关", "前门未关");
                 }
                 }
                 else if (store.Config.StoreDIList.ContainsKey(IO_Type.Door_LeftLimit) && IOManager.IOValue(IO_Type.Door_LeftLimit).Equals(IO_VALUE.LOW))
                 else if (store.Config.StoreDIList.ContainsKey(IO_Type.Door_LeftLimit) && IOManager.IOValue(IO_Type.Door_LeftLimit).Equals(IO_VALUE.LOW))
                 {
                 {
@@ -380,6 +381,10 @@ namespace OnlineStore.ACSingleStore
                 {
                 {
                     lblWarnMsg.Text = lblWarnMsg.Text + "   " + rdooropen;
                     lblWarnMsg.Text = lblWarnMsg.Text + "   " + rdooropen;
                 }
                 }
+                else {
+                    if (StoreManager.Store.WarnObj.WarnMsg.IndexOf("前门未关")!=-1)
+                        StoreManager.Store.SetWarnMsg("");
+                }
             }
             }
             //如果不在出入库中，且叉子上有信号，需要提示检查叉子
             //如果不在出入库中，且叉子上有信号，需要提示检查叉子
             if (store.storeRunStatus.Equals(StoreRunStatus.Runing) && IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
             if (store.storeRunStatus.Equals(StoreRunStatus.Runing) && IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))

source/ACSingleStore/Properties/AssemblyInfo.cs

@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SO951-HC-ACSingleStore 8bd88f13ec5e7ec2faebcee32f5fe58b522eb405")]
+[assembly: AssemblyProduct("SO951-HC-ACSingleStore fd1e4366da8300c3cc4261347a5ba92c58118031")]
 [assembly: AssemblyCopyright("Copyright ?  2017")]
 [assembly: AssemblyCopyright("Copyright ?  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyCulture("")]

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -743,7 +743,7 @@ namespace OnlineStore.DeviceLibrary
             StopMove(true);
             StopMove(true);
 
 
             storeRunStatus = StoreRunStatus.Wait;
             storeRunStatus = StoreRunStatus.Wait;
-            mainTimer.Enabled = false;
+            //mainTimer.Enabled = false;
             TimeSpan span = DateTime.Now - StartTime;
             TimeSpan span = DateTime.Now - StartTime;
             IsRun = false;
             IsRun = false;
             dlScanSocket.Close();
             dlScanSocket.Close();
@@ -974,6 +974,7 @@ namespace OnlineStore.DeviceLibrary
                 //绿灯闪
                 //绿灯闪
                 if ((StoreMove.MoveType.Equals(StoreMoveType.InStore) || StoreMove.MoveType.Equals(StoreMoveType.OutStore)
                 if ((StoreMove.MoveType.Equals(StoreMoveType.InStore) || StoreMove.MoveType.Equals(StoreMoveType.OutStore)
                   || storeRunStatus.Equals(StoreRunStatus.HomeMoving) || storeRunStatus.Equals(StoreRunStatus.Reset))
                   || storeRunStatus.Equals(StoreRunStatus.HomeMoving) || storeRunStatus.Equals(StoreRunStatus.Reset))
+                 //if ((storeRunStatus.Equals(StoreRunStatus.HomeMoving) || storeRunStatus.Equals(StoreRunStatus.Reset))
                  && IOManager.IOValue(IO_Type.AutoRun_HddLed).Equals(IO_VALUE.HIGH))
                  && 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);
@@ -984,7 +985,8 @@ namespace OnlineStore.DeviceLibrary
                     IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.HIGH);
                     IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.HIGH);
                 }
                 }
                 //黄灯
                 //黄灯
-                if (StoreMove.MoveType.Equals(StoreMoveType.InStore) || StoreMove.MoveType.Equals(StoreMoveType.OutStore) || TempOrHumidityIsAlarm || isTemp30M)
+                if (StoreMove.MoveType.Equals(StoreMoveType.InStore) || StoreMove.MoveType.Equals(StoreMoveType.OutStore)
+                    || TempOrHumidityIsAlarm || isTemp30M)
                 {
                 {
                     if (IOManager.IOValue(IO_Type.RunSign_HddLed).Equals(IO_VALUE.HIGH))
                     if (IOManager.IOValue(IO_Type.RunSign_HddLed).Equals(IO_VALUE.HIGH))
                     {
                     {
@@ -2009,6 +2011,7 @@ namespace OnlineStore.DeviceLibrary
                         }
                         }
                     }
                     }
                     bool needAlarm = false;
                     bool needAlarm = false;
+                    Debug.WriteLine($"IsInBlowing:{IsInBlowing},Max_Humidity:{Max_Humidity},humidity:{humidity}");
                     if (humidity <= Max_Humidity) {
                     if (humidity <= Max_Humidity) {
                         TempOrHumidityIsAlarm = false;
                         TempOrHumidityIsAlarm = false;
                         TempAlarmTime = DateTime.Now;
                         TempAlarmTime = DateTime.Now;