1

source/DeviceLibrary/assemblyLine/DischargeLine_Partial.cs

@@ -58,6 +58,7 @@ namespace OnlineStore.DeviceLibrary
                 LastCodeList = new List<string>();
              //   LastHeight = 0;
                 LastWidth = 0;
+                scanCodeCount = 0;
                 return true;
             }
             else
@@ -68,28 +69,16 @@ namespace OnlineStore.DeviceLibrary
         }
         private List<string> LastCodeList = new List<string>();
         private int LastWidth = 0;
-        protected override void OutStoreProcess()
-        {
-            if (MoveInfo.IsInWait)
-            {
-                CheckWait(MoveInfo);
-            }
-            if (SecondMoveInfo.IsInWait)
-            {
-                CheckWait(SecondMoveInfo);
-            }
-            if (MoveInfo.IsInWait)
-            {
-                return;
-            }
-            if (MoveInfo.MoveStep.Equals(LineMoveStep.DO_01_WaitTime))
+        private int  scanCodeCount=0;
+        private void ScanCode()
         {
             MoveInfo.NextMoveStep(LineMoveStep.DO_02_ScanCode);
 
             List<string> cameraList = Config.GetCameraList();
             if (cameraList.Count > 0)
             {
-                    LogInfo(hengyiName+ "出口有料，开始扫码");
+                scanCodeCount++;
+                LogInfo(hengyiName + "出口有料，开始第【"+scanCodeCount+"】次扫码");
                 MoveInfo.OneWaitCanEndStep = true;
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitDLineScanCode());
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(6000));
@@ -113,10 +102,28 @@ namespace OnlineStore.DeviceLibrary
             }
             else
             {
-                    LogInfo(hengyiName+ "出口有料，未取到相机名称，不扫码，等待1000后继续");
+                LogInfo(hengyiName + "出口有料，未取到相机名称，不扫码，等待1000后继续");
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(6000));
             }
         }
+        protected override void OutStoreProcess()
+        {
+            if (MoveInfo.IsInWait)
+            {
+                CheckWait(MoveInfo);
+            }
+            if (SecondMoveInfo.IsInWait)
+            {
+                CheckWait(SecondMoveInfo);
+            }
+            if (MoveInfo.IsInWait)
+            {
+                return;
+            }
+            if (MoveInfo.MoveStep.Equals(LineMoveStep.DO_01_WaitTime))
+            {
+                ScanCode();
+            }
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.DO_02_ScanCode))
             {
                 MoveInfo.NextMoveStep(LineMoveStep.DO_03_GetTraySize);
@@ -126,27 +133,35 @@ namespace OnlineStore.DeviceLibrary
                 {
                     lastCode += code;
                 }
+                //如果未扫到条码，重新扫码3次
+                if (scanCodeCount < 3 && lastCode.Equals("") && Config.GetCameraList().Count > 0)
+                {
+                    ScanCode();
+                }
+                else
+                {
                     LastWidth = 0;
-                int robotIndex =1;
+                    int robotIndex = 1;
                     if (DeviceID.Equals(301))
                     {
                         robotIndex = 2;
                     }
                     SServerManager.GetTraySize(Name, robotIndex, LastCodeList, out LastWidth);
-                LogInfo(hengyiName+ "出口有料，二维码[" + lastCode + "] 获取料盘尺寸【" + LastWidth  + "】");
-                MoveInfo.EndMove();
+                    LogInfo(hengyiName + "出口有料，二维码[" + lastCode + "] 获取料盘尺寸【" + LastWidth + "】");
+                }
+                //  MoveInfo.EndMove();
             }
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.DO_03_GetTraySize))
             {
                 MoveInfo.NextMoveStep(LineMoveStep.DO_04_SeparateDeviceMove);
                 if (LastWidth.Equals(7))
                 {
-                    LogInfo(hengyiName+ "出口有料，料盘尺寸【" + LastWidth + "】上升分盘定位气缸");
+                    LogInfo(hengyiName + "出口有料，料盘尺寸【" + LastWidth + "】上升分盘定位气缸");
                     CylinderMove(MoveInfo, IO_Type.SeparateDevice_Down, IO_Type.SeparateDevice_Up);
                 }
                 else
                 {
-                    LogInfo(hengyiName+ "出口有料，料盘尺寸【" + LastWidth + "】下降分盘定位气缸");
+                    LogInfo(hengyiName + "出口有料，料盘尺寸【" + LastWidth + "】下降分盘定位气缸");
                     CylinderMove(MoveInfo, IO_Type.SeparateDevice_Up, IO_Type.SeparateDevice_Down);
                 }
             }
@@ -155,7 +170,7 @@ namespace OnlineStore.DeviceLibrary
                 if (TrayLine2.Line3CanRun && TrayLine1.Line3CanRun)
                 {
                     MoveInfo.NextMoveStep(LineMoveStep.DO_05_LineRun);
-                    LogInfo(hengyiName+ "出口有料，转动皮带线，同时转动分盘装置");
+                    LogInfo(hengyiName + "出口有料，转动皮带线，同时转动分盘装置");
                     IOMove(IO_Type.SeparateDevice_Run, IO_VALUE.HIGH);
                     Line3Turn.StartLineRun(IO_Type.DLine_Run3, IO_Type.Location_Check3, Line3EndProcess);
 
@@ -167,14 +182,14 @@ namespace OnlineStore.DeviceLibrary
             {
                 MoveInfo.NextMoveStep(LineMoveStep.DO_06_Wait_SeparateDevice_Check);
                 Line3LastTrayP++;
-                LogInfo(hengyiName+ "出口有料，等待料盘到达分盘装置位置");
+                LogInfo(hengyiName + "出口有料，等待料盘到达分盘装置位置");
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Location_Check3, IO_VALUE.HIGH));
             }
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.DO_06_Wait_SeparateDevice_Check))
             {
                 MoveInfo.NextMoveStep(LineMoveStep.DO_07_CRun);
-                LogInfo(hengyiName+ "出口有料，最多等待2000");
+                LogInfo(hengyiName + "出口有料，最多等待2000");
                 MoveInfo.OneWaitCanEndStep = true;
                 IOMove(IO_Type.SeparateDevice_Run, IO_VALUE.HIGH);
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
@@ -184,7 +199,7 @@ namespace OnlineStore.DeviceLibrary
                 runStatus = LineRunStatus.Runing;
                 MoveInfo.EndMove();
                 IOMove(IO_Type.SeparateDevice_Run, IO_VALUE.LOW);
-                LogInfo(hengyiName+ "出口有料，送料结束，停止皮带线");
+                LogInfo(hengyiName + "出口有料，送料结束，停止皮带线");
             }
         }
         #endregion 

source/DeviceLibrary/assemblyLine/LineBean.cs

@@ -265,6 +265,7 @@ namespace OnlineStore.DeviceLibrary
                 StartTime = DateTime.Now;
                 LogUtil.info(Name + "开始启动，启动时间：" + StartTime.ToString());
 
+               // rfidList = new List<string>();
                 Task.Factory.StartNew(delegate
                 {
                     LogUtil.info(Name + "RFIDManager.Open");

source/DeviceLibrary/assemblyLine/ProvidingEquip.cs

@@ -157,7 +157,7 @@ namespace OnlineStore.DeviceLibrary
             trayCheckWait.Stop();
             MoveInfo.EndMove();
             SecondMoveInfo.EndMove();
-            runStatus = LineRunStatus.Busy;
+            runStatus = LineRunStatus.Runing;
 
             LogInfo("停止运动：（上下气缸上升 ，阻挡气缸输入=0，顶升气缸下降  ）  ");