diff --git a/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs b/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs index f282527..ef7935d 100644 --- a/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs +++ b/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs @@ -206,6 +206,13 @@ namespace Rs.MotionPlat.Flow } else { + StockManager.CloseTray(1); + StockManager.CloseTray(2); + StockManager.CloseTray(3); + + StockManager.OpenTray(1); + StockManager.OpenTray(2); + StockManager.OpenTray(3); flowStep = EDischargeFlowStep.工作前准备; } @@ -214,6 +221,13 @@ namespace Rs.MotionPlat.Flow { logInfo = GetClassName() + "选择了Cancel"; MessageQueue.Instance.Insert(logInfo); + StockManager.CloseTray(1); + StockManager.CloseTray(2); + StockManager.CloseTray(3); + + StockManager.OpenTray(1); + StockManager.OpenTray(2); + StockManager.OpenTray(3); flowStep = EDischargeFlowStep.工作前准备; } } diff --git a/Rs.DeweyTester/SysConfig/CommonConfig.Designer.cs b/Rs.DeweyTester/SysConfig/CommonConfig.Designer.cs index 7c68962..c3f3905 100644 --- a/Rs.DeweyTester/SysConfig/CommonConfig.Designer.cs +++ b/Rs.DeweyTester/SysConfig/CommonConfig.Designer.cs @@ -529,7 +529,6 @@ // resources.ApplyResources(this.tbarFlyCameraSpeed, "tbarFlyCameraSpeed"); this.tbarFlyCameraSpeed.LargeChange = 1; - this.tbarFlyCameraSpeed.Maximum = 7; this.tbarFlyCameraSpeed.Minimum = 1; this.tbarFlyCameraSpeed.Name = "tbarFlyCameraSpeed"; this.tbarFlyCameraSpeed.TickStyle = System.Windows.Forms.TickStyle.None; diff --git a/Rs.DeweyTester/SysConfig/CommonConfig.resx b/Rs.DeweyTester/SysConfig/CommonConfig.resx index 12c7ff8..9083c6c 100644 --- a/Rs.DeweyTester/SysConfig/CommonConfig.resx +++ b/Rs.DeweyTester/SysConfig/CommonConfig.resx @@ -123,13 +123,15 @@ groupBox1 - - - 42 + + 4 label15 + + 3 + cboxLanguage @@ -149,9 +151,6 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 6 - groupBox3 @@ -161,6 +160,7 @@ groupBox4 + False @@ -189,8 +189,8 @@ True - - False + + 5 MiddleLeft @@ -210,6 +210,9 @@ NoControl + + cboxRunSpace + groupBox3 @@ -252,8 +255,8 @@ 787, 441 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -279,11 +282,11 @@ cboxEnableOkTrayCheckFull - - False + + MiddleLeft - - tableLayoutPanel1 + + 10 radioButton4 @@ -315,6 +318,15 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 8 + + + panelEx1 + + + radioButton3 + True @@ -336,6 +348,9 @@ 448, 278 + + 153, 186 + 8 @@ -363,9 +378,6 @@ False - - True - 20 @@ -378,9 +390,6 @@ 113, 21 - - cboxMsgShowCn - True @@ -417,6 +426,9 @@ label16 + + cboxEnableScanBarCodeByDownCamera + NoControl @@ -444,6 +456,9 @@ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + False + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -528,11 +543,11 @@ 59, 12 - - True + + NoControl - - lblWholeSpeed + + cboxPrintTC1Communicate 料仓放料拍照 @@ -555,9 +570,6 @@ CommonConfig - - 2 - MiddleLeft @@ -603,14 +615,14 @@ 7 + + groupBox1 + 112, 117 - - label21 - - - Bottom + + lblFlyCameraSpeed 43 @@ -627,6 +639,9 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + False + TC3 @@ -645,6 +660,9 @@ 84, 16 + + False + 564, 295 @@ -687,9 +705,6 @@ 8 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 2 @@ -699,6 +714,9 @@ 10 + + NoControl + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -720,11 +738,8 @@ 整体速度: - - 0 - - - 8 + + 174, 224 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -750,6 +765,9 @@ 是否显示 + + 48, 16 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -768,8 +786,8 @@ 778, 433 - - English + + groupBox1 True @@ -798,11 +816,8 @@ 7 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Fill 438, 186 @@ -816,15 +831,21 @@ Others - - False + + 42 检测视觉软件是否打开 + + 0 + False + + NoControl + groupBox3 @@ -837,6 +858,9 @@ MiddleLeft + + 47, 12 + groupBox3 @@ -885,8 +909,8 @@ tableLayoutPanel1 - - 4 + + 中控IP: 113, 21 @@ -894,9 +918,6 @@ True - - groupBox1 - 8 @@ -930,15 +951,9 @@ 127.0.0.1 - - label26 - groupBox3 - - 48, 16 - 346, 118 @@ -948,9 +963,6 @@ 26, 185 - - 1 - 6 @@ -969,9 +981,6 @@ True - - False - Flat @@ -981,20 +990,17 @@ True - - 42, 16 - - - Fill - Center groupBox3 - - 参数设置 + + 80, 187 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 cboxPrintTC3Communicate @@ -1005,9 +1011,6 @@ IQC - - 0 - 1 @@ -1017,15 +1020,15 @@ label20 - - lblFlyCameraSpeed + + 59, 12 + + + False groupBox4 - - 35, 12 - True @@ -1041,20 +1044,14 @@ 300, 20 - - label19 - groupBox3 72, 16 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 5 + + label19 cboxPrintTC6Communicate @@ -1062,17 +1059,20 @@ txtSubLotName + + label4 + True groupBox3 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 8 - - 71, 12 + + 9 System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1107,8 +1107,8 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Host Type: + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 cboxEnableIndexTimeStatistics @@ -1128,6 +1128,9 @@ 24 + + 153, 278 + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1143,9 +1146,6 @@ groupBox1 - - System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - NoControl @@ -1161,9 +1161,6 @@ 3, 441 - - True - 8 @@ -1203,6 +1200,9 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 9 + groupBox4 @@ -1215,8 +1215,8 @@ cboxInputTrayLoop - - 60, 16 + + comBoxCp 11 @@ -1245,9 +1245,6 @@ 0 - - groupBox4 - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1266,6 +1263,9 @@ NoControl + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 1568, 877 @@ -1284,6 +1284,9 @@ True + + 4 + cboxCurRecipe @@ -1320,14 +1323,17 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - cboxIsSimTest + + 是否启用料仓 + + + 60, 16 False - - 55, 167 + + 31, 120 groupBox1 @@ -1341,6 +1347,9 @@ 29 + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + True @@ -1350,9 +1359,6 @@ True - - MiddleLeft - 11 @@ -1362,15 +1368,15 @@ groupBox1 + + 8 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 cboxConfigName - - NoControl - NoControl @@ -1410,12 +1416,6 @@ 197, 20 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Flat - True @@ -1440,14 +1440,14 @@ False + + 459, 44 + 35, 117 - - 17 - - - 模拟测试良率: + + 206, 168 False @@ -1467,24 +1467,21 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - False - 299, 278 112, 38 + + True + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 572, 6 - - 虚拟轴 - 96, 16 @@ -1503,11 +1500,14 @@ 348, 20 + + 26, 40 + 15 - - cboxEnableScanBarCodeByDownCamera + + 6 label6 @@ -1527,8 +1527,8 @@ 108, 16 - - 1 + + False True @@ -1536,8 +1536,8 @@ 448, 312 - - cboxPrintTC1Communicate + + 94, 21 NoControl @@ -1572,6 +1572,9 @@ True + + True + 0 @@ -1593,12 +1596,12 @@ 中文 - - 英文 - 3 + + label18 + cboxHostType @@ -1638,8 +1641,8 @@ 352, 38 - - 174, 224 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 42, 16 @@ -1656,8 +1659,8 @@ 0 - - groupBox1 + + cboxEnableStock 77, 12 @@ -1668,20 +1671,17 @@ 12 - - 28 + + NoControl System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - cboxEnableVirtuleBarCode - - False + + 0 178, 21 @@ -1719,9 +1719,18 @@ 16 + + Paint + + + NoControl + NoControl + + 60, 16 + 10 @@ -1737,6 +1746,9 @@ groupBox1 + + ProjectID: + 74, 18 @@ -1749,23 +1761,23 @@ 1 - - 18 - 71, 12 True + + 90, 16 + 226, 396 112, 261 - - groupBox4 + + True change @@ -1773,15 +1785,15 @@ Sublotname: - - 是否启用料仓 + + groupBox1 + + + Host Type: groupBox1 - - 484, 184 - groupBox4 @@ -1794,6 +1806,9 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl + 18 @@ -1818,9 +1833,6 @@ txtControlCenterPort - - 94, 21 - 13 @@ -1911,15 +1923,9 @@ 108, 16 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 90, 16 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 168, 54 @@ -1929,8 +1935,8 @@ 386, 107 - - 48, 16 + + groupBox1 NoControl @@ -1941,20 +1947,20 @@ 8 + + lblWholeSpeed + 8 TC3通信日志 - - comBoxCp - 153, 312 - - 206, 168 + + groupBox8 TC6 @@ -1983,27 +1989,15 @@ 71, 16 - - NoControl - 36, 56 - - 31, 120 - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 3, 3 - - 1 - - - 9 - NoControl @@ -2016,9 +2010,6 @@ 模拟测试 - - 中文 - True @@ -2028,8 +2019,8 @@ True - - True + + Flat 2 @@ -2037,8 +2028,8 @@ 8 - - NoControl + + 71, 12 System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2046,11 +2037,11 @@ 72, 16 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + cboxIsSimTest - - 153, 278 + + True 1 @@ -2085,29 +2076,32 @@ 启用强力吸嘴 + + True + cboxCheckSafeEnable - - 中控IP: - - - groupBox8 + + 18 True - - label18 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 True - - 26, 40 + + SnCoating - - True + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Bottom 下相机扫码 @@ -2142,17 +2136,11 @@ 搬运带料料盘速度: - - 0 - - - NoControl - - - groupBox1 + + System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 35, 12 label1 @@ -2166,8 +2154,11 @@ groupBox1 - - False + + NoControl + + + True 0 @@ -2187,8 +2178,8 @@ groupBox8 - - cboxEnableStock + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 NoControl @@ -2199,8 +2190,8 @@ 459, 76 - - 80, 187 + + cboxMsgShowCn 17 @@ -2208,9 +2199,6 @@ NoControl - - 2 - MiddleLeft @@ -2223,18 +2211,24 @@ txtMachineID + + 18 + 42, 16 - - 1 - groupBox1 + + 18 + 配方: + + 50, 113 + True @@ -2247,8 +2241,8 @@ 31, 217 - - 0 + + groupBox4 346, 80 @@ -2256,11 +2250,11 @@ 307, 121 - - ProjectID: + + 1 - - NoControl + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 NoControl @@ -2301,8 +2295,8 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 47, 12 + + 中文 23 @@ -2322,8 +2316,8 @@ NoControl - - 18 + + False NoControl @@ -2340,8 +2334,8 @@ 60, 16 - - Fill + + NoControl 373, 186 @@ -2355,11 +2349,11 @@ 6 - - cboxRunSpace + + 1 - - 60, 16 + + 17 8 @@ -2370,14 +2364,20 @@ groupBox1 + + 55, 167 + groupBox8 ID - - 10 + + groupBox4 + + + True 174, 185 @@ -2385,8 +2385,8 @@ NoControl - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 7 @@ -2400,8 +2400,8 @@ groupBox1 - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 False @@ -2409,11 +2409,11 @@ System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 8 + + 0 - - True + + False 37 @@ -2433,17 +2433,14 @@ Bottom, Right - - 155, 109 - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 NoControl - - NoControl + + 虚拟轴 TC5通信日志 @@ -2451,14 +2448,17 @@ 8 + + Fill + label7 18 - - groupBox1 + + tableLayoutPanel1 MachineID: @@ -2466,8 +2466,8 @@ Flat - - NoControl + + 48, 16 True @@ -2478,17 +2478,17 @@ label13 - - radioButton3 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 705, 294 59, 12 - - 9 + + 155, 109 638, 36 @@ -2538,9 +2538,6 @@ 禁用门禁 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 禁用蜂鸣器 @@ -2553,14 +2550,14 @@ Fill - - True + + 484, 184 - - 18 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl + + 28 cboxEnableVirtualBarCode @@ -2604,11 +2601,11 @@ 121, 20 - - 705, 294 + + 2 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 参数设置 1 @@ -2619,8 +2616,8 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 90, 16 + + groupBox1 SnCoating @@ -2634,20 +2631,20 @@ cboxEnableTC6 - - SnCoating + + 1 System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - False + + 2 102, 115 - - 3 + + English groupBox4 @@ -2664,8 +2661,8 @@ True - - groupBox1 + + False 83, 12 @@ -2676,20 +2673,20 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 50, 113 + + 模拟测试良率: 43 - - 8 + + True 107, 12 - - True + + 英文 虚拟码 @@ -2697,8 +2694,8 @@ False - - False + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 19 @@ -2715,6 +2712,9 @@ 38 + + False + NoControl @@ -2727,8 +2727,8 @@ 0 - - Paint + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tbarFlyCameraSpeed @@ -2739,14 +2739,14 @@ tableLayoutPanel1 - - NoControl + + True - - 459, 44 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - label4 + + 1 17 @@ -2757,17 +2757,17 @@ cboxEnableTC3 - - panelEx1 + + label21 - - 4 + + label26 96, 16 - - 153, 186 + + 42, 16 458, 18 @@ -2790,21 +2790,15 @@ 0 - - 59, 12 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 True - - en-US - True - - True - True @@ -2814,4 +2808,7 @@ True + + True + \ No newline at end of file