增加暂停抓料复选框

source/AssemblyLineClient/FrmLineStore.cs

@@ -1265,5 +1265,19 @@ namespace OnlineStore.AssemblyLine
             LineManager.TrayToOutLineTest = chbTrayTest.Checked; 
             LogUtil.info("界面点击勾选：" + chbTrayTest.Text + "=" + LineManager.TrayToOutLineTest); 
         }
+
+        private void chbDisGetWare_CheckedChanged(object sender, EventArgs e)
+        {
+            if (!LoadOk)
+            {
+                return;
+            }
+            if (LineManager.DisGetWare.Equals(chbDisGetWare.Checked))
+            {
+                return;
+            }
+            LineManager.DisGetWare = chbDisGetWare.Checked;
+            LogUtil.info("界面点击勾选：" + chbDisGetWare.Text + "=" + LineManager.DisGetWare);
+        }
     }
 }

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -342,10 +342,18 @@ namespace OnlineStore.DeviceLibrary
                 if (ScanCodeTask == null || ScanCodeTask.IsCompleted)
                 {
                     ClearTimeoutAlarm("扫码结束超时");
+                    ClearTimeoutAlarm("扫码执行结束超时");
+                    if (!LineManager.DisGetWare)
+                    {
+                        ClearTimeoutAlarm("启用抓料超时");
                         MoveInfo.NextMoveStep(LineMoveStep.FI_21_CylinderTake);
                         InLog("料盘移栽" + MoveInfo.SLog + "：上料横移取料端");
                         CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Give, IO_Type.SL_MoveCylinder_Take);
-                    ClearTimeoutAlarm("扫码执行结束超时");
+                    }
+                    else if (MoveInfo.IsTimeOut(60))
+                    {
+                        MoveTimeOut(MoveInfo, "启用抓料超时");
+                    }
                 }
                 else if (MoveInfo.IsTimeOut(60))
                 {

source/DeviceLibrary/assemblyLine/LineBean_Partial.cs

@@ -284,6 +284,10 @@ namespace OnlineStore.DeviceLibrary
             {
                 return false;
             }
+            if (LineManager.DisGetWare)
+            {
+                return false;
+            }
             MoveEquip move = MoveEquipMap[id];
             if (!move.NoAlarm() || move.waitInStoreList.Count > 0 || move.IsDebug || move.waitOutStoreList.Count > 0)
             {

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -536,7 +536,10 @@ namespace OnlineStore.DeviceLibrary
             {
                 return false;
             }
-
+           if(LineManager.DisGetWare)
+            {
+                return false;
+            }
             //如果正在出库执行中，不能拦截入库托盘
             if (MoveInfo.MoveType.Equals(LineMoveType.OutStore))
             {

source/DeviceLibrary/assemblymanager/ALineManager.cs

@@ -22,6 +22,8 @@ namespace OnlineStore.DeviceLibrary
         public static bool DisAllMove = false;
         public static bool TrayToOutLineTest = false;
 
+        public static bool DisGetWare = false;
+
         public static bool UseBuzzer = ConfigAppSettings.GetIntValue(Setting_Init.UseBuzzer).Equals(1);
         private static bool isInit = false;
         public static bool IsConnectServer = !ConfigAppSettings.GetValue(Setting_Init.http_server).Equals("");