是否有正确条码逻辑修改。夹爪夹料时超时报警时间修改

source/AssemblyLineClient/记录.txt

-
+20200426
+
+1,出料机构的料架rfid上传到环形线。
+2,环形线增加夹爪忽略的料号配置，此类料盘夹爪不检测是否有料
+
+
+
 夹爪后续调整
 夹爪后续调整
 1.用自带软件连接后，PID调节改大，改为9或者10
 1.用自带软件连接后，PID调节改大，改为9或者10
 2.大料速度改小，目标20，先改成100试下
 2.大料速度改小，目标20，先改成100试下

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -390,6 +390,7 @@ namespace OnlineStore.DeviceLibrary
                 if (UpdownIsInP1())
                 if (UpdownIsInP1())
                 {
                 {
                     MoveInfo.NextMoveStep(LineMoveStep.FI_25_CheckTray);
                     MoveInfo.NextMoveStep(LineMoveStep.FI_25_CheckTray);
+                    MoveInfo.TimeOutSeconds = 5;
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_AxisLocationCheck, IO_VALUE.LOW));
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_AxisLocationCheck, IO_VALUE.LOW));
                     if (LineManager.NeedWaitHassReel(lastcode))
                     if (LineManager.NeedWaitHassReel(lastcode))
                     {
                     {

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -371,6 +371,7 @@ namespace OnlineStore.DeviceLibrary
                             MoveInfo.NextMoveStep(LineMoveStep.MO_57_WaitHasReel);
                             MoveInfo.NextMoveStep(LineMoveStep.MO_57_WaitHasReel);
                             OutLog("出库 " + MoveInfo.SLog + ":  等待夹爪有料", 1);
                             OutLog("出库 " + MoveInfo.SLog + ":  等待夹爪有料", 1);
                             MoveInfo.WaitList.Add(WaitResultInfo.WaitClampHasReel());
                             MoveInfo.WaitList.Add(WaitResultInfo.WaitClampHasReel());
+                            MoveInfo.TimeOutSeconds = 5;
                         }
                         }
                     }
                     }
                 }
                 }
@@ -597,6 +598,7 @@ namespace OnlineStore.DeviceLibrary
                     MoveInfo.NextMoveStep(LineMoveStep.MI_07_WaitHasReel);
                     MoveInfo.NextMoveStep(LineMoveStep.MI_07_WaitHasReel);
                     InLog("入库 " + MoveInfo.SLog + ":  等待夹爪有料");
                     InLog("入库 " + MoveInfo.SLog + ":  等待夹爪有料");
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitClampHasReel());
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitClampHasReel());
+                    MoveInfo.TimeOutSeconds = 5;
                 }
                 }
             }
             }
             else if (MoveInfo.IsStep(LineMoveStep.MI_07_WaitHasReel))
             else if (MoveInfo.IsStep(LineMoveStep.MI_07_WaitHasReel))

source/DeviceLibrary/assemblymanager/ALineManager.cs

@@ -289,6 +289,7 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             if (PnList == null)
             if (PnList == null)
             {
             {
+                PnList = new List<string>();
                 string config = ConfigAppSettings.GetValue(Setting_Init.PNList);
                 string config = ConfigAppSettings.GetValue(Setting_Init.PNList);
                 string[] array = config.Split('#');
                 string[] array = config.Split('#');
                 foreach (string s in array)
                 foreach (string s in array)

source/DeviceLibrary/baan/ClampJawBean.cs

@@ -64,6 +64,7 @@ namespace OnlineStore.DeviceLibrary
                     //有一个到位就算到位
                     //有一个到位就算到位
                     moveInfo.OneWaitCanEndStep = true;
                     moveInfo.OneWaitCanEndStep = true;
                 }
                 }
+                moveInfo.TimeOutSeconds = 5;
             }
             }
         }
         }
 
 

source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs

@@ -289,20 +289,24 @@ namespace OnlineStore.DeviceLibrary
 
 
         public  static bool HasRightCode(params string[] codes)
         public  static bool HasRightCode(params string[] codes)
         {
         {
+            //640104 * 3331001202 * 210417624 * 600 * 0011
             //分号分割后长度=4，L,E,B,R 
             //分号分割后长度=4，L,E,B,R 
             try
             try
             {
             {
                 foreach (string code in codes)
                 foreach (string code in codes)
                 {
                 {
-                    string[] strarray = code.Split(';');
-                    if (strarray.Length == 4)
+                    string[] strarray = code.Split('*');
+                    if (strarray.Length == 5)
                     {
                     {
-                        if (strarray[0].StartsWith("L") &&
-                            strarray[1].StartsWith("E") &&
-                            strarray[2].StartsWith("B"))
+                        try
                         {
                         {
+                            int num = Convert.ToInt32(strarray[3].Trim());
                             return true;
                             return true;
+                        }catch(Exception ex)
+                        {
+                            return false;
                         }
                         }
+                       
                     }
                     }
                 }
                 }
             }
             }

source/DeviceLibrary/model/LineMoveInfo.cs

@@ -106,6 +106,7 @@ namespace OnlineStore.DeviceLibrary
         }
         }
         public void NextMoveStep(LineMoveStep step)
         public void NextMoveStep(LineMoveStep step)
         {
         {
+            TimeOutSeconds = 60;
             PreMoveStep = moveStep;
             PreMoveStep = moveStep;
             moveStep = step;
             moveStep = step;
             LastSetpTime = DateTime.Now; 
             LastSetpTime = DateTime.Now; 
@@ -126,6 +127,7 @@ namespace OnlineStore.DeviceLibrary
         }
         }
         public void NewMove(LineMoveType type )
         public void NewMove(LineMoveType type )
         {
         {
+            TimeOutSeconds = 60;
             moveStep = LineMoveStep.Wait;
             moveStep = LineMoveStep.Wait;
             this.moveType = type; 
             this.moveType = type; 
             LastSetpTime = DateTime.Now;
             LastSetpTime = DateTime.Now;
@@ -135,6 +137,7 @@ namespace OnlineStore.DeviceLibrary
         }
         }
         public void NewMove(LineMoveType type, InOutParam param)
         public void NewMove(LineMoveType type, InOutParam param)
         {
         {
+            TimeOutSeconds = 60;
             moveStep = LineMoveStep.Wait;
             moveStep = LineMoveStep.Wait;
             this.moveType = type;
             this.moveType = type;
             this.MoveParam = param;
             this.MoveParam = param;