1

source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs

@@ -696,7 +696,7 @@ namespace OnlineStore.DeviceLibrary
                     MoveInfo.NextMoveStep(StepEnum.BOX_H06_1_OtherAxis_Home);
                     LogInfo($"复位 {MoveInfo.SLog}：AB面压紧轴回原点");
                     ComAxis_A.HomeMove(MoveInfo);
-                    ComAxis_B.HomeMove(MoveInfo); 
+                    ComAxis_B.HomeMove(MoveInfo);
                     break;
                 case StepEnum.BOX_H06_1_OtherAxis_Home:
                     MoveInfo.NextMoveStep(StepEnum.BOX_H06_2_OtherAxis_Home);
@@ -825,52 +825,64 @@ namespace OnlineStore.DeviceLibrary
             //}
             //if (!runStatus.Equals(RunStatus.Runing))
             //    return;
+            int errSeconds = 20;
             TimeSpan timeSpanA = DateTime.Now - dtUpperA;
             TimeSpan tsUppA = DateTime.Now - errUpperA;
             TimeSpan tsUnA = DateTime.Now - errUnderA;
             TimeSpan tsUppB = DateTime.Now - errUpperB;
             TimeSpan tsUnB = DateTime.Now - errUnderB;
-            int errSeconds = 10;
-            if (IOValue(IO_Type.FeedingA_Instore_UpperArea_ReelCheck).Equals(IO_VALUE.LOW) && BufferDataManager.AInStoreInfo != null)
-            {
-                if (tsUppA.TotalSeconds > errSeconds)
-                    SetWarnMsg("A上进料暂存区有料盘，但信号未亮");
-            }
-            else
+            if (StoreManager.XLRStore.inputEquip.runStatus == RunStatus.Reset
+                || StoreManager.XLRStore.inputEquip.runStatus == RunStatus.HomeMoving)
             {
+                ClearSpecifiedAlarm("B上进料暂存区有料盘，但信号未亮");
+                ClearSpecifiedAlarm("B下出料暂存区有料盘，但信号未亮");
                 ClearSpecifiedAlarm("A上进料暂存区有料盘，但信号未亮");
-                errUpperA = DateTime.Now;
-            }
-            if (IOValue(IO_Type.FeedingA_Outstore_UnderArea_ReelCheck).Equals(IO_VALUE.LOW) && BufferDataManager.AOutStoreInfo != null)
-            {
-                if (tsUnA.TotalSeconds > errSeconds)
-                    SetWarnMsg("A下出料暂存区有料盘，但信号未亮");
-            }
-            else
-            {
                 ClearSpecifiedAlarm("A下出料暂存区有料盘，但信号未亮");
-                errUnderA = DateTime.Now;
-            }
-            if (IOValue(IO_Type.FeedingB_Instore_UpperArea_ReelCheck).Equals(IO_VALUE.LOW) && BufferDataManager.BInStoreInfo != null)
-            {
-                if (tsUppB.TotalSeconds > errSeconds)
-                    SetWarnMsg("B上进料暂存区有料盘，但信号未亮");
-            }
-            else
-            {
-                ClearSpecifiedAlarm("B上进料暂存区有料盘，但信号未亮");
-                errUpperB = DateTime.Now;
-            }
-            if (IOValue(IO_Type.FeedingB_Outstore_UnderArea_ReelCheck).Equals(IO_VALUE.LOW) && BufferDataManager.BOutStoreInfo != null)
-            {
-                if (tsUnB.TotalSeconds > errSeconds)
-                    SetWarnMsg("B下出料暂存区有料盘，但信号未亮");
             }
             else
             {
-                ClearSpecifiedAlarm("B下出料暂存区有料盘，但信号未亮");
-                errUnderB = DateTime.Now;
+                if (IOValue(IO_Type.FeedingA_Instore_UpperArea_ReelCheck).Equals(IO_VALUE.LOW) && BufferDataManager.AInStoreInfo != null)
+                {
+                    if (tsUppA.TotalSeconds > errSeconds)
+                        SetWarnMsg("A上进料暂存区有料盘，但信号未亮");
+                }
+                else
+                {
+                    ClearSpecifiedAlarm("A上进料暂存区有料盘，但信号未亮");
+                    errUpperA = DateTime.Now;
+                }
+                if (IOValue(IO_Type.FeedingA_Outstore_UnderArea_ReelCheck).Equals(IO_VALUE.LOW) && BufferDataManager.AOutStoreInfo != null)
+                {
+                    if (tsUnA.TotalSeconds > errSeconds)
+                        SetWarnMsg("A下出料暂存区有料盘，但信号未亮");
+                }
+                else
+                {
+                    ClearSpecifiedAlarm("A下出料暂存区有料盘，但信号未亮");
+                    errUnderA = DateTime.Now;
+                }
+                if (IOValue(IO_Type.FeedingB_Instore_UpperArea_ReelCheck).Equals(IO_VALUE.LOW) && BufferDataManager.BInStoreInfo != null)
+                {
+                    if (tsUppB.TotalSeconds > errSeconds)
+                        SetWarnMsg("B上进料暂存区有料盘，但信号未亮");
+                }
+                else
+                {
+                    ClearSpecifiedAlarm("B上进料暂存区有料盘，但信号未亮");
+                    errUpperB = DateTime.Now;
+                }
+                if (IOValue(IO_Type.FeedingB_Outstore_UnderArea_ReelCheck).Equals(IO_VALUE.LOW) && BufferDataManager.BOutStoreInfo != null)
+                {
+                    if (tsUnB.TotalSeconds > errSeconds)
+                        SetWarnMsg("B下出料暂存区有料盘，但信号未亮");
+                }
+                else
+                {
+                    ClearSpecifiedAlarm("B下出料暂存区有料盘，但信号未亮");
+                    errUnderB = DateTime.Now;
+                }
             }
+
             if (!runStatus.Equals(RunStatus.Runing))
                 return;
             if (IOValue(IO_Type.FeedingA_Instore_UpperArea_ReelCheck).Equals(IO_VALUE.HIGH) && BufferDataManager.AInStoreInfo != null