界面修改

source/AssemblyLineClient/FrmDischargeLine.cs

@@ -395,7 +395,14 @@ namespace OnlineStore.AssemblyLine
 
 
         private void btnScan_Click(object sender, EventArgs e)
         private void btnScan_Click(object sender, EventArgs e)
         {
         {
-            List<string> LastCodeList = CodeManager.CameraScan(equipBean.Config.GetCameraList());
+            List<string> camers = equipBean.Config.GetCameraList();
+            List<string> LastCodeList = CodeManager.CameraScan(camers);
+            string cameraStr = "";
+            foreach (string ca in camers)
+            {
+                cameraStr += ca + "#";
+            }
+            cameraStr = cameraStr.Substring(0, cameraStr.Length - 1);
 
 
             string msg = "";
             string msg = "";
             if (LastCodeList.Count > 0)
             if (LastCodeList.Count > 0)
@@ -406,8 +413,8 @@ namespace OnlineStore.AssemblyLine
                 }
                 }
             }
             }
 
 
-            LogUtil.info(equipBean.Name + "扫码测试结果：" + msg);
-            MessageBox.Show(equipBean.Name + "扫码测试结果：" + msg);
+            LogUtil.info(equipBean.Name + "[" + cameraStr + "]扫码测试结果：\r\n" + msg);
+            MessageBox.Show(equipBean.Name + "[" + cameraStr + "]扫码测试结果：" + msg);
         }
         }
 
 
         private void btnLine2Test_Click(object sender, EventArgs e)
         private void btnLine2Test_Click(object sender, EventArgs e)

source/AssemblyLineClient/FrmFeedingEquip.cs

@@ -552,7 +552,14 @@ namespace OnlineStore.AssemblyLine
 
 
         private void btnScan_Click(object sender, EventArgs e)
         private void btnScan_Click(object sender, EventArgs e)
         {
         {
-            List<string> LastCodeList = CodeManager.CameraScan(equipBean.Config.GetCameraList());
+            List<string> camers = equipBean.Config.GetCameraList();
+            List<string> LastCodeList = CodeManager.CameraScan(camers);
+            string cameraStr = "";
+            foreach(string ca in camers)
+            {
+                cameraStr += ca + "#";
+            }
+            cameraStr = cameraStr.Substring(0, cameraStr.Length - 1);
 
 
             string msg = "";
             string msg = "";
             if (LastCodeList.Count > 0)
             if (LastCodeList.Count > 0)
@@ -563,8 +570,8 @@ namespace OnlineStore.AssemblyLine
                 }
                 }
             }
             }
 
 
-            LogUtil.info(equipBean.Name + "扫码测试结果：" + msg);
-            MessageBox.Show(equipBean.Name + "扫码测试结果：" + msg);
+            LogUtil.info(equipBean.Name + "["+ cameraStr + "]扫码测试结果：\r\n" + msg);
+            MessageBox.Show(equipBean.Name + "[" + cameraStr + "]扫码测试结果：" + msg);
         }
         }
 
 
         private void btnUpdownP3_Click(object sender, EventArgs e)
         private void btnUpdownP3_Click(object sender, EventArgs e)

source/DeviceLibrary/assemblyLine/DischargeLine.cs

@@ -221,7 +221,10 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
                 return;
                 return;
             }
             }
-
+            if (isInSuddenDown || isNoAirCheck)
+            {
+                return;
+            }
             BusyMoveProcess();
             BusyMoveProcess();
 
 
             if (TrayLine1.MoveInfo.MoveType.Equals(LineMoveType.OutStore))
             if (TrayLine1.MoveInfo.MoveType.Equals(LineMoveType.OutStore))

source/DeviceLibrary/assemblyLine/MoveEquip.cs

@@ -216,6 +216,10 @@ namespace OnlineStore.DeviceLibrary
 
 
         protected override void BaseTimerProcess()
         protected override void BaseTimerProcess()
         {
         {
+            if (isInSuddenDown || isNoAirCheck)
+            {
+                return;
+            }
             BusyMoveProcess();
             BusyMoveProcess();
             //判断流水线打开了才可以运行 
             //判断流水线打开了才可以运行 
             if (SecondMoveInfo.MoveType.Equals(LineMoveType.None))
             if (SecondMoveInfo.MoveType.Equals(LineMoveType.None))

source/DeviceLibrary/assemblyLine/ProvidingEquip.cs

@@ -196,6 +196,10 @@ namespace OnlineStore.DeviceLibrary
 
 
         protected override void BaseTimerProcess()
         protected override void BaseTimerProcess()
         {
         {
+            if (isInSuddenDown || isNoAirCheck)
+            {
+                return;
+            }
             BusyMoveProcess();
             BusyMoveProcess();
             //判断流水线打开了才可以运行 
             //判断流水线打开了才可以运行 
             if (SecondMoveInfo.MoveType.Equals(LineMoveType.None))
             if (SecondMoveInfo.MoveType.Equals(LineMoveType.None))