增加托盘顺序检测功能NeedCheckTray的开关选项。

source/AssemblyLineClient/FrmLineStore.cs

@@ -114,7 +114,7 @@ namespace OnlineStore.AssemblyLine
             this.notifyIcon1.Text = title;
             int autoValue = ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun);
             chbAutoRun.Checked = autoValue.Equals(1);
-
+            chbTrayCheck.Checked = TrayManager.NeedCheckTray;
             LoadStoreData();
             LoadListView();
 
@@ -271,14 +271,14 @@ namespace OnlineStore.AssemblyLine
                     //如果料仓还在运行状态，先关闭料仓
                     if (!lineBean.runStatus.Equals(LineRunStatus.Wait))
                     {
-                        LogUtil.info(LOGGER, "即将退出程序，停止" + lineBean.Name + "运行 ");
+                        LogUtil.info( "即将退出程序，停止" + lineBean.Name + "运行 ");
                         lineBean.StopRun();
                     }
                     foreach (EquipBase equip in lineBean.AllEquipMap.Values)
                     {
                         if (equip.runStatus > LineRunStatus.Wait)
                         {
-                            LogUtil.info(LOGGER, "即将退出程序，停止" + equip.Name + "运行 ");
+                            LogUtil.info( "即将退出程序，停止" + equip.Name + "运行 ");
                             equip.StopRun();
                         }
                     }
@@ -328,7 +328,7 @@ namespace OnlineStore.AssemblyLine
                 MessageBox.Show(lineBean.Name + "当前状态：" + lineBean.runStatus + "，不能启动！");
                 return;
             }
-            LogUtil.info(LOGGER, "开始启动");
+            LogUtil.info( "点击 开始启动");
             startTimer.Interval = 300;
             startTimer.Elapsed += timer_Elapsed;
             startTimer.AutoReset = false;
@@ -955,5 +955,20 @@ namespace OnlineStore.AssemblyLine
             LogUtil.info("勾选：UseBuzzer =" + LineManager.UseBuzzer);
             ConfigAppSettings.SaveValue(Setting_Init.UseBuzzer, (LineManager.UseBuzzer ? 1 : 0));
         }
+
+        private void chbTrayCheck_CheckedChanged(object sender, EventArgs e)
+        {
+            if (!LoadOk)
+            {
+                return;
+            }
+            if (chbTrayCheck.Checked.Equals(TrayManager.NeedCheckTray))
+            {
+                return;
+            }
+            TrayManager.NeedCheckTray = chbTrayCheck.Checked;
+            LogUtil.info("勾选：启用托盘顺序检测 NeedCheckTray =" + TrayManager.NeedCheckTray);
+            ConfigAppSettings.SaveValue(Setting_Init.NeedCheckTray, (TrayManager.NeedCheckTray ? 1 : 0));
+        }
     }
 }

source/AssemblyLineClient/记录.txt

@@ -272,7 +272,8 @@ PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=800
 			 上料模块夹走料盘后，需要判断信号是否消失
 
 
-
+20200308
+增加托盘顺序检测功能NeedCheckTray的开关选项。
 
 
 

source/Common/Setting_Init.cs

@@ -88,5 +88,6 @@ namespace OnlineStore.Common
         public static string MaxTrayNum = "MaxTrayNum";
 
         public static string UseBuzzer = "UseBuzzer";
+        public static string NeedCheckTray = "NeedCheckTray";
     }
 }

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -395,14 +395,16 @@ namespace OnlineStore.DeviceLibrary
         /// <returns></returns>
         private bool CheckIsNeedOutStore()
         {
+            if (currTrayNum <= 0)
+            {
+                return false;
+            }
             bool isFull = TrayManager.TrayIsFull(currTrayNum);
 
             bool moveOk = (IsBigStore() && MoveInfo.MoveStep >= LineMoveStep.MO_55_CylinderUp) || MoveInfo.MoveStep >= LineMoveStep.MO_56_CylinderAfter;
             if (MoveInfo.MoveType.Equals(LineMoveType.OutStore) && moveOk
                  && (!MoveInfo.MoveStep.Equals(LineMoveStep.MO_60_CylinderUp)))
-            {
-
-
+            { 
                 if (isFull.Equals(false))
                 {
                     LogInfo(" 出库中，拦截空托盘【 " + currTrayNum + "】~");
@@ -417,6 +419,10 @@ namespace OnlineStore.DeviceLibrary
         /// <returns></returns>
         private bool CheckIsNeedInStore()
         {
+            if (currTrayNum <= 0)
+            {
+                return false;
+            }
             bool isfull = TrayManager.TrayIsFull(currTrayNum);
             //LogInfo("***************入库*****验证入库编号，托盘号【" + currTrayNum + "】,isfull【" + isfull + "】");
             //FixtureCodeInfo code = GetBox().currInOutFixture;

source/DeviceLibrary/assemblymanager/TrayManager.cs

@@ -139,9 +139,13 @@ namespace OnlineStore.DeviceLibrary
             }
             return false;
         }
-        internal static bool CheckIsRightNum(int trayNum,int preTrayNum, bool isCanUpdateMax = true)
+        public  static bool NeedCheckTray = ConfigAppSettings.GetIntValue(Setting_Init.NeedCheckTray).Equals(1);
+        internal static bool CheckIsRightNum(int trayNum, int preTrayNum, bool isCanUpdateMax = true)
         {
-            return true;
+            if (!NeedCheckTray)
+            {
+                return true;
+            }
             int defNext = preTrayNum + 1;
             if (preTrayNum.Equals(0) || MaxTrayNum.Equals(0) || trayNum.Equals(defNext))
             {