1

source/AssemblyLineClient/FrmIOTest.cs

@@ -88,19 +88,19 @@ namespace OnlineStore.AssemblyLine
             comboBox1.Items.Clear();
             deviceList = new Dictionary<int, string>();
             deviceList.Add(0, "C1环形线");
-            for(int i = 1; i <= 6; i++)
-            { 
-                deviceList.Add(i, "D"+i+"-"+"移栽_" + i);
+            for (int i = 1; i <= 6; i++)
+            {
+                deviceList.Add(i, "D" + i + "-" + "移栽_" + i);
             }
+            deviceList.Add(107, "D7_出料口");
             for (int i = 1; i <= 1; i++)
-            { 
-                deviceList.Add(100+i, "上料模块_T"   + i);
+            {
+                deviceList.Add(100 + i, "上料模块_T" + i);
             }
             for (int i = 1; i <= 4; i++)
             {
-                deviceList.Add(200+i, "横移_HY" + i);
+                deviceList.Add(200 + i, "横移_HY" + i);
             }
-            deviceList.Add(205, "横移_D7" );
             foreach (string key in deviceList.Values)
             {
                 comboBox1.Items.Add(key);
@@ -108,15 +108,15 @@ namespace OnlineStore.AssemblyLine
                 comboBox3.Items.Add(key);
                 comboBox4.Items.Add(key);
             }
-            comboBox1.SelectedIndex = 0; 
+            comboBox1.SelectedIndex = 0;
             comboBox2.SelectedIndex = 1;
             comboBox3.SelectedIndex = 2;
             comboBox4.SelectedIndex = 3;
 
-            LoadIOList(0,lblDI1,lblDO1,lblDes1);
-            LoadIOList(1, lblDI2, lblDO2,lblDes2);
-            LoadIOList(2, lblDI3, lblDO3,lblDes3);
-            LoadIOList(3, lblDI4, lblDO4,lblDes4);
+            LoadIOList(0, lblDI1, lblDO1, lblDes1);
+            LoadIOList(1, lblDI2, lblDO2, lblDes2);
+            LoadIOList(2, lblDI3, lblDO3, lblDes3);
+            LoadIOList(3, lblDI4, lblDO4, lblDes4);
         }
      
         

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -763,6 +763,7 @@ namespace OnlineStore.DeviceLibrary
 
                                 CheckLog("托盘阻挡" + SecondMoveInfo.SLog + "  阻挡气缸1-1上升）");
                                 IOMove(IO_Type.StopDown1, IO_VALUE.LOW);
+                                IOMove(IO_Type.StopDown2, IO_VALUE.LOW);
                                 SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopDown1, IO_VALUE.LOW));
                             }
                         }
@@ -832,6 +833,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                     SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_01_TrayCheck);
                     CheckLog("托盘阻挡" + SecondMoveInfo.SLog + "   阻挡气缸1-1上升，等待 阻挡2托盘检测=1）");
+                    IOMove(IO_Type.StopDown1, IO_VALUE.LOW);
                     IOMove(IO_Type.StopDown2, IO_VALUE.LOW);
                     SecondMoveInfo.OneWaitCanEndStep = true;
                     SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCheck2, IO_VALUE.HIGH));