diff --git a/Rs.SkyLine/BaseFormHeader.cs b/Rs.SkyLine/BaseFormHeader.cs index 3584dae..96dfead 100644 --- a/Rs.SkyLine/BaseFormHeader.cs +++ b/Rs.SkyLine/BaseFormHeader.cs @@ -1,4 +1,5 @@ using Rs.Controls; +using Rs.Framework; using System; using System.Collections.Generic; using System.ComponentModel; @@ -115,6 +116,7 @@ namespace Rs.MotionPlat { if (WindowsClose()) { + //Environment.Exit(-1); this.Close(); } } diff --git a/Rs.SkyLine/Commom/GlobalTray.cs b/Rs.SkyLine/Commom/GlobalTray.cs index 5e0d1de..8f55df0 100644 --- a/Rs.SkyLine/Commom/GlobalTray.cs +++ b/Rs.SkyLine/Commom/GlobalTray.cs @@ -23,6 +23,9 @@ namespace Rs.MotionPlat.Commom public static RsTray TestTray { get; set; } + public static RsTray DischargeNozzle { get; set; } + public static RsTray TurnoverNozzle { get; set; } + public static RsTray GetTray(ETrayType trayType) { switch (trayType) @@ -47,30 +50,5 @@ namespace Rs.MotionPlat.Commom } return null; } - - public static RsTray GetTray(int trayType) - { - switch (trayType) - { - case 1: - return Empty1Tray; - case 2: - return InputTray; - case 3: - return OkTary; - case 4: - return NgTray; - case 5: - return MultiTray; - case 6: - return Empty2Tray; - case 7: - return TurnoverTray; - case 8: - return TestTray; - default: break; - } - return null; - } } } diff --git a/Rs.SkyLine/Commom/GlobalVar.cs b/Rs.SkyLine/Commom/GlobalVar.cs index 5d6b7c8..8c1403f 100644 --- a/Rs.SkyLine/Commom/GlobalVar.cs +++ b/Rs.SkyLine/Commom/GlobalVar.cs @@ -950,5 +950,32 @@ namespace Rs.Framework get; set; } + + /// + /// 是否清料 + /// + public static bool CleanOut + { + get; + set; + } = false; + + /// + /// 排料吸嘴是否有料 + /// + public static bool DischargeNozzleHasProduct + { + get; + set; + }= false; + + /// + /// 周转吸嘴是否有料 + /// + public static bool TurnoverNozzleHasProduct + { + get; + set; + } = false; } } diff --git a/Rs.SkyLine/Commom/NozzleCollection.cs b/Rs.SkyLine/Commom/NozzleCollection.cs index 9af5fbd..6cb3654 100644 --- a/Rs.SkyLine/Commom/NozzleCollection.cs +++ b/Rs.SkyLine/Commom/NozzleCollection.cs @@ -62,12 +62,27 @@ namespace Rs.MotionPlat.Commom public bool Update() { + Task.Run(() => { + SqliteHelper db = new SqliteHelper(); + string val = Status == ENozzleStatus.IDLE ? "0" : "1"; + string updateSql = $"update TrayStatus set status={val} where trayname='DischargeNozzle' and slotindex={NozzleIndex}"; + db.ExecuteNonQuery(updateSql); + }); //string updateSql = $"update nozzle set fromtype='{FromType}',fromfloor={FromFloor},fromindex={FromIndex},ToType='{ToType}',tofloor={ToFloor},ToIndex={ToIndex},Status='{Status}' where NozzleIndex={NozzleIndex}"; //string updateSql = $"update nozzle set Status='{Status}' where NozzleIndex={NozzleIndex}"; //return db.ExecuteNonQuery(updateSql) > 0; return true; } + public void ResetStatus() + { + Status=ENozzleStatus.IDLE; + FromIndex = 0; + FromType = TurnoverType.Unknown; + ToIndex = 0; + ToType = TurnoverType.Unknown; + } + /// /// 重置吸嘴 /// @@ -178,11 +193,17 @@ namespace Rs.MotionPlat.Commom { if(disableNozzle1) { - return nozzles.Where(n => n.Status == ENozzleStatus.IDLE && n.NozzleIndex!=1).First(); + if(nozzles.Where(n => n.Status == ENozzleStatus.IDLE && n.NozzleIndex != 1).Count()>0) + { + return nozzles.Where(n => n.Status == ENozzleStatus.IDLE && n.NozzleIndex != 1).First(); + } } else { - return nozzles.Where(n => n.Status == ENozzleStatus.IDLE).First(); + if(nozzles.Where(n => n.Status == ENozzleStatus.IDLE).Count()>0) + { + return nozzles.Where(n => n.Status == ENozzleStatus.IDLE).First(); + } } } @@ -247,5 +268,13 @@ namespace Rs.MotionPlat.Commom { return nozzles.Where(n => n.NozzleIndex == nozzleIndex).FirstOrDefault(); } + /// + /// 获取所有的吸嘴 + /// + /// + public static List GetAllNozzles() + { + return nozzles; + } } } diff --git a/Rs.SkyLine/Commom/Ops.cs b/Rs.SkyLine/Commom/Ops.cs index a7b7fb3..5bf8369 100644 --- a/Rs.SkyLine/Commom/Ops.cs +++ b/Rs.SkyLine/Commom/Ops.cs @@ -16,6 +16,7 @@ using System.Threading; using System.Diagnostics; using Rs.MotionPlat.AuxiliaryEquipment; using System.Windows.Forms; +using Rs.MotionPlat.Flow.SubFlow; namespace Rs.MotionPlat.Commom { @@ -131,21 +132,23 @@ namespace Rs.MotionPlat.Commom { Ops.On($"{i}号料仓托盘气缸"); } + if (!DeviceFactory.Init()) + { + Msg.ShowError("laser connect fail!"); + } + QifuManager.Instance.Init(); + QifuManager.Instance.Write(SysConfigParam.GetValue("QifuValue")); + LightManger.Instance.SetStatus(ELightStatus.YellowBlink); + Off("启动灯"); + Off("停止灯"); } NozzleManager.Init(); TrayPointManager.LoadPoint(); TurnoverSlotOffset.Init(); MonitorSystemButton.Instance.Start(); TestCenter.Instance.Init(); - if(!DeviceFactory.Init()) - { - Msg.ShowError("laser connect fail!"); - } - QifuManager.Instance.Init(); - QifuManager.Instance.Write(SysConfigParam.GetValue("QifuValue")); - LightManger.Instance.SetStatus(ELightStatus.YellowBlink); - Off("启动灯"); - Off("停止灯"); + + SysConfigParam.Update("EnableVirtuleBarCode", "False"); } @@ -431,6 +434,7 @@ namespace Rs.MotionPlat.Commom public static void Quit() { + CleanOutFlow.Instance.Quit(); LightManger.Instance.CloseAll(); Off("启动灯"); Off("停止灯"); diff --git a/Rs.SkyLine/Entitys/TransitNozzleManager.cs b/Rs.SkyLine/Entitys/TransitNozzleManager.cs index 9bf24fb..b9aabd3 100644 --- a/Rs.SkyLine/Entitys/TransitNozzleManager.cs +++ b/Rs.SkyLine/Entitys/TransitNozzleManager.cs @@ -1,4 +1,6 @@ -using Rs.Framework; +using NPOI.SS.Formula.Functions; +using Rs.DataAccess; +using Rs.Framework; using Rs.MotionPlat.Entitys.Trays; using System; using System.Collections.Generic; @@ -55,6 +57,21 @@ namespace Rs.MotionPlat.Commom { return nozzles.Where(n => n.IsHasProduct).ToList(); } + + /// + /// 重置所有的穴位状态 + /// + public void ResetStatus() + { + foreach (TransitNozzle nozzle in nozzles) + { + nozzle.IsHasProduct = false; + nozzle.FromIndex = 0; + nozzle.FromType = TurnoverType.Unknown; + nozzle.ToType= TurnoverType.Unknown; + nozzle.ToIndex = 0; + } + } } /// @@ -87,6 +104,11 @@ namespace Rs.MotionPlat.Commom ToIndex= task.ToIndex; ToType= task.ToType; ToFloor= task.ToFloor; + Task.Run(() => { + SqliteHelper db = new SqliteHelper(); + string updateSql = $"update TrayStatus set status=1 where trayname='TurnoverNozzle' and slotindex={NozzleIndex}"; + db.ExecuteNonQuery(updateSql); + }); } @@ -98,6 +120,20 @@ namespace Rs.MotionPlat.Commom { CloseVac(); } + Task.Run(() => { + SqliteHelper db = new SqliteHelper(); + string updateSql = $"update TrayStatus set status=0 where trayname='TurnoverNozzle' and slotindex={NozzleIndex}"; + db.ExecuteNonQuery(updateSql); + }); + } + + public void ResetStaus() + { + IsHasProduct = false; + FromIndex = 0; + FromType = TurnoverType.Unknown; + ToType = TurnoverType.Unknown; + ToIndex = 0; } /// /// 吸嘴索引 diff --git a/Rs.SkyLine/Entitys/Trays/BaseTraySlot.cs b/Rs.SkyLine/Entitys/Trays/BaseTraySlot.cs index 0735134..89ce1df 100644 --- a/Rs.SkyLine/Entitys/Trays/BaseTraySlot.cs +++ b/Rs.SkyLine/Entitys/Trays/BaseTraySlot.cs @@ -39,13 +39,6 @@ namespace Rs.MotionPlat.Entitys.Trays /// public int SuckerNo { get; set; } - public void ClearProduct() - { - IsHasProduct = false; - SN = ""; - FromIndex = 0; - FromType = TurnoverType.Unknown; - SuckerNo = 0; - } + } } diff --git a/Rs.SkyLine/Entitys/Trays/TestTrayManager.cs b/Rs.SkyLine/Entitys/Trays/TestTrayManager.cs index e7daa31..5b9f3cc 100644 --- a/Rs.SkyLine/Entitys/Trays/TestTrayManager.cs +++ b/Rs.SkyLine/Entitys/Trays/TestTrayManager.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Rs.DataAccess; namespace Rs.MotionPlat.Entitys.Trays { @@ -151,6 +152,18 @@ namespace Rs.MotionPlat.Entitys.Trays { return slots.ToList(); } + /// + /// 重置测试治具穴位状态 + /// + public void ResetStatus() + { + foreach (TestTraySlot slot in slots) + { + slot.IsHasProduct= false; + slot.FromIndex = 0; + slot.FromType = TurnoverType.Unknown; + } + } } public class TestTraySlot:BaseTraySlot @@ -171,6 +184,25 @@ namespace Rs.MotionPlat.Entitys.Trays FromIndex = nozzle.FromIndex; FromType = nozzle.FromType; SuckerNo = nozzle.NozzleIndex; + Task.Run(() => { + SqliteHelper db = new SqliteHelper(); + string updateSql = $"update TrayStatus set status=1 where trayname='FixtureTray' and slotindex={Index}"; + db.ExecuteNonQuery(updateSql); + }); + } + + public void ClearProduct() + { + IsHasProduct = false; + SN = ""; + FromIndex = 0; + FromType = TurnoverType.Unknown; + SuckerNo = 0; + Task.Run(() => { + SqliteHelper db = new SqliteHelper(); + string updateSql = $"update TrayStatus set status=0 where trayname='FixtureTray' and slotindex={Index}"; + db.ExecuteNonQuery(updateSql); + }); } /// @@ -181,5 +213,12 @@ namespace Rs.MotionPlat.Entitys.Trays { return Ops.IsOn($"测试{Index}号穴位真空吸检测"); } + + public void ResetStatus() + { + IsHasProduct = false; + FromIndex = 0; + FromType = TurnoverType.Unknown; + } } } diff --git a/Rs.SkyLine/Entitys/Trays/TrayStatusManager.cs b/Rs.SkyLine/Entitys/Trays/TrayStatusManager.cs index 88f19b1..abc6be4 100644 --- a/Rs.SkyLine/Entitys/Trays/TrayStatusManager.cs +++ b/Rs.SkyLine/Entitys/Trays/TrayStatusManager.cs @@ -89,6 +89,114 @@ namespace Rs.MotionPlat.Entitys.Trays } } } + /// + /// 加载排料吸嘴状态 + /// + public static void InitDischargeNozzle() + { + string selectSql = $"select * from traystatus where trayname='DischargeNozzle'"; + DataTable dt = db.GetDataTable(selectSql); + if (dt != null && dt.Rows.Count > 0) + { + foreach (DataRow row in dt.Rows) + { + if (row["status"].ToString() == "1") + { + int slotIndex = int.Parse(row["slotindex"].ToString()); + GlobalTray.DischargeNozzle.ChangeStatus(slotIndex, Controls.ESlotStatus.Have); + Nozzle nozzle = NozzleManager.GetNozzle(slotIndex); + if(nozzle!=null) + { + NozzleManager.GetNozzle(slotIndex).FromType = TurnoverType.Turnover; + nozzle.FromIndex = slotIndex - 1; + NozzleManager.GetNozzle(slotIndex).ToType = TurnoverType.Multifunction; + nozzle.ToIndex = 0; + NozzleManager.GetNozzle(slotIndex).Status = ENozzleStatus.ToUnload; + } + } + } + } + } + + /// + /// 加载周转盘状态 + /// + public static void InitTrunoverTray() + { + string selectSql = $"select * from traystatus where trayname='TurnoverTray'"; + DataTable dt = db.GetDataTable(selectSql); + if(dt!=null &&dt.Rows.Count>0) + { + foreach (DataRow row in dt.Rows) + { + if (row["status"].ToString()=="1") + { + GlobalTray.TurnoverTray.ChangeStatus(int.Parse(row["slotindex"].ToString()), Controls.ESlotStatus.Have); + TurnoverTrayManager.Instance.Slot(int.Parse(row["slotindex"].ToString())).IsHasProduct = true; + } + } + } + } + /// + /// 加载周转吸嘴状态 + /// + public static void InitTurnoverNozzle() + { + string selectSql = $"select * from traystatus where trayname='TurnoverNozzle' and status=1"; + DataTable dt = db.GetDataTable(selectSql); + if (dt != null && dt.Rows.Count > 0) + { + foreach (DataRow row in dt.Rows) + { + int slotIndex = int.Parse(row["slotindex"].ToString()); + GlobalTray.TurnoverNozzle.ChangeStatus(slotIndex, Controls.ESlotStatus.Have); + TransitNozzleManager.Instance.Nozzle(slotIndex).FromType = TurnoverType.Turnover; + TransitNozzleManager.Instance.Nozzle(slotIndex).FromIndex = slotIndex - 1; + TransitNozzleManager.Instance.Nozzle(slotIndex).ToType = TurnoverType.Multifunction; + TransitNozzleManager.Instance.Nozzle(slotIndex).ToIndex = (slotIndex <= 8 ? slotIndex + 8 : slotIndex + 16) - 1; + TransitNozzleManager.Instance.Nozzle(slotIndex).IsHasProduct = true; + } + } + } + + /// + /// 加载治具盘状态 + /// + public static void InitFixtureTray() + { + string selectSql = $"select * from traystatus where trayname='FixtureTray'"; + DataTable dt = db.GetDataTable(selectSql); + if (dt != null && dt.Rows.Count > 0) + { + foreach (DataRow row in dt.Rows) + { + if (row["status"].ToString() == "1") + { + GlobalTray.TestTray.ChangeStatus(int.Parse(row["slotindex"].ToString()), Controls.ESlotStatus.Have); + TestTrayManager.Instance.Slot(int.Parse(row["slotindex"].ToString())).IsHasProduct = true; + } + } + } + } + + + + public static void UpdateSlotAsync(string trayname, int slot, int status) + { + Task.Run(() => { + string updateSql = $"update traystatus set status={status} where trayname='{trayname}' and slotindex= {slot}"; + db.ExecuteNonQuery(updateSql); + }); + } + + public static void UpdateMultiSlotAsync(string trayname,int[] slots,int status) + { + Task.Run(() => { + string slotindexs = string.Join(",", slots); + string updateSql = $"update traystatus set status={status} where trayname='{trayname}' and slotindex in({slotindexs})"; + db.ExecuteNonQuery(updateSql); + }); + } } } diff --git a/Rs.SkyLine/Entitys/Trays/TurnoverTrayManager.cs b/Rs.SkyLine/Entitys/Trays/TurnoverTrayManager.cs index 1b8851b..090488c 100644 --- a/Rs.SkyLine/Entitys/Trays/TurnoverTrayManager.cs +++ b/Rs.SkyLine/Entitys/Trays/TurnoverTrayManager.cs @@ -1,4 +1,5 @@ -using Rs.MotionPlat.Commom; +using Rs.DataAccess; +using Rs.MotionPlat.Commom; using System; using System.Collections.Generic; using System.ComponentModel; @@ -140,6 +141,18 @@ namespace Rs.MotionPlat.Entitys.Trays { return slots.ToList(); } + /// + /// 重置周转盘穴位状态 + /// + public void ResetStatus() + { + foreach (TurnoverTraySlot slot in slots) + { + slot.IsHasProduct = false; + slot.FromIndex = 0; + slot.FromType = TurnoverType.Unknown; + } + } } @@ -157,6 +170,11 @@ namespace Rs.MotionPlat.Entitys.Trays FromIndex = nozzle.FromIndex; FromType = nozzle.FromType; SuckerNo = nozzle.NozzleIndex; + Task.Run(() => { + SqliteHelper db = new SqliteHelper(); + string updateSql = $"update TrayStatus set status=1 where trayname='TurnoverTray' and slotindex={Index}"; + db.ExecuteNonQuery(updateSql); + }); } public void AddProduct(TransitNozzle nozzle) @@ -166,6 +184,25 @@ namespace Rs.MotionPlat.Entitys.Trays FromIndex = nozzle.FromIndex; FromType = nozzle.FromType; SuckerNo = nozzle.NozzleIndex; + Task.Run(() => { + SqliteHelper db = new SqliteHelper(); + string updateSql = $"update TrayStatus set status=1 where trayname='TurnoverTray' and slotindex={Index}"; + db.ExecuteNonQuery(updateSql); + }); + } + + public void ClearProduct() + { + IsHasProduct = false; + SN = ""; + FromIndex = 0; + FromType = TurnoverType.Unknown; + SuckerNo = 0; + Task.Run(() => { + SqliteHelper db = new SqliteHelper(); + string updateSql = $"update TrayStatus set status=0 where trayname='TurnoverTray' and slotindex={Index}"; + db.ExecuteNonQuery(updateSql); + }); } public bool HasVac() @@ -175,6 +212,13 @@ namespace Rs.MotionPlat.Entitys.Trays return false; } + public void ResetStatus() + { + IsHasProduct = false; + FromIndex = 0; + FromType = TurnoverType.Unknown; + } + /// /// 穴位真空异常 /// diff --git a/Rs.SkyLine/Flow/LoadAndUnloadTask.cs b/Rs.SkyLine/Flow/LoadAndUnloadTask.cs index 4bc2773..15a0c80 100644 --- a/Rs.SkyLine/Flow/LoadAndUnloadTask.cs +++ b/Rs.SkyLine/Flow/LoadAndUnloadTask.cs @@ -884,6 +884,38 @@ namespace Rs.MotionPlat.Flow else return slotIndex + 16; } + /// + /// 创建从排料吸嘴到多功能料仓的下料任务 + /// + public void CreateDischargeNozzleCleanOutTask() + { + lock(this) + { + + List unloadNozzles = NozzleManager.GetNozzlesByStatus(ENozzleStatus.ToUnload); + if (unloadNozzles != null && unloadNozzles.Count > 0) + { + foreach (Nozzle nozzle in unloadNozzles) + { + TurnoverInfo ti = new TurnoverInfo(); + ti.GUID = GuidHelper.Create(); + ti.FromType = TurnoverType.Turnover; + ti.FromFloor = 1; + ti.FromIndex = nozzle.NozzleIndex-1; + ti.SN = ""; + ti.ToType = TurnoverType.Multifunction; + ti.ToFloor = 1; + ti.ToIndex = 0; + ti.taskMode = ETaskType.Unload; + ti.Instruction = EInstruction.LoadAndUnload; + ti.GroupID = 0; + ti.TurnoverID = 0; + unloadTaskList.Add(ti); + } + } + } + } + /// /// 创建周转盘清料任务 /// @@ -891,34 +923,82 @@ namespace Rs.MotionPlat.Flow { lock(this) { - for (int i = 0; i < 32; i++) + foreach(TurnoverTraySlot slot in TurnoverTrayManager.Instance.Slots) { - TurnoverInfo ti = new TurnoverInfo(); - ti.GUID = GuidHelper.Create(); - ti.FromType = TurnoverType.Turnover; - ti.FromFloor = 1; - ti.FromIndex = i; - ti.SN = ""; - ti.ToType = TurnoverType.Multifunction; - ti.ToFloor = 1; - ti.ToIndex = 0; - ti.taskMode = ETaskType.Unload; - ti.Instruction = EInstruction.LoadAndUnload; - ti.GroupID = 0; - ti.TurnoverID = 0; - unloadTaskList.Add(ti); + if(slot.IsHasProduct) + { + TurnoverInfo ti = new TurnoverInfo(); + ti.GUID = GuidHelper.Create(); + ti.FromType = TurnoverType.Turnover; + ti.FromFloor = 1; + ti.FromIndex = slot.Index - 1; + ti.SN = ""; + ti.ToType = TurnoverType.Multifunction; + ti.ToFloor = 1; + ti.ToIndex = 0; + ti.taskMode = ETaskType.Unload; + ti.Instruction = EInstruction.LoadAndUnload; + ti.GroupID = 0; + ti.TurnoverID = 0; + unloadTaskList.Add(ti); + } } } } /// - /// 创建测试治具清料任务 + /// 创建周转吸嘴 /// - private void CreateFixtureCleanTask() + public void CreateTurnoverNozzleTestTrayCleanTask() { + lock(this) + { + List hasProductNozzles = TransitNozzleManager.Instance.GetHasProductNozzles(); + if (hasProductNozzles != null && hasProductNozzles.Count > 0) + { + foreach (TransitNozzle nozzle in hasProductNozzles) + { + TurnoverInfo ti = new TurnoverInfo(); + ti.GUID = GuidHelper.Create(); + ti.FromType = TurnoverType.Tester; + ti.FromFloor = 1; + ti.FromIndex = nozzle.NozzleIndex-1; + ti.SN = ""; + ti.ToType = TurnoverType.Turnover; + ti.ToFloor = 1; + ti.ToIndex = TestUnLoadSlotIndexChange(nozzle.NozzleIndex) - 1; + ti.taskMode = ETaskType.TestLoad; + ti.Instruction = EInstruction.LoadAndUnload; + ti.GroupID = 0; + ti.TurnoverID = 0; + testUnloadTaskList.Add(ti); + } + } + List hasProductSlots = TestTrayManager.Instance.GetSlots(ETestTraySlotStatus.Have); + if (hasProductSlots != null && hasProductSlots.Count > 0) + { + foreach (TestTraySlot slot in hasProductSlots) + { + TurnoverInfo ti = new TurnoverInfo(); + ti.GUID = GuidHelper.Create(); + ti.FromType = TurnoverType.Tester; + ti.FromFloor = 1; + ti.FromIndex = slot.Index - 1; + ti.SN = ""; + ti.ToType = TurnoverType.Turnover; + ti.ToFloor = 1; + ti.ToIndex = TestUnLoadSlotIndexChange(slot.Index) - 1; + ti.taskMode = ETaskType.TestLoad; + ti.Instruction = EInstruction.LoadAndUnload; + ti.GroupID = 0; + ti.TurnoverID = 0; + testUnloadTaskList.Add(ti); + } + } + } + } - } /// diff --git a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs index 2a166f4..1b17598 100644 --- a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs @@ -147,8 +147,24 @@ namespace Rs.MotionPlat.Flow StockTrayToTurnoverTray = true; logInfo = GetClassName()+$"接收到排料任务"; MessageQueue.Instance.Insert(logInfo); + if(GlobalVar.CleanOut && GlobalVar.DischargeNozzleHasProduct) + { + foreach(TurnoverInfo ti in LoadAndUnloadTask.Instance.GetUnDealedTask()) + { + ti.Dealed = true; + } + mrs = new List(); + for (int i = 0; i < 8; i++) + { + mrs.Add(new MatchResult()); + } + flowStep = EDischargeFlowStep.到放料位上方; + } + else + { + flowStep = EDischargeFlowStep.到取料位上方; + } - flowStep = EDischargeFlowStep.到取料位上方; } } break; @@ -459,6 +475,7 @@ namespace Rs.MotionPlat.Flow reFetchNum = 0; logInfo = GetClassName()+$"排料吸嘴{curNozzle.NozzleIndex}号真空检测OK"; MessageQueue.Instance.Insert(logInfo); + GlobalTray.DischargeNozzle.ChangeStatus(curNozzle.NozzleIndex, ESlotStatus.Have); UpdateNozzleStatus(curNozzle, curTask); undoTaskNum = LoadAndUnloadTask.Instance.GetTaskNum(curTask.taskMode); if (undoTaskNum > 0 && NozzleManager.GetNozzlesByStatus(ENozzleStatus.IDLE).Count > 0) @@ -1075,9 +1092,9 @@ namespace Rs.MotionPlat.Flow //如果吸嘴是1，并且最后一列 downSlot = GlobalTray.MultiTray.GetSlot(ESlotStatus.NotHave); #region 为了解决第一个吸嘴到不了最后一列的问题 - if (curNozzle.NozzleIndex == 1 && downSlot != null && (downSlot.Column == 0)) + if (curNozzle.NozzleIndex == 1 && downSlot != null && (downSlot.Column == 7)) { - if (downSlot.Column == 0) + if (downSlot.Column == 7) { downSlot = GlobalTray.MultiTray.GetSlot(downSlot.Index + 1); } @@ -1117,7 +1134,7 @@ namespace Rs.MotionPlat.Flow if (curSlotPoint != null) { nozzleDist = TrayPointManager.GetDistToNozzle1(curNozzle.NozzleIndex); - if (mrs[curNozzle.NozzleIndex - 1].OffsetRow < 3 && mrs[curNozzle.NozzleIndex - 1].OffsetCol < 3) + if (mrs!=null && mrs.Count>0 && mrs.Count>=curNozzle.NozzleIndex && mrs[curNozzle.NozzleIndex - 1].OffsetRow < 3 && mrs[curNozzle.NozzleIndex - 1].OffsetCol < 3) { targetX = mrs[curNozzle.NozzleIndex - 1].OffsetCol + curSlotPoint.X + nozzleDist.X + turnoverOffsetPoint.X; targetY = mrs[curNozzle.NozzleIndex - 1].OffsetRow + curSlotPoint.Y + nozzleDist.Y + turnoverOffsetPoint.Y; @@ -1353,6 +1370,7 @@ namespace Rs.MotionPlat.Flow } else { + GlobalTray.DischargeNozzle.ChangeStatus(curNozzle.NozzleIndex, ESlotStatus.NotHave); /*关闭排料吸嘴真空吸*/ //logInfo = GetClassName() + $"关闭{curNozzle.NozzleIndex}号排料吸嘴真空吸"; //MessageQueue.Instance.Insert(logInfo); @@ -1439,6 +1457,7 @@ namespace Rs.MotionPlat.Flow { if (Ops.IsOn($"周转盘{curNozzle.ToIndex + 1}号穴位真空吸检测") || GlobalVar.RunSpace) { + logInfo = GetClassName() + $"周转盘{curNozzle.ToIndex + 1}号穴位真空吸检测OK"; MessageQueue.Instance.Insert(logInfo); flowStep = EDischargeFlowStep.放料任务完成; @@ -1619,6 +1638,7 @@ namespace Rs.MotionPlat.Flow //Ops.HomeAndGoStartPos($"NozzleR{NozzleIndex}"); if (curNozzle.Status == ENozzleStatus.ToUnload) { + GlobalTray.DischargeNozzle.ChangeStatus(curNozzle.NozzleIndex, ESlotStatus.NotHave); logInfo = GetClassName() + $"排料吸嘴{curNozzle.NozzleIndex}号{WitchTrayWitchSlot(curNozzle.ToType, curNozzle.ToIndex)}放料任务完成"; MessageQueue.Instance.Insert(logInfo); if (curNozzle.ToType == TurnoverType.Turnover) @@ -1705,7 +1725,7 @@ namespace Rs.MotionPlat.Flow //检测一下是否需要换盘 { #region 通知中控排料任务结束 - if(curNozzle.ToType!= TurnoverType.Turnover) + if(curNozzle.ToType!= TurnoverType.Turnover && !GlobalVar.CleanOut) { if (TestCenter.Instance.LoadResult()) { diff --git a/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs b/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs index 2747367..e6cb651 100644 --- a/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs @@ -197,16 +197,19 @@ namespace Rs.AutoDischarge.V3.Flow } else { + MessageQueue.Instance.Warn("stock is busy"); return false; } IAxis StockZ = AxisControl.GetAxis($"StockZ{(int)m_stockType}"); if(StockZ.HomeStatus!= EHomeStatus.Finished && !GlobalVar.VirtualAxis) { + MessageQueue.Instance.Warn($"not homed {StockZ.HomeStatus}"); MsgBox.ShowAxisAlarmDialog(StockZ, ErrorCode.AxisNotHome); return false; } if (!finished) { + MessageQueue.Instance.Warn("stock is busy"); return false; } else @@ -437,6 +440,7 @@ namespace Rs.AutoDischarge.V3.Flow public void Reset() { + finished = true; isRunning = false; loadStep = EStockTrayLoadFlowStep.料仓缺料盘检测; unloadStep = EStockTrayUnloadFlowStep.料仓满料检测; diff --git a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs index cee796d..31400d7 100644 --- a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs @@ -197,7 +197,14 @@ namespace Rs.MotionPlat.Flow retakeNum = 0; logInfo = GetClassName() + $"接收到测试工位下料任务"; MessageQueue.Instance.Insert(logInfo); - Step = ETurnoverFlowStep.测试完成抬起到高速位; + if(GlobalVar.CleanOut==true && GlobalVar.TurnoverNozzleHasProduct) + { + Step = ETurnoverFlowStep.到周转盘放料位上方; + } + else + { + Step = ETurnoverFlowStep.测试完成抬起到高速位; + } //Step = ETurnoverFlowStep.到测试取料位上方; } break; @@ -471,6 +478,7 @@ namespace Rs.MotionPlat.Flow { if (Ops.IsOn($"周转{task.ToIndex + 1}号吸嘴真空吸检测") || GlobalVar.VirtualAxis || GlobalVar.RunSpace) { + GlobalTray.TurnoverNozzle.ChangeStatus(task.ToIndex + 1, ESlotStatus.Have); //如果真空检测OK，带料产品已经吸上了 TransitNozzleManager.Instance.Nozzle(task.ToIndex + 1).AddProduct(task); TurnoverTrayManager.Instance.Slot(task.FromIndex + 1).ClearProduct(); @@ -547,6 +555,7 @@ namespace Rs.MotionPlat.Flow while (true) { alarmInfo = $"测试穴位{testTrayHasProductList.ToJoinString()}中有产品，请取出后点击确定"; + LogHelper.Debug(alarmInfo); MsgBox.ShowDialog(1, alarmInfo, ETipButton.Ok); //再次检测 TestTrayHasProduct(); @@ -753,6 +762,7 @@ namespace Rs.MotionPlat.Flow { //获取需要放料的吸嘴 hasProductNozzles = TransitNozzleManager.Instance.GetHasProductNozzles(); + //TrayStatusManager.UpdateMultiSlotAsync("TurnoverNozzle", hasProductNozzles.Select(n => n.NozzleIndex).ToArray(), 0); logInfo = GetClassName() + $"已运动到到测试放料位下方2 TurnoverZ at:{Ops.GetCurPosition(AxisAlias.TurnoverZ)}"; MessageQueue.Instance.Insert(logInfo); /*打开测试穴位真空吸*/ @@ -763,7 +773,8 @@ namespace Rs.MotionPlat.Flow VacManager.TransitNozzleVacBreak(EVacOperator.Open, true, hasProductNozzles.Select(n => n.NozzleIndex).ToArray()); /*关闭周转吸头真空破*/ VacManager.TransitNozzleVacBreak(EVacOperator.Close, true, hasProductNozzles.Select(n => n.NozzleIndex).ToArray()); - + //在这里更新产品状态 + //TransitNozzleManager.Instance.Transi Step = ETurnoverFlowStep.测试位放料完成抬起1; } } @@ -914,7 +925,11 @@ namespace Rs.MotionPlat.Flow if (Ops.IsOff($"测试{nozzle.NozzleIndex}号穴位光纤检测") || GlobalVar.RunSpace) { //如果出现光纤异常，先用压头压一下 - FiberWarningPressFlow.Instance.Press(); + if(!GlobalVar.RunSpace) + { + FiberWarningPressFlow.Instance.Press(); + } + //压一下之后如果还出现异常，则报警 if(Ops.IsOff($"测试{nozzle.NozzleIndex}号穴位光纤检测")) { @@ -965,6 +980,7 @@ namespace Rs.MotionPlat.Flow { if (Ops.IsOn($"测试{nozzle.NozzleIndex}号穴位真空吸检测") || GlobalVar.RunSpace || GlobalVar.DisableFixtureVacuumCheck) { + GlobalTray.TurnoverNozzle.ChangeStatus(nozzle.NozzleIndex, ESlotStatus.NotHave); GlobalTray.TestTray.ChangeStatus(nozzle.NozzleIndex, ESlotStatus.Have); TestTrayManager.Instance.Slot(nozzle.NozzleIndex).AddProduct(nozzle); nozzle.Clear(); @@ -1120,7 +1136,8 @@ namespace Rs.MotionPlat.Flow case ETurnoverFlowStep.等待到测试保压位下方2: if (Ops.IsStop(AxisControl.PressZ) || GlobalVar.VirtualAxis) { - if(Ops.IsArrived(AxisControl.PressZ) || GlobalVar.VirtualAxis) + Thread.Sleep(100); + //if(Ops.IsArrived(AxisControl.PressZ) || GlobalVar.VirtualAxis) { logInfo = GetClassName() + $"已到测试保压位下方2 PressZ at:{Ops.GetCurPosition(AxisAlias.PressZ)}"; MessageQueue.Instance.Insert(logInfo); @@ -1543,6 +1560,7 @@ namespace Rs.MotionPlat.Flow TestTraySlot testSlot = TestTrayManager.Instance.Slot(task.FromIndex + 1); if (Ops.IsOn($"周转{task.FromIndex + 1}号吸嘴真空吸检测") || GlobalVar.VirtualAxis || GlobalVar.RunSpace) { + GlobalTray.TurnoverNozzle.ChangeStatus(task.FromIndex + 1, ESlotStatus.Have); logInfo = $"周转{task.FromIndex + 1}号吸嘴真空吸检测OK"; MessageQueue.Instance.Insert(logInfo); testSlot.ClearProduct(); @@ -1593,7 +1611,7 @@ namespace Rs.MotionPlat.Flow } break; case ETurnoverFlowStep.等待排料离开周转盘: - if (bTakeFlag) + if (bTakeFlag|| GlobalVar.CleanOut) { Step = ETurnoverFlowStep.到周转盘放料位上方; } @@ -1781,9 +1799,14 @@ namespace Rs.MotionPlat.Flow { if(Ops.IsArrived(AxisControl.TurnoverZ) || GlobalVar.VirtualAxis) { + foreach (TransitNozzle nozzle in hasProductNozzles) + { + GlobalTray.TurnoverNozzle.ChangeStatus(nozzle.NozzleIndex, ESlotStatus.NotHave); + } logInfo = GetClassName() + $"已运动到周转盘放料位下方2"; MessageQueue.Instance.Insert(logInfo); hasProductNozzles = TransitNozzleManager.Instance.GetHasProductNozzles(); + //TrayStatusManager.UpdateMultiSlotAsync("TurnoverNozzle", hasProductNozzles.Select(n => n.NozzleIndex).ToArray(), 0); /*关闭周转吸头真空吸*/ VacManager.TransitNozzleVacSuction(EVacOperator.Close, true, hasProductNozzles.Select(n => n.FromIndex + 1).ToArray()); /*打开周转吸头真空破*/ @@ -2125,19 +2148,30 @@ namespace Rs.MotionPlat.Flow } break; case ETurnoverFlowStep.上报中控任务完成: - if (LoadAndUnloadTask.Instance.TestUnloadTaskArrived) + if(GlobalVar.CleanOut) { - hasUnloadFlag = false; - LoadAndUnloadTask.Instance.TestUnloadTaskArrived = false; - MachineManage.Instance.SetTesterState(new TesterInfo() { State = ETesterState.NotReady, ReadySites = null }); - logInfo = GetClassName() + "通知中控产品全部已从治具中取出，状态变成NotReady"; - MessageQueue.Instance.Insert(logInfo); unloadOk = true; - TestCenter.Instance.LoadTestUnLoadResult(); + MachineManage.Instance.SetTesterState(new TesterInfo() { State = ETesterState.NotReady, ReadySites = null }); LoadAndUnloadTask.Instance.Clear(1); - MachineManage.Instance.SetLoadUnloadStatus(ERunState.Waiting); Step = ETurnoverFlowStep.等待任务; } + else + { + if (LoadAndUnloadTask.Instance.TestUnloadTaskArrived) + { + hasUnloadFlag = false; + LoadAndUnloadTask.Instance.TestUnloadTaskArrived = false; + MachineManage.Instance.SetTesterState(new TesterInfo() { State = ETesterState.NotReady, ReadySites = null }); + logInfo = GetClassName() + "通知中控产品全部已从治具中取出，状态变成NotReady"; + MessageQueue.Instance.Insert(logInfo); + unloadOk = true; + TestCenter.Instance.LoadTestUnLoadResult(); + LoadAndUnloadTask.Instance.Clear(1); + MachineManage.Instance.SetLoadUnloadStatus(ERunState.Waiting); + Step = ETurnoverFlowStep.等待任务; + } + } + break; } } diff --git a/Rs.SkyLine/Flow/SubFlow/CleanOutFlow.cs b/Rs.SkyLine/Flow/SubFlow/CleanOutFlow.cs new file mode 100644 index 0000000..7cebd31 --- /dev/null +++ b/Rs.SkyLine/Flow/SubFlow/CleanOutFlow.cs @@ -0,0 +1,179 @@ +using Rs.Framework; +using Rs.MotionPlat.Commom; +using Rs.MotionPlat.Entitys.Trays; +using Rs.MotionPlat.Recipe; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Rs.MotionPlat.Flow.SubFlow +{ + enum ECleanOutFlowStep + { + 排料吸嘴检测, + 等待排料吸嘴处理完成, + 周转盘检测, + 等待周转盘处理完成, + 周转吸嘴测试治具检测, + 等待周转吸嘴测试治具处理完成, + } + /// + /// 清料处理流程 + /// + public class CleanOutFlow + { + string logInfo = string.Empty; + bool run = false; + ECleanOutFlowStep step = ECleanOutFlowStep.排料吸嘴检测; + private static CleanOutFlow _instance; + public static CleanOutFlow Instance + { + get + { + if(_instance==null) + _instance = new CleanOutFlow(); + return _instance; + } + } + private CleanOutFlow() { } + + public void CleanOut() + { + if (run) + return; + else + run = true; + ECleanOutFlowStep step = ECleanOutFlowStep.排料吸嘴检测; + Task.Run(() => { + while (run) + { + switch (step) + { + case ECleanOutFlowStep.排料吸嘴检测: + if(MachineManage.Instance.MachineStatus== EMachineStatus.Working && WorkEnvironment.Instance.EnvironmentOk) + { + List unloadNozzles = NozzleManager.GetNozzlesByStatus(ENozzleStatus.ToUnload); + if (unloadNozzles != null && unloadNozzles.Count > 0) + { + LogHelper.Debug(GetClassName() + $"检测到排料吸嘴有料{unloadNozzles.Count}"); + GlobalVar.DischargeNozzleHasProduct = true; + //生成下料任务 + LoadAndUnloadTask.Instance.CreateDischargeNozzleCleanOutTask(); + Thread.Sleep(100); + step = ECleanOutFlowStep.等待排料吸嘴处理完成; + } + else + { + LogHelper.Debug(GetClassName() + $"检测到排料吸嘴无料"); + step = ECleanOutFlowStep.周转盘检测; + } + } + break; + case ECleanOutFlowStep.等待排料吸嘴处理完成: + if(DischargeFlow.Instance.GetCurStep()=="等待任务") + { + GlobalVar.DischargeNozzleHasProduct = false; + step = ECleanOutFlowStep.周转盘检测; + } + break; + case ECleanOutFlowStep.周转盘检测: + //检测周转盘是否有任务 + int num = TurnoverTrayManager.Instance.Slots.Where(s => s.IsHasProduct).Count(); + if (num > 0) + { + LogHelper.Debug(GetClassName() + $"检测到周转盘有料{num}"); + LoadAndUnloadTask.Instance.CreateTurnoverTrayCleanTask(); + Thread.Sleep(1000); + step = ECleanOutFlowStep.等待周转盘处理完成; + } + else + { + LogHelper.Debug(GetClassName() + $"检测到周转盘无料"); + //检测周转吸嘴是否有料 + if (TransitNozzleManager.Instance.GetHasProductNozzles().Count > 0 || TestTrayManager.Instance.GetSlots(ETestTraySlotStatus.Have).Count > 0) + { + step = ECleanOutFlowStep.周转吸嘴测试治具检测; + } + else + { + //清料结束 + run = false; + logInfo = $"CleanOut finished"; + MessageQueue.Instance.Insert(logInfo); + //清料结束 + GlobalVar.CleanOut = false; + GlobalVar.DischargeNozzleHasProduct = false; + GlobalVar.TurnoverNozzleHasProduct = false; + Ops.Stop(); + MachineManage.Instance.SetLoadUnloadStatus(ERunState.Waiting); + } + } + break; + case ECleanOutFlowStep.等待周转盘处理完成: + if(DischargeFlow.Instance.GetCurStep()=="等待任务") + { + //检测周转吸嘴是否有料 + if (TransitNozzleManager.Instance.GetHasProductNozzles().Count > 0 || TestTrayManager.Instance.GetSlots(ETestTraySlotStatus.Have).Count > 0) + { + step = ECleanOutFlowStep.周转吸嘴测试治具检测; + } + else + { + logInfo = $"CleanOut finished"; + MessageQueue.Instance.Insert(logInfo); + //清料结束 + GlobalVar.CleanOut = false; + GlobalVar.DischargeNozzleHasProduct = false; + GlobalVar.TurnoverNozzleHasProduct = false; + Ops.Stop(); + run = false; + MachineManage.Instance.SetLoadUnloadStatus(ERunState.Waiting); + } + } + break; + case ECleanOutFlowStep.周转吸嘴测试治具检测: + //检测周转吸嘴是否有料 + if (TransitNozzleManager.Instance.GetHasProductNozzles().Count > 0 || TestTrayManager.Instance.GetSlots(ETestTraySlotStatus.Have).Count > 0) + { + if(TransitNozzleManager.Instance.GetHasProductNozzles().Count > 0) + { + GlobalVar.TurnoverNozzleHasProduct = true; + } + LogHelper.Debug(GetClassName() + $"检测到周转吸嘴有料{TransitNozzleManager.Instance.GetHasProductNozzles().Count}"); + LoadAndUnloadTask.Instance.CreateTurnoverNozzleTestTrayCleanTask(); + Thread.Sleep(1000); + step = ECleanOutFlowStep.等待周转吸嘴测试治具处理完成; + } + else + { + LogHelper.Debug(GetClassName() + $"检测到周转吸嘴无料"); + step = ECleanOutFlowStep.周转盘检测; + } + break; + case ECleanOutFlowStep.等待周转吸嘴测试治具处理完成: + if (TurnoverFlow.Instance.GetStep() == "等待任务") + { + step = ECleanOutFlowStep.周转盘检测; + } + break; + default: + break; + } + } + }); + } + + private string GetClassName() + { + return "CleanOutFlow_"; + } + + public void Quit() + { + run = false; + } + } +} diff --git a/Rs.SkyLine/Flow/TestCenter.cs b/Rs.SkyLine/Flow/TestCenter.cs index 20f03f4..ff9b0e5 100644 --- a/Rs.SkyLine/Flow/TestCenter.cs +++ b/Rs.SkyLine/Flow/TestCenter.cs @@ -135,7 +135,13 @@ namespace Rs.MotionPlat.Flow switch (eInstructioneInstruction) { case EInstruction.Cleanout: + MachineManage.Instance.SetLoadUnloadStatus(ERunState.Busying); ReportToTestCenter(schedule); + Thread.Sleep(100); + //在这里启动 + GlobalVar.CleanOut = true; + Ops.Start(); + CleanOutFlow.Instance.CleanOut(); break; case EInstruction.TransferSiloTray: ReportToTestCenter(schedule); @@ -167,6 +173,7 @@ namespace Rs.MotionPlat.Flow case EInstruction.CancelLoadAndUnload: //schedulResult = new SchedulingResult() { Instruction = EInstruction.CancelLoadAndUnload, State = ERunState.Busying, GroupID = sm.GroupID, TurnoverID = sm.TurnoverID }; ReportToTestCenter(schedule); + MachineManage.Instance.SetLoadUnloadStatus(ERunState.Waiting); break; case EInstruction.InquireStatus: SchedulingStatusInfo statusInto = JsonConvert.DeserializeObject(json); diff --git a/Rs.SkyLine/Flow/WorkEnvironment.cs b/Rs.SkyLine/Flow/WorkEnvironment.cs index 9a2de31..290fb04 100644 --- a/Rs.SkyLine/Flow/WorkEnvironment.cs +++ b/Rs.SkyLine/Flow/WorkEnvironment.cs @@ -58,19 +58,22 @@ namespace Rs.MotionPlat.Flow switch (step) { case EStockCheckStep.Input料仓是否就绪: - if ((!StockManager.Instance.GetStock(ETrayType.Input).HasTray() && StockManager.Instance.GetStock(ETrayType.Input).Status!= EStockTrayStatus.Backed) - || GlobalVar.VirtualAxis) - { - logInfo = GetClassName() + $"{ETrayType.Input}料仓无料盘，开始给{ETrayType.Input}料仓上料"; - MessageQueue.Instance.Insert(logInfo); - Task.Run(() => { - StockManager.Instance.GetStock(ETrayType.Input).Load(EStockTrayLoadMode.Whole, null);//.Load(EStockType.Input, EStockTrayLoadMode.Whole); - }); - } - else + if(!GlobalVar.CleanOut) { - logInfo = GetClassName() + $"{ETrayType.Input}料仓有料盘"; - MessageQueue.Instance.Insert(logInfo); + if ((!StockManager.Instance.GetStock(ETrayType.Input).HasTray() && StockManager.Instance.GetStock(ETrayType.Input).Status != EStockTrayStatus.Backed) + || GlobalVar.VirtualAxis) + { + logInfo = GetClassName() + $"{ETrayType.Input}料仓无料盘，开始给{ETrayType.Input}料仓上料"; + MessageQueue.Instance.Insert(logInfo); + Task.Run(() => { + StockManager.Instance.GetStock(ETrayType.Input).Load(EStockTrayLoadMode.Whole, null);//.Load(EStockType.Input, EStockTrayLoadMode.Whole); + }); + } + else + { + logInfo = GetClassName() + $"{ETrayType.Input}料仓有料盘"; + MessageQueue.Instance.Insert(logInfo); + } } if (!StockManager.Instance.GetStock(ETrayType.Empty2).HasTray() || GlobalVar.VirtualAxis) { @@ -88,84 +91,98 @@ namespace Rs.MotionPlat.Flow step = EStockCheckStep.Ok料仓是否就绪; break; case EStockCheckStep.Ok料仓是否就绪: - if (!StockManager.Instance.GetStock(ETrayType.Ok).HasTray() || GlobalVar.VirtualAxis) + if (!GlobalVar.CleanOut) { - logInfo = GetClassName() + $"{ETrayType.Ok}料仓无料盘，开始给{ETrayType.Ok}料仓上料"; - MessageQueue.Instance.Insert(logInfo); - //if (StockManager.Instance.HasTray(EStockType.Empty2)) + if (!StockManager.Instance.GetStock(ETrayType.Ok).HasTray() || GlobalVar.VirtualAxis) { - //LogHelper.Debug("Empty2料仓有料，开始搬运Empty2->Ok"); - //if( - TakeTrayFlow.Instance.Take(ETrayType.Empty2, ETrayType.Ok, - () => - { - GlobalTray.GetTray(ETrayType.Empty2).ChangeStatus(Controls.ESlotStatus.Null); - Task.Run(() => + logInfo = GetClassName() + $"{ETrayType.Ok}料仓无料盘，开始给{ETrayType.Ok}料仓上料"; + MessageQueue.Instance.Insert(logInfo); + //if (StockManager.Instance.HasTray(EStockType.Empty2)) + { + //LogHelper.Debug("Empty2料仓有料，开始搬运Empty2->Ok"); + //if( + TakeTrayFlow.Instance.Take(ETrayType.Empty2, ETrayType.Ok, + () => { - StockManager.Instance.GetStock(ETrayType.Empty2).Load(EStockTrayLoadMode.Whole, null); - }); - }, null, - () => - { - - Task.Run(() => + GlobalTray.GetTray(ETrayType.Empty2).ChangeStatus(Controls.ESlotStatus.Null); + Task.Run(() => + { + StockManager.Instance.GetStock(ETrayType.Empty2).Load(EStockTrayLoadMode.Whole, null); + }); + }, null, + () => { - StockManager.Instance.GetStock(ETrayType.Ok).Load(EStockTrayLoadMode.AfterTakeTray, null); + + Task.Run(() => + { + StockManager.Instance.GetStock(ETrayType.Ok).Load(EStockTrayLoadMode.AfterTakeTray, null); + }); }); - }); - //) - //{ + //) + //{ step = EStockCheckStep.Ng料仓是否就绪; - //} - - //restoreStep = EStockCheckStep.Ng料仓是否就绪; + //} + + //restoreStep = EStockCheckStep.Ng料仓是否就绪; + } + } + else + { + logInfo = GetClassName() + $"{ETrayType.Ok}料仓有料盘"; + MessageQueue.Instance.Insert(logInfo); + step = EStockCheckStep.Ng料仓是否就绪; } } else { - logInfo = GetClassName() + $"{ETrayType.Ok}料仓有料盘"; - MessageQueue.Instance.Insert(logInfo); step = EStockCheckStep.Ng料仓是否就绪; } break; case EStockCheckStep.Ng料仓是否就绪: - if (!StockManager.Instance.GetStock(ETrayType.Ng).HasTray() || GlobalVar.VirtualAxis) + if(!GlobalVar.CleanOut) { - logInfo = GetClassName() + $"{ETrayType.Ng}料仓无料，开始给{ETrayType.Ng}料仓上料"; - MessageQueue .Instance.Insert(logInfo); - //if (StockManager.Instance.HasTray(EStockType.Empty2)) + if (!StockManager.Instance.GetStock(ETrayType.Ng).HasTray() || GlobalVar.VirtualAxis) { - //LogHelper.Debug("Empty2料仓有料，开始搬运Empty2->Ng"); - //if ( - TakeTrayFlow.Instance.Take(ETrayType.Empty2, ETrayType.Ng, - () => - { - GlobalTray.GetTray(ETrayType.Empty2).ChangeStatus(Controls.ESlotStatus.Null); - Task.Run(() => + logInfo = GetClassName() + $"{ETrayType.Ng}料仓无料，开始给{ETrayType.Ng}料仓上料"; + MessageQueue.Instance.Insert(logInfo); + //if (StockManager.Instance.HasTray(EStockType.Empty2)) + { + //LogHelper.Debug("Empty2料仓有料，开始搬运Empty2->Ng"); + //if ( + TakeTrayFlow.Instance.Take(ETrayType.Empty2, ETrayType.Ng, + () => { - StockManager.Instance.GetStock(ETrayType.Empty2).Load(EStockTrayLoadMode.Whole, null); - }); + GlobalTray.GetTray(ETrayType.Empty2).ChangeStatus(Controls.ESlotStatus.Null); + Task.Run(() => + { + StockManager.Instance.GetStock(ETrayType.Empty2).Load(EStockTrayLoadMode.Whole, null); + }); - }, null, - () => - { - Task.Run(() => + }, null, + () => { - StockManager.Instance.GetStock(ETrayType.Ng).Load(EStockTrayLoadMode.AfterTakeTray, null); + Task.Run(() => + { + StockManager.Instance.GetStock(ETrayType.Ng).Load(EStockTrayLoadMode.AfterTakeTray, null); + }); }); - }); - //) - //{ + //) + //{ step = EStockCheckStep.Multi料仓是否就绪; - //} - - //restoreStep = EStockCheckStep.Multi料仓是否就绪; + //} + + //restoreStep = EStockCheckStep.Multi料仓是否就绪; + } + } + else + { + logInfo = GetClassName() + $"{ETrayType.Ng}料仓有料盘"; + MessageQueue.Instance.Insert(logInfo); + step = EStockCheckStep.Multi料仓是否就绪; } } else { - logInfo = GetClassName() + $"{ETrayType.Ng}料仓有料盘"; - MessageQueue.Instance.Insert(logInfo); step = EStockCheckStep.Multi料仓是否就绪; } break; @@ -218,12 +235,25 @@ namespace Rs.MotionPlat.Flow // } // break; case EStockCheckStep.等待所有料仓就绪: - if(StockManager.Instance.IsReady()) + if(!GlobalVar.CleanOut) { - MessageQueue.Instance.Insert("所有料仓准备就绪"); - EnvironmentOk = true; - isRunning = false; - EnvReadyOkEvent.Set(); + if (StockManager.Instance.IsReady()) + { + MessageQueue.Instance.Insert("所有料仓准备就绪"); + EnvironmentOk = true; + isRunning = false; + EnvReadyOkEvent.Set(); + } + } + else + { + if(StockManager.Instance.GetStock(ETrayType.Multi).Status == EStockTrayStatus.Loaded) + { + MessageQueue.Instance.Insert("多功能料仓准备就绪"); + EnvironmentOk = true; + isRunning = false; + EnvReadyOkEvent.Set(); + } } break; } diff --git a/Rs.SkyLine/FormMain.cs b/Rs.SkyLine/FormMain.cs index be13bd5..ef2c3be 100644 --- a/Rs.SkyLine/FormMain.cs +++ b/Rs.SkyLine/FormMain.cs @@ -264,6 +264,8 @@ namespace Rs.MotionPlat GlobalTray.Empty2Tray = trayEmpty2; GlobalTray.TurnoverTray = trayTurnover; GlobalTray.TestTray = trayTest; + GlobalTray.DischargeNozzle= trayDischargeNozzle; + GlobalTray.TurnoverNozzle= trayTurnoverNozzle; //StockManager.Instance.Start(); LoadStockStatus(); HOperatorSet.ReadImage(out defaultImage, "default.bmp"); @@ -526,11 +528,119 @@ namespace Rs.MotionPlat { GlobalTray.GetTray(ETrayType.Empty2).Status = EStockTrayStatus.Empty.ToString(); } + + TrayStatusManager.InitDischargeNozzle(); + TrayStatusManager.InitTrunoverTray(); + TrayStatusManager.InitTurnoverNozzle(); + TrayStatusManager.InitFixtureTray(); } private void button1_Click(object sender, EventArgs e) { MsgBox.ShowDialog(111, "取料失败!! \r\n周转吸嘴取治具{}号穴位的物料时失败 \r\nPickup fail !!\r\nNozzle of tester from site{} socket\r\nPickup fail !!\r\nSite{} socket 으로부터 Unit을 pickup할때 pickup fail이 발생하였습니다.", ETipButton.Yes); } + + /// + /// 治具盘画盘后事件 + /// + /// + private void trayTest_DrawTrayAfterEvent(RsTray obj, ESlotStatus status, List opSlots) + { + //TestTrayManager.Instance.ResetStatus(); + //List slots = obj.GetSlots(ESlotStatus.Have); + LogHelper.Debug($"手动画盘设置{opSlots.Select(s=>s.Index).ToJoinString()}{status}"); + foreach (TraySlot slot in opSlots) + { + int slotIndex = slot.Index; + if(status== ESlotStatus.Have) + { + TestTrayManager.Instance.Slot(slotIndex).IsHasProduct = true; + } + else + { + TestTrayManager.Instance.Slot(slotIndex).ResetStatus(); + } + } + } + + /// + /// 周转盘画盘后事件 + /// + /// + private void trayTurnover_DrawTrayAfterEvent(RsTray obj, ESlotStatus status, List opSlots) + { + //TurnoverTrayManager.Instance.ResetStatus(); + //List slots = obj.GetSlots(ESlotStatus.Have); + LogHelper.Debug($"手动画盘设置{opSlots.Select(s => s.Index).ToJoinString()}{status}"); + foreach (TraySlot slot in opSlots) + { + int slotIndex = slot.Index; + if (status == ESlotStatus.Have) + { + TurnoverTrayManager.Instance.Slot(slotIndex).IsHasProduct = true; + } + else + { + TurnoverTrayManager.Instance.Slot(slotIndex).ResetStatus(); + } + } + } + /// + /// 周转吸嘴画盘后事件 + /// + /// + private void trayTurnoverNozzle_DrawTrayAfterEvent(RsTray obj, ESlotStatus status, List opSlots) + { + //TransitNozzleManager.Instance.ResetStatus(); + //List slots = obj.GetSlots(ESlotStatus.Have); + + LogHelper.Debug($"手动画盘设置{opSlots.Select(s => s.Index).ToJoinString()}{status}"); + foreach (TraySlot slot in opSlots) + { + int slotIndex = slot.Index; + if(status== ESlotStatus.Have) + { + TransitNozzleManager.Instance.Nozzle(slotIndex).FromType = TurnoverType.Turnover; + TransitNozzleManager.Instance.Nozzle(slotIndex).FromIndex = slotIndex - 1; + TransitNozzleManager.Instance.Nozzle(slotIndex).ToType = TurnoverType.Multifunction; + TransitNozzleManager.Instance.Nozzle(slotIndex).ToIndex = (slotIndex <= 8 ? slotIndex + 8 : slotIndex + 16) - 1; + TransitNozzleManager.Instance.Nozzle(slotIndex).IsHasProduct = true; + } + else + { + TransitNozzleManager.Instance.Nozzle(slotIndex).ResetStaus(); + } + } + } + /// + /// 排料吸嘴画盘后事件 + /// + /// + private void trayDischargeNozzle_DrawTrayAfterEvent(RsTray obj, ESlotStatus status, List opSlots) + { + //NozzleManager.GetAllNozzles().ForEach((n) => { n.ResetStatus(); }); + //List slots = obj.GetSlots(ESlotStatus.Have); + LogHelper.Debug($"手动画盘设置{opSlots.Select(s => s.Index).ToJoinString()}{status}"); + foreach (TraySlot slot in opSlots) + { + int slotIndex = slot.Index; + if (status == ESlotStatus.Have) + { + Nozzle nozzle = NozzleManager.GetNozzle(slotIndex); + if (nozzle != null) + { + NozzleManager.GetNozzle(slotIndex).FromType = TurnoverType.Turnover; + nozzle.FromIndex = slotIndex - 1; + NozzleManager.GetNozzle(slotIndex).ToType = TurnoverType.Multifunction; + nozzle.ToIndex = 0; + NozzleManager.GetNozzle(slotIndex).Status = ENozzleStatus.ToUnload; + } + } + else + { + NozzleManager.GetNozzle(slotIndex).ResetStatus(); + } + } + } } } diff --git a/Rs.SkyLine/FormMain.designer.cs b/Rs.SkyLine/FormMain.designer.cs index 72062ec..0eb3851 100644 --- a/Rs.SkyLine/FormMain.designer.cs +++ b/Rs.SkyLine/FormMain.designer.cs @@ -1,4 +1,7 @@ -namespace Rs.MotionPlat +using Rs.Controls; +using System.Collections.Generic; + +namespace Rs.MotionPlat { partial class FormMain { @@ -65,8 +68,11 @@ this.trayEmpty2 = new Rs.Controls.RsTray(); this.panelEx5 = new Rs.Controls.PanelEx(); this.tableLayoutPanel7 = new System.Windows.Forms.TableLayoutPanel(); - this.trayTurnover = new Rs.Controls.RsTray(); + this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel(); this.trayTest = new Rs.Controls.RsTray(); + this.trayTurnoverNozzle = new Rs.Controls.RsTray(); + this.trayTurnover = new Rs.Controls.RsTray(); + this.trayDischargeNozzle = new Rs.Controls.RsTray(); this.tableLayoutPanel8 = new System.Windows.Forms.TableLayoutPanel(); this.gboxNozzle5 = new System.Windows.Forms.GroupBox(); this.himgNozzle5 = new ChoiceTech.Halcon.Control.HWindow_Final(); @@ -178,6 +184,7 @@ this.tableLayoutPanel1.SuspendLayout(); this.panelEx5.SuspendLayout(); this.tableLayoutPanel7.SuspendLayout(); + this.tableLayoutPanel6.SuspendLayout(); this.tableLayoutPanel8.SuspendLayout(); this.gboxNozzle5.SuspendLayout(); this.gboxNozzle1.SuspendLayout(); @@ -241,9 +248,9 @@ this.panel1.Controls.Add(this.tableLayoutPanel3); this.panel1.Controls.Add(this.panel4); this.panel1.Dock = System.Windows.Forms.DockStyle.Right; - this.panel1.Location = new System.Drawing.Point(791, 0); + this.panel1.Location = new System.Drawing.Point(1240, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(451, 848); + this.panel1.Size = new System.Drawing.Size(451, 880); this.panel1.TabIndex = 8; // // tableLayoutPanel3 @@ -258,7 +265,7 @@ this.tableLayoutPanel3.RowCount = 2; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(451, 488); + this.tableLayoutPanel3.Size = new System.Drawing.Size(451, 520); this.tableLayoutPanel3.TabIndex = 3; // // panel3 @@ -266,9 +273,9 @@ this.panel3.Controls.Add(this.dgv_errinfo); this.panel3.Controls.Add(this.label2); this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(3, 247); + this.panel3.Location = new System.Drawing.Point(3, 263); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(445, 238); + this.panel3.Size = new System.Drawing.Size(445, 254); this.panel3.TabIndex = 1; // // dgv_errinfo @@ -297,7 +304,7 @@ this.dgv_errinfo.RowTemplate.DefaultCellStyle.BackColor = System.Drawing.Color.Black; this.dgv_errinfo.RowTemplate.DefaultCellStyle.ForeColor = System.Drawing.Color.Red; this.dgv_errinfo.RowTemplate.Height = 23; - this.dgv_errinfo.Size = new System.Drawing.Size(445, 215); + this.dgv_errinfo.Size = new System.Drawing.Size(445, 231); this.dgv_errinfo.TabIndex = 3; // // dataGridViewTextBoxColumn1 @@ -336,7 +343,7 @@ this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; this.panel2.Location = new System.Drawing.Point(3, 3); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(445, 238); + this.panel2.Size = new System.Drawing.Size(445, 254); this.panel2.TabIndex = 0; // // dgv_runinfo @@ -356,7 +363,7 @@ this.dgv_runinfo.RowTemplate.DefaultCellStyle.BackColor = System.Drawing.Color.Black; this.dgv_runinfo.RowTemplate.DefaultCellStyle.ForeColor = System.Drawing.Color.Lime; this.dgv_runinfo.RowTemplate.Height = 23; - this.dgv_runinfo.Size = new System.Drawing.Size(445, 215); + this.dgv_runinfo.Size = new System.Drawing.Size(445, 231); this.dgv_runinfo.TabIndex = 2; // // Time @@ -394,7 +401,7 @@ this.panel4.BackColor = System.Drawing.Color.Transparent; this.panel4.Controls.Add(this.tableLayoutPanel2); this.panel4.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel4.Location = new System.Drawing.Point(0, 488); + this.panel4.Location = new System.Drawing.Point(0, 520); this.panel4.Name = "panel4"; this.panel4.Size = new System.Drawing.Size(451, 360); this.panel4.TabIndex = 2; @@ -576,7 +583,7 @@ this.tabControlEx1.Location = new System.Drawing.Point(0, 0); this.tabControlEx1.Name = "tabControlEx1"; this.tabControlEx1.SelectedIndex = 0; - this.tabControlEx1.Size = new System.Drawing.Size(791, 848); + this.tabControlEx1.Size = new System.Drawing.Size(1240, 880); this.tabControlEx1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; this.tabControlEx1.TabIndex = 9; // @@ -587,7 +594,7 @@ this.tabPage1.Location = new System.Drawing.Point(4, 34); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(783, 810); + this.tabPage1.Size = new System.Drawing.Size(1232, 842); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "Home"; // @@ -595,11 +602,11 @@ // this.tableLayoutPanel1.ColumnCount = 6; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66666F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66666F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66666F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66666F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66666F)); this.tableLayoutPanel1.Controls.Add(this.trayEmpty1, 0, 1); this.tableLayoutPanel1.Controls.Add(this.trayInput, 1, 1); this.tableLayoutPanel1.Controls.Add(this.trayOk, 2, 1); @@ -617,7 +624,7 @@ this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(777, 804); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1226, 836); this.tableLayoutPanel1.TabIndex = 10; // // trayEmpty1 @@ -630,7 +637,7 @@ this.trayEmpty1.InitSlotStatus = Rs.Controls.ESlotStatus.NotHave; this.trayEmpty1.ItemName = null; this.trayEmpty1.LeftSpaceWidth = 20; - this.trayEmpty1.Location = new System.Drawing.Point(4, 406); + this.trayEmpty1.Location = new System.Drawing.Point(4, 422); this.trayEmpty1.Margin = new System.Windows.Forms.Padding(4); this.trayEmpty1.Name = "trayEmpty1"; this.trayEmpty1.OffsetX = 0F; @@ -642,7 +649,7 @@ this.trayEmpty1.ShowStatus = true; this.trayEmpty1.ShowText = true; this.trayEmpty1.SinglePoint = false; - this.trayEmpty1.Size = new System.Drawing.Size(121, 394); + this.trayEmpty1.Size = new System.Drawing.Size(196, 410); this.trayEmpty1.SortDir = Rs.Controls.ESortDir.LeftToRight; this.trayEmpty1.Status = null; this.trayEmpty1.TabIndex = 0; @@ -658,7 +665,7 @@ this.trayInput.InitSlotStatus = Rs.Controls.ESlotStatus.NotHave; this.trayInput.ItemName = null; this.trayInput.LeftSpaceWidth = 20; - this.trayInput.Location = new System.Drawing.Point(133, 406); + this.trayInput.Location = new System.Drawing.Point(208, 422); this.trayInput.Margin = new System.Windows.Forms.Padding(4); this.trayInput.Name = "trayInput"; this.trayInput.OffsetX = 0F; @@ -670,7 +677,7 @@ this.trayInput.ShowStatus = true; this.trayInput.ShowText = true; this.trayInput.SinglePoint = false; - this.trayInput.Size = new System.Drawing.Size(121, 394); + this.trayInput.Size = new System.Drawing.Size(196, 410); this.trayInput.SortDir = Rs.Controls.ESortDir.LeftToRight; this.trayInput.Status = null; this.trayInput.TabIndex = 0; @@ -686,7 +693,7 @@ this.trayOk.InitSlotStatus = Rs.Controls.ESlotStatus.NotHave; this.trayOk.ItemName = null; this.trayOk.LeftSpaceWidth = 20; - this.trayOk.Location = new System.Drawing.Point(262, 406); + this.trayOk.Location = new System.Drawing.Point(412, 422); this.trayOk.Margin = new System.Windows.Forms.Padding(4); this.trayOk.Name = "trayOk"; this.trayOk.OffsetX = 0F; @@ -698,7 +705,7 @@ this.trayOk.ShowStatus = true; this.trayOk.ShowText = true; this.trayOk.SinglePoint = false; - this.trayOk.Size = new System.Drawing.Size(121, 394); + this.trayOk.Size = new System.Drawing.Size(196, 410); this.trayOk.SortDir = Rs.Controls.ESortDir.LeftToRight; this.trayOk.Status = null; this.trayOk.TabIndex = 0; @@ -715,7 +722,7 @@ this.trayNg.InitSlotStatus = Rs.Controls.ESlotStatus.NotHave; this.trayNg.ItemName = null; this.trayNg.LeftSpaceWidth = 20; - this.trayNg.Location = new System.Drawing.Point(391, 406); + this.trayNg.Location = new System.Drawing.Point(616, 422); this.trayNg.Margin = new System.Windows.Forms.Padding(4); this.trayNg.Name = "trayNg"; this.trayNg.OffsetX = 0F; @@ -727,7 +734,7 @@ this.trayNg.ShowStatus = true; this.trayNg.ShowText = true; this.trayNg.SinglePoint = false; - this.trayNg.Size = new System.Drawing.Size(121, 394); + this.trayNg.Size = new System.Drawing.Size(196, 410); this.trayNg.SortDir = Rs.Controls.ESortDir.LeftToRight; this.trayNg.Status = null; this.trayNg.TabIndex = 0; @@ -744,7 +751,7 @@ this.trayMulti.InitSlotStatus = Rs.Controls.ESlotStatus.NotHave; this.trayMulti.ItemName = null; this.trayMulti.LeftSpaceWidth = 20; - this.trayMulti.Location = new System.Drawing.Point(520, 406); + this.trayMulti.Location = new System.Drawing.Point(820, 422); this.trayMulti.Margin = new System.Windows.Forms.Padding(4); this.trayMulti.Name = "trayMulti"; this.trayMulti.OffsetX = 0F; @@ -756,7 +763,7 @@ this.trayMulti.ShowStatus = true; this.trayMulti.ShowText = true; this.trayMulti.SinglePoint = false; - this.trayMulti.Size = new System.Drawing.Size(121, 394); + this.trayMulti.Size = new System.Drawing.Size(196, 410); this.trayMulti.SortDir = Rs.Controls.ESortDir.LeftToRight; this.trayMulti.Status = null; this.trayMulti.TabIndex = 0; @@ -773,7 +780,7 @@ this.trayEmpty2.InitSlotStatus = Rs.Controls.ESlotStatus.NotHave; this.trayEmpty2.ItemName = null; this.trayEmpty2.LeftSpaceWidth = 20; - this.trayEmpty2.Location = new System.Drawing.Point(649, 406); + this.trayEmpty2.Location = new System.Drawing.Point(1024, 422); this.trayEmpty2.Margin = new System.Windows.Forms.Padding(4); this.trayEmpty2.Name = "trayEmpty2"; this.trayEmpty2.OffsetX = 0F; @@ -785,7 +792,7 @@ this.trayEmpty2.ShowStatus = true; this.trayEmpty2.ShowText = true; this.trayEmpty2.SinglePoint = false; - this.trayEmpty2.Size = new System.Drawing.Size(124, 394); + this.trayEmpty2.Size = new System.Drawing.Size(198, 410); this.trayEmpty2.SortDir = Rs.Controls.ESortDir.LeftToRight; this.trayEmpty2.Status = null; this.trayEmpty2.TabIndex = 0; @@ -798,60 +805,48 @@ this.panelEx5.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx5.Location = new System.Drawing.Point(3, 3); this.panelEx5.Name = "panelEx5"; - this.panelEx5.Size = new System.Drawing.Size(252, 396); + this.panelEx5.Size = new System.Drawing.Size(402, 412); this.panelEx5.TabIndex = 1; // // tableLayoutPanel7 // this.tableLayoutPanel7.ColumnCount = 1; - this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel7.Controls.Add(this.trayTurnover, 0, 1); - this.tableLayoutPanel7.Controls.Add(this.trayTest, 0, 0); + this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel7.Controls.Add(this.tableLayoutPanel6, 0, 0); + this.tableLayoutPanel7.Controls.Add(this.trayDischargeNozzle, 0, 1); this.tableLayoutPanel7.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel7.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel7.Name = "tableLayoutPanel7"; this.tableLayoutPanel7.RowCount = 2; - this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel7.Size = new System.Drawing.Size(252, 396); + this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 75F)); + this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); + this.tableLayoutPanel7.Size = new System.Drawing.Size(402, 412); this.tableLayoutPanel7.TabIndex = 0; // - // trayTurnover - // - this.trayTurnover.CanDraw = false; - this.trayTurnover.ColSpace = 5; - this.trayTurnover.ColumnNum = 8; - this.trayTurnover.Dock = System.Windows.Forms.DockStyle.Fill; - this.trayTurnover.HeadText = "Turnover"; - this.trayTurnover.InitSlotStatus = Rs.Controls.ESlotStatus.NotHave; - this.trayTurnover.ItemName = null; - this.trayTurnover.LeftSpaceWidth = 20; - this.trayTurnover.Location = new System.Drawing.Point(4, 202); - this.trayTurnover.Margin = new System.Windows.Forms.Padding(4); - this.trayTurnover.Name = "trayTurnover"; - this.trayTurnover.OffsetX = 0F; - this.trayTurnover.OffsetY = 0F; - this.trayTurnover.OffsetYEven = 0F; - this.trayTurnover.RowNum = 4; - this.trayTurnover.RowSpace = 3; - this.trayTurnover.SelectSlot = null; - this.trayTurnover.ShowStatus = false; - this.trayTurnover.ShowText = true; - this.trayTurnover.SinglePoint = false; - this.trayTurnover.Size = new System.Drawing.Size(244, 190); - this.trayTurnover.SortDir = Rs.Controls.ESortDir.LeftToRight; - this.trayTurnover.Status = null; - this.trayTurnover.TabIndex = 1; - this.trayTurnover.TopSpaceHeight = 20; + // tableLayoutPanel6 + // + this.tableLayoutPanel6.ColumnCount = 2; + this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel6.Controls.Add(this.trayTest, 0, 0); + this.tableLayoutPanel6.Controls.Add(this.trayTurnoverNozzle, 1, 0); + this.tableLayoutPanel6.Controls.Add(this.trayTurnover, 0, 1); + this.tableLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel6.Location = new System.Drawing.Point(3, 3); + this.tableLayoutPanel6.Name = "tableLayoutPanel6"; + this.tableLayoutPanel6.RowCount = 2; + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 40F)); + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 60F)); + this.tableLayoutPanel6.Size = new System.Drawing.Size(396, 303); + this.tableLayoutPanel6.TabIndex = 2; // // trayTest // - this.trayTest.CanDraw = false; + this.trayTest.CanDraw = true; this.trayTest.ColSpace = 5; this.trayTest.ColumnNum = 8; this.trayTest.Dock = System.Windows.Forms.DockStyle.Fill; - this.trayTest.HeadText = "Test"; + this.trayTest.HeadText = "Socket"; this.trayTest.InitSlotStatus = Rs.Controls.ESlotStatus.NotHave; this.trayTest.ItemName = null; this.trayTest.LeftSpaceWidth = 20; @@ -867,11 +862,100 @@ this.trayTest.ShowStatus = false; this.trayTest.ShowText = true; this.trayTest.SinglePoint = false; - this.trayTest.Size = new System.Drawing.Size(244, 190); + this.trayTest.Size = new System.Drawing.Size(190, 113); this.trayTest.SortDir = Rs.Controls.ESortDir.LeftToRight; this.trayTest.Status = null; - this.trayTest.TabIndex = 1; + this.trayTest.TabIndex = 3; this.trayTest.TopSpaceHeight = 20; + this.trayTest.DrawTrayAfterEvent += new System.Action>(this.trayTest_DrawTrayAfterEvent); + // + // trayTurnoverNozzle + // + this.trayTurnoverNozzle.CanDraw = true; + this.trayTurnoverNozzle.ColSpace = 5; + this.trayTurnoverNozzle.ColumnNum = 8; + this.trayTurnoverNozzle.Dock = System.Windows.Forms.DockStyle.Fill; + this.trayTurnoverNozzle.HeadText = "TurnoverNozzle"; + this.trayTurnoverNozzle.InitSlotStatus = Rs.Controls.ESlotStatus.NotHave; + this.trayTurnoverNozzle.ItemName = null; + this.trayTurnoverNozzle.LeftSpaceWidth = 20; + this.trayTurnoverNozzle.Location = new System.Drawing.Point(202, 4); + this.trayTurnoverNozzle.Margin = new System.Windows.Forms.Padding(4); + this.trayTurnoverNozzle.Name = "trayTurnoverNozzle"; + this.trayTurnoverNozzle.OffsetX = 0F; + this.trayTurnoverNozzle.OffsetY = 0F; + this.trayTurnoverNozzle.OffsetYEven = 0F; + this.trayTurnoverNozzle.RowNum = 2; + this.trayTurnoverNozzle.RowSpace = 3; + this.trayTurnoverNozzle.SelectSlot = null; + this.trayTurnoverNozzle.ShowStatus = false; + this.trayTurnoverNozzle.ShowText = true; + this.trayTurnoverNozzle.SinglePoint = false; + this.trayTurnoverNozzle.Size = new System.Drawing.Size(190, 113); + this.trayTurnoverNozzle.SortDir = Rs.Controls.ESortDir.LeftToRight; + this.trayTurnoverNozzle.Status = null; + this.trayTurnoverNozzle.TabIndex = 3; + this.trayTurnoverNozzle.TopSpaceHeight = 20; + this.trayTurnoverNozzle.DrawTrayAfterEvent += new System.Action>(this.trayTurnoverNozzle_DrawTrayAfterEvent); + // + // trayTurnover + // + this.trayTurnover.CanDraw = true; + this.trayTurnover.ColSpace = 5; + this.trayTurnover.ColumnNum = 8; + this.tableLayoutPanel6.SetColumnSpan(this.trayTurnover, 2); + this.trayTurnover.Dock = System.Windows.Forms.DockStyle.Fill; + this.trayTurnover.HeadText = "TurnoverTray"; + this.trayTurnover.InitSlotStatus = Rs.Controls.ESlotStatus.NotHave; + this.trayTurnover.ItemName = null; + this.trayTurnover.LeftSpaceWidth = 20; + this.trayTurnover.Location = new System.Drawing.Point(4, 125); + this.trayTurnover.Margin = new System.Windows.Forms.Padding(4); + this.trayTurnover.Name = "trayTurnover"; + this.trayTurnover.OffsetX = 0F; + this.trayTurnover.OffsetY = 0F; + this.trayTurnover.OffsetYEven = 0F; + this.trayTurnover.RowNum = 4; + this.trayTurnover.RowSpace = 3; + this.trayTurnover.SelectSlot = null; + this.trayTurnover.ShowStatus = false; + this.trayTurnover.ShowText = true; + this.trayTurnover.SinglePoint = false; + this.trayTurnover.Size = new System.Drawing.Size(388, 174); + this.trayTurnover.SortDir = Rs.Controls.ESortDir.LeftToRight; + this.trayTurnover.Status = null; + this.trayTurnover.TabIndex = 1; + this.trayTurnover.TopSpaceHeight = 20; + this.trayTurnover.DrawTrayAfterEvent += new System.Action>(this.trayTurnover_DrawTrayAfterEvent); + // + // trayDischargeNozzle + // + this.trayDischargeNozzle.CanDraw = true; + this.trayDischargeNozzle.ColSpace = 10; + this.trayDischargeNozzle.ColumnNum = 8; + this.trayDischargeNozzle.Dock = System.Windows.Forms.DockStyle.Fill; + this.trayDischargeNozzle.HeadText = "DischargeNozzle"; + this.trayDischargeNozzle.InitSlotStatus = Rs.Controls.ESlotStatus.NotHave; + this.trayDischargeNozzle.ItemName = null; + this.trayDischargeNozzle.LeftSpaceWidth = 20; + this.trayDischargeNozzle.Location = new System.Drawing.Point(4, 313); + this.trayDischargeNozzle.Margin = new System.Windows.Forms.Padding(4); + this.trayDischargeNozzle.Name = "trayDischargeNozzle"; + this.trayDischargeNozzle.OffsetX = 0F; + this.trayDischargeNozzle.OffsetY = 0F; + this.trayDischargeNozzle.OffsetYEven = 0F; + this.trayDischargeNozzle.RowNum = 1; + this.trayDischargeNozzle.RowSpace = 3; + this.trayDischargeNozzle.SelectSlot = null; + this.trayDischargeNozzle.ShowStatus = false; + this.trayDischargeNozzle.ShowText = true; + this.trayDischargeNozzle.SinglePoint = false; + this.trayDischargeNozzle.Size = new System.Drawing.Size(394, 95); + this.trayDischargeNozzle.SortDir = Rs.Controls.ESortDir.LeftToRight; + this.trayDischargeNozzle.Status = null; + this.trayDischargeNozzle.TabIndex = 3; + this.trayDischargeNozzle.TopSpaceHeight = 20; + this.trayDischargeNozzle.DrawTrayAfterEvent += new System.Action>(this.trayDischargeNozzle_DrawTrayAfterEvent); // // tableLayoutPanel8 // @@ -880,12 +964,12 @@ this.tableLayoutPanel8.Controls.Add(this.gboxNozzle5, 0, 1); this.tableLayoutPanel8.Controls.Add(this.gboxNozzle1, 0, 0); this.tableLayoutPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel8.Location = new System.Drawing.Point(261, 3); + this.tableLayoutPanel8.Location = new System.Drawing.Point(411, 3); this.tableLayoutPanel8.Name = "tableLayoutPanel8"; this.tableLayoutPanel8.RowCount = 2; this.tableLayoutPanel8.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel8.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel8.Size = new System.Drawing.Size(123, 396); + this.tableLayoutPanel8.Size = new System.Drawing.Size(198, 412); this.tableLayoutPanel8.TabIndex = 2; // // gboxNozzle5 @@ -894,9 +978,9 @@ this.gboxNozzle5.Controls.Add(this.hWindow_Final1); this.gboxNozzle5.Dock = System.Windows.Forms.DockStyle.Fill; this.gboxNozzle5.ForeColor = System.Drawing.Color.White; - this.gboxNozzle5.Location = new System.Drawing.Point(3, 201); + this.gboxNozzle5.Location = new System.Drawing.Point(3, 209); this.gboxNozzle5.Name = "gboxNozzle5"; - this.gboxNozzle5.Size = new System.Drawing.Size(117, 192); + this.gboxNozzle5.Size = new System.Drawing.Size(192, 200); this.gboxNozzle5.TabIndex = 0; this.gboxNozzle5.TabStop = false; this.gboxNozzle5.Text = "Nozzle5"; @@ -912,7 +996,7 @@ this.himgNozzle5.Location = new System.Drawing.Point(3, 17); this.himgNozzle5.Margin = new System.Windows.Forms.Padding(4); this.himgNozzle5.Name = "himgNozzle5"; - this.himgNozzle5.Size = new System.Drawing.Size(111, 172); + this.himgNozzle5.Size = new System.Drawing.Size(186, 180); this.himgNozzle5.TabIndex = 12; // // hWindow_Final1 @@ -935,7 +1019,7 @@ this.gboxNozzle1.ForeColor = System.Drawing.Color.White; this.gboxNozzle1.Location = new System.Drawing.Point(3, 3); this.gboxNozzle1.Name = "gboxNozzle1"; - this.gboxNozzle1.Size = new System.Drawing.Size(117, 192); + this.gboxNozzle1.Size = new System.Drawing.Size(192, 200); this.gboxNozzle1.TabIndex = 0; this.gboxNozzle1.TabStop = false; this.gboxNozzle1.Text = "Nozzle1"; @@ -951,7 +1035,7 @@ this.himgNozzle1.Location = new System.Drawing.Point(3, 17); this.himgNozzle1.Margin = new System.Windows.Forms.Padding(4); this.himgNozzle1.Name = "himgNozzle1"; - this.himgNozzle1.Size = new System.Drawing.Size(111, 172); + this.himgNozzle1.Size = new System.Drawing.Size(186, 180); this.himgNozzle1.TabIndex = 12; // // tableLayoutPanel9 @@ -961,12 +1045,12 @@ this.tableLayoutPanel9.Controls.Add(this.gboxNozzle6, 0, 1); this.tableLayoutPanel9.Controls.Add(this.gboxNozzle2, 0, 0); this.tableLayoutPanel9.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel9.Location = new System.Drawing.Point(390, 3); + this.tableLayoutPanel9.Location = new System.Drawing.Point(615, 3); this.tableLayoutPanel9.Name = "tableLayoutPanel9"; this.tableLayoutPanel9.RowCount = 2; this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel9.Size = new System.Drawing.Size(123, 396); + this.tableLayoutPanel9.Size = new System.Drawing.Size(198, 412); this.tableLayoutPanel9.TabIndex = 2; // // gboxNozzle6 @@ -974,9 +1058,9 @@ this.gboxNozzle6.Controls.Add(this.himgNozzle6); this.gboxNozzle6.Dock = System.Windows.Forms.DockStyle.Fill; this.gboxNozzle6.ForeColor = System.Drawing.Color.White; - this.gboxNozzle6.Location = new System.Drawing.Point(3, 201); + this.gboxNozzle6.Location = new System.Drawing.Point(3, 209); this.gboxNozzle6.Name = "gboxNozzle6"; - this.gboxNozzle6.Size = new System.Drawing.Size(117, 192); + this.gboxNozzle6.Size = new System.Drawing.Size(192, 200); this.gboxNozzle6.TabIndex = 0; this.gboxNozzle6.TabStop = false; this.gboxNozzle6.Text = "Nozzle6"; @@ -992,7 +1076,7 @@ this.himgNozzle6.Location = new System.Drawing.Point(3, 17); this.himgNozzle6.Margin = new System.Windows.Forms.Padding(4); this.himgNozzle6.Name = "himgNozzle6"; - this.himgNozzle6.Size = new System.Drawing.Size(111, 172); + this.himgNozzle6.Size = new System.Drawing.Size(186, 180); this.himgNozzle6.TabIndex = 12; // // gboxNozzle2 @@ -1002,7 +1086,7 @@ this.gboxNozzle2.ForeColor = System.Drawing.Color.White; this.gboxNozzle2.Location = new System.Drawing.Point(3, 3); this.gboxNozzle2.Name = "gboxNozzle2"; - this.gboxNozzle2.Size = new System.Drawing.Size(117, 192); + this.gboxNozzle2.Size = new System.Drawing.Size(192, 200); this.gboxNozzle2.TabIndex = 0; this.gboxNozzle2.TabStop = false; this.gboxNozzle2.Text = "Nozzle2"; @@ -1018,7 +1102,7 @@ this.himgNozzle2.Location = new System.Drawing.Point(3, 17); this.himgNozzle2.Margin = new System.Windows.Forms.Padding(4); this.himgNozzle2.Name = "himgNozzle2"; - this.himgNozzle2.Size = new System.Drawing.Size(111, 172); + this.himgNozzle2.Size = new System.Drawing.Size(186, 180); this.himgNozzle2.TabIndex = 12; // // tableLayoutPanel10 @@ -1028,12 +1112,12 @@ this.tableLayoutPanel10.Controls.Add(this.gboxNozzle7, 0, 1); this.tableLayoutPanel10.Controls.Add(this.gboxNozzle3, 0, 0); this.tableLayoutPanel10.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel10.Location = new System.Drawing.Point(519, 3); + this.tableLayoutPanel10.Location = new System.Drawing.Point(819, 3); this.tableLayoutPanel10.Name = "tableLayoutPanel10"; this.tableLayoutPanel10.RowCount = 2; this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel10.Size = new System.Drawing.Size(123, 396); + this.tableLayoutPanel10.Size = new System.Drawing.Size(198, 412); this.tableLayoutPanel10.TabIndex = 2; // // gboxNozzle7 @@ -1041,9 +1125,9 @@ this.gboxNozzle7.Controls.Add(this.himgNozzle7); this.gboxNozzle7.Dock = System.Windows.Forms.DockStyle.Fill; this.gboxNozzle7.ForeColor = System.Drawing.Color.White; - this.gboxNozzle7.Location = new System.Drawing.Point(3, 201); + this.gboxNozzle7.Location = new System.Drawing.Point(3, 209); this.gboxNozzle7.Name = "gboxNozzle7"; - this.gboxNozzle7.Size = new System.Drawing.Size(117, 192); + this.gboxNozzle7.Size = new System.Drawing.Size(192, 200); this.gboxNozzle7.TabIndex = 0; this.gboxNozzle7.TabStop = false; this.gboxNozzle7.Text = "Nozzle7"; @@ -1059,7 +1143,7 @@ this.himgNozzle7.Location = new System.Drawing.Point(3, 17); this.himgNozzle7.Margin = new System.Windows.Forms.Padding(4); this.himgNozzle7.Name = "himgNozzle7"; - this.himgNozzle7.Size = new System.Drawing.Size(111, 172); + this.himgNozzle7.Size = new System.Drawing.Size(186, 180); this.himgNozzle7.TabIndex = 12; // // gboxNozzle3 @@ -1069,7 +1153,7 @@ this.gboxNozzle3.ForeColor = System.Drawing.Color.White; this.gboxNozzle3.Location = new System.Drawing.Point(3, 3); this.gboxNozzle3.Name = "gboxNozzle3"; - this.gboxNozzle3.Size = new System.Drawing.Size(117, 192); + this.gboxNozzle3.Size = new System.Drawing.Size(192, 200); this.gboxNozzle3.TabIndex = 0; this.gboxNozzle3.TabStop = false; this.gboxNozzle3.Text = "Nozzle3"; @@ -1085,7 +1169,7 @@ this.himgNozzle3.Location = new System.Drawing.Point(3, 17); this.himgNozzle3.Margin = new System.Windows.Forms.Padding(4); this.himgNozzle3.Name = "himgNozzle3"; - this.himgNozzle3.Size = new System.Drawing.Size(111, 172); + this.himgNozzle3.Size = new System.Drawing.Size(186, 180); this.himgNozzle3.TabIndex = 12; // // tableLayoutPanel11 @@ -1095,12 +1179,12 @@ this.tableLayoutPanel11.Controls.Add(this.gboxNozzle8, 0, 1); this.tableLayoutPanel11.Controls.Add(this.gboxNozzle4, 0, 0); this.tableLayoutPanel11.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel11.Location = new System.Drawing.Point(648, 3); + this.tableLayoutPanel11.Location = new System.Drawing.Point(1023, 3); this.tableLayoutPanel11.Name = "tableLayoutPanel11"; this.tableLayoutPanel11.RowCount = 2; this.tableLayoutPanel11.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel11.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel11.Size = new System.Drawing.Size(126, 396); + this.tableLayoutPanel11.Size = new System.Drawing.Size(200, 412); this.tableLayoutPanel11.TabIndex = 2; // // gboxNozzle8 @@ -1108,9 +1192,9 @@ this.gboxNozzle8.Controls.Add(this.himgNozzle8); this.gboxNozzle8.Dock = System.Windows.Forms.DockStyle.Fill; this.gboxNozzle8.ForeColor = System.Drawing.Color.White; - this.gboxNozzle8.Location = new System.Drawing.Point(3, 201); + this.gboxNozzle8.Location = new System.Drawing.Point(3, 209); this.gboxNozzle8.Name = "gboxNozzle8"; - this.gboxNozzle8.Size = new System.Drawing.Size(120, 192); + this.gboxNozzle8.Size = new System.Drawing.Size(194, 200); this.gboxNozzle8.TabIndex = 0; this.gboxNozzle8.TabStop = false; this.gboxNozzle8.Text = "Nozzle8"; @@ -1126,7 +1210,7 @@ this.himgNozzle8.Location = new System.Drawing.Point(3, 17); this.himgNozzle8.Margin = new System.Windows.Forms.Padding(4); this.himgNozzle8.Name = "himgNozzle8"; - this.himgNozzle8.Size = new System.Drawing.Size(114, 172); + this.himgNozzle8.Size = new System.Drawing.Size(188, 180); this.himgNozzle8.TabIndex = 12; // // gboxNozzle4 @@ -1136,7 +1220,7 @@ this.gboxNozzle4.ForeColor = System.Drawing.Color.White; this.gboxNozzle4.Location = new System.Drawing.Point(3, 3); this.gboxNozzle4.Name = "gboxNozzle4"; - this.gboxNozzle4.Size = new System.Drawing.Size(120, 192); + this.gboxNozzle4.Size = new System.Drawing.Size(194, 200); this.gboxNozzle4.TabIndex = 0; this.gboxNozzle4.TabStop = false; this.gboxNozzle4.Text = "Nozzle4"; @@ -1152,7 +1236,7 @@ this.himgNozzle4.Location = new System.Drawing.Point(3, 17); this.himgNozzle4.Margin = new System.Windows.Forms.Padding(4); this.himgNozzle4.Name = "himgNozzle4"; - this.himgNozzle4.Size = new System.Drawing.Size(114, 172); + this.himgNozzle4.Size = new System.Drawing.Size(188, 180); this.himgNozzle4.TabIndex = 12; // // tabPage2 @@ -1163,7 +1247,7 @@ this.tabPage2.Location = new System.Drawing.Point(4, 34); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(783, 810); + this.tabPage2.Size = new System.Drawing.Size(1232, 842); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "Vision"; // @@ -1218,7 +1302,7 @@ this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.tableLayoutPanel5.Size = new System.Drawing.Size(777, 637); + this.tableLayoutPanel5.Size = new System.Drawing.Size(1226, 669); this.tableLayoutPanel5.TabIndex = 1; // // groupBox1 @@ -1228,7 +1312,7 @@ this.groupBox1.ForeColor = System.Drawing.Color.White; this.groupBox1.Location = new System.Drawing.Point(3, 3); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(91, 153); + this.groupBox1.Size = new System.Drawing.Size(147, 161); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "Slot1"; @@ -1244,7 +1328,7 @@ this.hwin_turnoverSlot1.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot1.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot1.Name = "hwin_turnoverSlot1"; - this.hwin_turnoverSlot1.Size = new System.Drawing.Size(85, 133); + this.hwin_turnoverSlot1.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverSlot1.TabIndex = 13; // // groupBox2 @@ -1252,9 +1336,9 @@ this.groupBox2.Controls.Add(this.hwin_turnoverSlot2); this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox2.ForeColor = System.Drawing.Color.White; - this.groupBox2.Location = new System.Drawing.Point(100, 3); + this.groupBox2.Location = new System.Drawing.Point(156, 3); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(91, 153); + this.groupBox2.Size = new System.Drawing.Size(147, 161); this.groupBox2.TabIndex = 0; this.groupBox2.TabStop = false; this.groupBox2.Text = "Slot2"; @@ -1270,7 +1354,7 @@ this.hwin_turnoverSlot2.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot2.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot2.Name = "hwin_turnoverSlot2"; - this.hwin_turnoverSlot2.Size = new System.Drawing.Size(85, 133); + this.hwin_turnoverSlot2.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverSlot2.TabIndex = 13; // // groupBox3 @@ -1278,9 +1362,9 @@ this.groupBox3.Controls.Add(this.hwin_turnoverSlot3); this.groupBox3.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox3.ForeColor = System.Drawing.Color.White; - this.groupBox3.Location = new System.Drawing.Point(197, 3); + this.groupBox3.Location = new System.Drawing.Point(309, 3); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(91, 153); + this.groupBox3.Size = new System.Drawing.Size(147, 161); this.groupBox3.TabIndex = 0; this.groupBox3.TabStop = false; this.groupBox3.Text = "Slot3"; @@ -1296,7 +1380,7 @@ this.hwin_turnoverSlot3.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot3.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot3.Name = "hwin_turnoverSlot3"; - this.hwin_turnoverSlot3.Size = new System.Drawing.Size(85, 133); + this.hwin_turnoverSlot3.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverSlot3.TabIndex = 13; // // groupBox4 @@ -1304,9 +1388,9 @@ this.groupBox4.Controls.Add(this.hwin_turnoverSlot4); this.groupBox4.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox4.ForeColor = System.Drawing.Color.White; - this.groupBox4.Location = new System.Drawing.Point(294, 3); + this.groupBox4.Location = new System.Drawing.Point(462, 3); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(91, 153); + this.groupBox4.Size = new System.Drawing.Size(147, 161); this.groupBox4.TabIndex = 0; this.groupBox4.TabStop = false; this.groupBox4.Text = "Slot4"; @@ -1322,7 +1406,7 @@ this.hwin_turnoverSlot4.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot4.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot4.Name = "hwin_turnoverSlot4"; - this.hwin_turnoverSlot4.Size = new System.Drawing.Size(85, 133); + this.hwin_turnoverSlot4.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverSlot4.TabIndex = 13; // // groupBox5 @@ -1330,9 +1414,9 @@ this.groupBox5.Controls.Add(this.hwin_turnoverSlot5); this.groupBox5.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox5.ForeColor = System.Drawing.Color.White; - this.groupBox5.Location = new System.Drawing.Point(391, 3); + this.groupBox5.Location = new System.Drawing.Point(615, 3); this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(91, 153); + this.groupBox5.Size = new System.Drawing.Size(147, 161); this.groupBox5.TabIndex = 0; this.groupBox5.TabStop = false; this.groupBox5.Text = "Slot5"; @@ -1348,7 +1432,7 @@ this.hwin_turnoverSlot5.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot5.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot5.Name = "hwin_turnoverSlot5"; - this.hwin_turnoverSlot5.Size = new System.Drawing.Size(85, 133); + this.hwin_turnoverSlot5.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverSlot5.TabIndex = 13; // // groupBox6 @@ -1356,9 +1440,9 @@ this.groupBox6.Controls.Add(this.hwin_turnoverSlot6); this.groupBox6.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox6.ForeColor = System.Drawing.Color.White; - this.groupBox6.Location = new System.Drawing.Point(488, 3); + this.groupBox6.Location = new System.Drawing.Point(768, 3); this.groupBox6.Name = "groupBox6"; - this.groupBox6.Size = new System.Drawing.Size(91, 153); + this.groupBox6.Size = new System.Drawing.Size(147, 161); this.groupBox6.TabIndex = 0; this.groupBox6.TabStop = false; this.groupBox6.Text = "Slot6"; @@ -1374,7 +1458,7 @@ this.hwin_turnoverSlot6.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot6.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot6.Name = "hwin_turnoverSlot6"; - this.hwin_turnoverSlot6.Size = new System.Drawing.Size(85, 133); + this.hwin_turnoverSlot6.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverSlot6.TabIndex = 13; // // groupBox7 @@ -1382,9 +1466,9 @@ this.groupBox7.Controls.Add(this.hwin_turnoverSlot7); this.groupBox7.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox7.ForeColor = System.Drawing.Color.White; - this.groupBox7.Location = new System.Drawing.Point(585, 3); + this.groupBox7.Location = new System.Drawing.Point(921, 3); this.groupBox7.Name = "groupBox7"; - this.groupBox7.Size = new System.Drawing.Size(91, 153); + this.groupBox7.Size = new System.Drawing.Size(147, 161); this.groupBox7.TabIndex = 0; this.groupBox7.TabStop = false; this.groupBox7.Text = "Slot7"; @@ -1400,7 +1484,7 @@ this.hwin_turnoverSlot7.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot7.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot7.Name = "hwin_turnoverSlot7"; - this.hwin_turnoverSlot7.Size = new System.Drawing.Size(85, 133); + this.hwin_turnoverSlot7.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverSlot7.TabIndex = 13; // // groupBox8 @@ -1408,9 +1492,9 @@ this.groupBox8.Controls.Add(this.hwin_turnoverSlot9); this.groupBox8.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox8.ForeColor = System.Drawing.Color.White; - this.groupBox8.Location = new System.Drawing.Point(3, 162); + this.groupBox8.Location = new System.Drawing.Point(3, 170); this.groupBox8.Name = "groupBox8"; - this.groupBox8.Size = new System.Drawing.Size(91, 153); + this.groupBox8.Size = new System.Drawing.Size(147, 161); this.groupBox8.TabIndex = 0; this.groupBox8.TabStop = false; this.groupBox8.Text = "Slot9"; @@ -1426,7 +1510,7 @@ this.hwin_turnoverSlot9.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot9.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot9.Name = "hwin_turnoverSlot9"; - this.hwin_turnoverSlot9.Size = new System.Drawing.Size(85, 133); + this.hwin_turnoverSlot9.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverSlot9.TabIndex = 13; // // groupBox9 @@ -1434,9 +1518,9 @@ this.groupBox9.Controls.Add(this.hwin_turnoverSlot10); this.groupBox9.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox9.ForeColor = System.Drawing.Color.White; - this.groupBox9.Location = new System.Drawing.Point(100, 162); + this.groupBox9.Location = new System.Drawing.Point(156, 170); this.groupBox9.Name = "groupBox9"; - this.groupBox9.Size = new System.Drawing.Size(91, 153); + this.groupBox9.Size = new System.Drawing.Size(147, 161); this.groupBox9.TabIndex = 0; this.groupBox9.TabStop = false; this.groupBox9.Text = "Slot10"; @@ -1452,7 +1536,7 @@ this.hwin_turnoverSlot10.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot10.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot10.Name = "hwin_turnoverSlot10"; - this.hwin_turnoverSlot10.Size = new System.Drawing.Size(85, 133); + this.hwin_turnoverSlot10.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverSlot10.TabIndex = 13; // // groupBox10 @@ -1460,9 +1544,9 @@ this.groupBox10.Controls.Add(this.hwin_turnoverSlot11); this.groupBox10.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox10.ForeColor = System.Drawing.Color.White; - this.groupBox10.Location = new System.Drawing.Point(197, 162); + this.groupBox10.Location = new System.Drawing.Point(309, 170); this.groupBox10.Name = "groupBox10"; - this.groupBox10.Size = new System.Drawing.Size(91, 153); + this.groupBox10.Size = new System.Drawing.Size(147, 161); this.groupBox10.TabIndex = 0; this.groupBox10.TabStop = false; this.groupBox10.Text = "Slot11"; @@ -1478,7 +1562,7 @@ this.hwin_turnoverSlot11.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot11.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot11.Name = "hwin_turnoverSlot11"; - this.hwin_turnoverSlot11.Size = new System.Drawing.Size(85, 133); + this.hwin_turnoverSlot11.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverSlot11.TabIndex = 13; // // groupBox11 @@ -1486,9 +1570,9 @@ this.groupBox11.Controls.Add(this.hwin_turnoverSlot12); this.groupBox11.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox11.ForeColor = System.Drawing.Color.White; - this.groupBox11.Location = new System.Drawing.Point(294, 162); + this.groupBox11.Location = new System.Drawing.Point(462, 170); this.groupBox11.Name = "groupBox11"; - this.groupBox11.Size = new System.Drawing.Size(91, 153); + this.groupBox11.Size = new System.Drawing.Size(147, 161); this.groupBox11.TabIndex = 0; this.groupBox11.TabStop = false; this.groupBox11.Text = "Slot12"; @@ -1504,7 +1588,7 @@ this.hwin_turnoverSlot12.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot12.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot12.Name = "hwin_turnoverSlot12"; - this.hwin_turnoverSlot12.Size = new System.Drawing.Size(85, 133); + this.hwin_turnoverSlot12.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverSlot12.TabIndex = 13; // // groupBox12 @@ -1512,9 +1596,9 @@ this.groupBox12.Controls.Add(this.hwin_turnoverSlot13); this.groupBox12.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox12.ForeColor = System.Drawing.Color.White; - this.groupBox12.Location = new System.Drawing.Point(391, 162); + this.groupBox12.Location = new System.Drawing.Point(615, 170); this.groupBox12.Name = "groupBox12"; - this.groupBox12.Size = new System.Drawing.Size(91, 153); + this.groupBox12.Size = new System.Drawing.Size(147, 161); this.groupBox12.TabIndex = 0; this.groupBox12.TabStop = false; this.groupBox12.Text = "Slot13"; @@ -1530,7 +1614,7 @@ this.hwin_turnoverSlot13.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot13.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot13.Name = "hwin_turnoverSlot13"; - this.hwin_turnoverSlot13.Size = new System.Drawing.Size(85, 133); + this.hwin_turnoverSlot13.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverSlot13.TabIndex = 13; // // groupBox13 @@ -1538,9 +1622,9 @@ this.groupBox13.Controls.Add(this.hwin_turnoverSlot14); this.groupBox13.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox13.ForeColor = System.Drawing.Color.White; - this.groupBox13.Location = new System.Drawing.Point(488, 162); + this.groupBox13.Location = new System.Drawing.Point(768, 170); this.groupBox13.Name = "groupBox13"; - this.groupBox13.Size = new System.Drawing.Size(91, 153); + this.groupBox13.Size = new System.Drawing.Size(147, 161); this.groupBox13.TabIndex = 0; this.groupBox13.TabStop = false; this.groupBox13.Text = "Slot14"; @@ -1556,7 +1640,7 @@ this.hwin_turnoverSlot14.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot14.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot14.Name = "hwin_turnoverSlot14"; - this.hwin_turnoverSlot14.Size = new System.Drawing.Size(85, 133); + this.hwin_turnoverSlot14.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverSlot14.TabIndex = 13; // // groupBox14 @@ -1564,9 +1648,9 @@ this.groupBox14.Controls.Add(this.hwin_turnoverSlot15); this.groupBox14.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox14.ForeColor = System.Drawing.Color.White; - this.groupBox14.Location = new System.Drawing.Point(585, 162); + this.groupBox14.Location = new System.Drawing.Point(921, 170); this.groupBox14.Name = "groupBox14"; - this.groupBox14.Size = new System.Drawing.Size(91, 153); + this.groupBox14.Size = new System.Drawing.Size(147, 161); this.groupBox14.TabIndex = 0; this.groupBox14.TabStop = false; this.groupBox14.Text = "Slot15"; @@ -1582,7 +1666,7 @@ this.hwin_turnoverSlot15.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot15.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot15.Name = "hwin_turnoverSlot15"; - this.hwin_turnoverSlot15.Size = new System.Drawing.Size(85, 133); + this.hwin_turnoverSlot15.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverSlot15.TabIndex = 13; // // groupBox15 @@ -1590,9 +1674,9 @@ this.groupBox15.Controls.Add(this.hwin_turnoverSlot17); this.groupBox15.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox15.ForeColor = System.Drawing.Color.White; - this.groupBox15.Location = new System.Drawing.Point(3, 321); + this.groupBox15.Location = new System.Drawing.Point(3, 337); this.groupBox15.Name = "groupBox15"; - this.groupBox15.Size = new System.Drawing.Size(91, 153); + this.groupBox15.Size = new System.Drawing.Size(147, 161); this.groupBox15.TabIndex = 0; this.groupBox15.TabStop = false; this.groupBox15.Text = "Slot17"; @@ -1608,7 +1692,7 @@ this.hwin_turnoverSlot17.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot17.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot17.Name = "hwin_turnoverSlot17"; - this.hwin_turnoverSlot17.Size = new System.Drawing.Size(85, 133); + this.hwin_turnoverSlot17.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverSlot17.TabIndex = 13; // // groupBox16 @@ -1616,9 +1700,9 @@ this.groupBox16.Controls.Add(this.hwin_turnoverSlot18); this.groupBox16.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox16.ForeColor = System.Drawing.Color.White; - this.groupBox16.Location = new System.Drawing.Point(100, 321); + this.groupBox16.Location = new System.Drawing.Point(156, 337); this.groupBox16.Name = "groupBox16"; - this.groupBox16.Size = new System.Drawing.Size(91, 153); + this.groupBox16.Size = new System.Drawing.Size(147, 161); this.groupBox16.TabIndex = 0; this.groupBox16.TabStop = false; this.groupBox16.Text = "Slot18"; @@ -1634,7 +1718,7 @@ this.hwin_turnoverSlot18.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot18.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot18.Name = "hwin_turnoverSlot18"; - this.hwin_turnoverSlot18.Size = new System.Drawing.Size(85, 133); + this.hwin_turnoverSlot18.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverSlot18.TabIndex = 13; // // groupBox17 @@ -1642,9 +1726,9 @@ this.groupBox17.Controls.Add(this.hwin_turnoverSlot19); this.groupBox17.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox17.ForeColor = System.Drawing.Color.White; - this.groupBox17.Location = new System.Drawing.Point(197, 321); + this.groupBox17.Location = new System.Drawing.Point(309, 337); this.groupBox17.Name = "groupBox17"; - this.groupBox17.Size = new System.Drawing.Size(91, 153); + this.groupBox17.Size = new System.Drawing.Size(147, 161); this.groupBox17.TabIndex = 0; this.groupBox17.TabStop = false; this.groupBox17.Text = "Slot19"; @@ -1660,7 +1744,7 @@ this.hwin_turnoverSlot19.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot19.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot19.Name = "hwin_turnoverSlot19"; - this.hwin_turnoverSlot19.Size = new System.Drawing.Size(85, 133); + this.hwin_turnoverSlot19.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverSlot19.TabIndex = 13; // // groupBox18 @@ -1668,9 +1752,9 @@ this.groupBox18.Controls.Add(this.hwin_turnoverSlot20); this.groupBox18.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox18.ForeColor = System.Drawing.Color.White; - this.groupBox18.Location = new System.Drawing.Point(294, 321); + this.groupBox18.Location = new System.Drawing.Point(462, 337); this.groupBox18.Name = "groupBox18"; - this.groupBox18.Size = new System.Drawing.Size(91, 153); + this.groupBox18.Size = new System.Drawing.Size(147, 161); this.groupBox18.TabIndex = 0; this.groupBox18.TabStop = false; this.groupBox18.Text = "Slot20"; @@ -1686,7 +1770,7 @@ this.hwin_turnoverSlot20.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot20.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot20.Name = "hwin_turnoverSlot20"; - this.hwin_turnoverSlot20.Size = new System.Drawing.Size(85, 133); + this.hwin_turnoverSlot20.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverSlot20.TabIndex = 13; // // groupBox19 @@ -1694,9 +1778,9 @@ this.groupBox19.Controls.Add(this.hwin_turnoverSlot21); this.groupBox19.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox19.ForeColor = System.Drawing.Color.White; - this.groupBox19.Location = new System.Drawing.Point(391, 321); + this.groupBox19.Location = new System.Drawing.Point(615, 337); this.groupBox19.Name = "groupBox19"; - this.groupBox19.Size = new System.Drawing.Size(91, 153); + this.groupBox19.Size = new System.Drawing.Size(147, 161); this.groupBox19.TabIndex = 0; this.groupBox19.TabStop = false; this.groupBox19.Text = "Slot21"; @@ -1712,7 +1796,7 @@ this.hwin_turnoverSlot21.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot21.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot21.Name = "hwin_turnoverSlot21"; - this.hwin_turnoverSlot21.Size = new System.Drawing.Size(85, 133); + this.hwin_turnoverSlot21.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverSlot21.TabIndex = 13; // // groupBox20 @@ -1720,9 +1804,9 @@ this.groupBox20.Controls.Add(this.hwin_turnoverSlot22); this.groupBox20.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox20.ForeColor = System.Drawing.Color.White; - this.groupBox20.Location = new System.Drawing.Point(488, 321); + this.groupBox20.Location = new System.Drawing.Point(768, 337); this.groupBox20.Name = "groupBox20"; - this.groupBox20.Size = new System.Drawing.Size(91, 153); + this.groupBox20.Size = new System.Drawing.Size(147, 161); this.groupBox20.TabIndex = 0; this.groupBox20.TabStop = false; this.groupBox20.Text = "Slot22"; @@ -1738,7 +1822,7 @@ this.hwin_turnoverSlot22.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot22.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot22.Name = "hwin_turnoverSlot22"; - this.hwin_turnoverSlot22.Size = new System.Drawing.Size(85, 133); + this.hwin_turnoverSlot22.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverSlot22.TabIndex = 13; // // groupBox21 @@ -1746,9 +1830,9 @@ this.groupBox21.Controls.Add(this.hwin_turnoverSlot23); this.groupBox21.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox21.ForeColor = System.Drawing.Color.White; - this.groupBox21.Location = new System.Drawing.Point(585, 321); + this.groupBox21.Location = new System.Drawing.Point(921, 337); this.groupBox21.Name = "groupBox21"; - this.groupBox21.Size = new System.Drawing.Size(91, 153); + this.groupBox21.Size = new System.Drawing.Size(147, 161); this.groupBox21.TabIndex = 0; this.groupBox21.TabStop = false; this.groupBox21.Text = "Slot23"; @@ -1764,7 +1848,7 @@ this.hwin_turnoverSlot23.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot23.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot23.Name = "hwin_turnoverSlot23"; - this.hwin_turnoverSlot23.Size = new System.Drawing.Size(85, 133); + this.hwin_turnoverSlot23.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverSlot23.TabIndex = 13; // // groupBox22 @@ -1772,9 +1856,9 @@ this.groupBox22.Controls.Add(this.hwin_turnoverSlot25); this.groupBox22.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox22.ForeColor = System.Drawing.Color.White; - this.groupBox22.Location = new System.Drawing.Point(3, 480); + this.groupBox22.Location = new System.Drawing.Point(3, 504); this.groupBox22.Name = "groupBox22"; - this.groupBox22.Size = new System.Drawing.Size(91, 154); + this.groupBox22.Size = new System.Drawing.Size(147, 162); this.groupBox22.TabIndex = 0; this.groupBox22.TabStop = false; this.groupBox22.Text = "Slot25"; @@ -1790,7 +1874,7 @@ this.hwin_turnoverSlot25.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot25.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot25.Name = "hwin_turnoverSlot25"; - this.hwin_turnoverSlot25.Size = new System.Drawing.Size(85, 134); + this.hwin_turnoverSlot25.Size = new System.Drawing.Size(141, 142); this.hwin_turnoverSlot25.TabIndex = 13; // // groupBox23 @@ -1798,9 +1882,9 @@ this.groupBox23.Controls.Add(this.hwin_turnoverSlot26); this.groupBox23.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox23.ForeColor = System.Drawing.Color.White; - this.groupBox23.Location = new System.Drawing.Point(100, 480); + this.groupBox23.Location = new System.Drawing.Point(156, 504); this.groupBox23.Name = "groupBox23"; - this.groupBox23.Size = new System.Drawing.Size(91, 154); + this.groupBox23.Size = new System.Drawing.Size(147, 162); this.groupBox23.TabIndex = 0; this.groupBox23.TabStop = false; this.groupBox23.Text = "Slot26"; @@ -1816,7 +1900,7 @@ this.hwin_turnoverSlot26.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot26.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot26.Name = "hwin_turnoverSlot26"; - this.hwin_turnoverSlot26.Size = new System.Drawing.Size(85, 134); + this.hwin_turnoverSlot26.Size = new System.Drawing.Size(141, 142); this.hwin_turnoverSlot26.TabIndex = 13; // // groupBox24 @@ -1824,9 +1908,9 @@ this.groupBox24.Controls.Add(this.hwin_turnoverSlot27); this.groupBox24.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox24.ForeColor = System.Drawing.Color.White; - this.groupBox24.Location = new System.Drawing.Point(197, 480); + this.groupBox24.Location = new System.Drawing.Point(309, 504); this.groupBox24.Name = "groupBox24"; - this.groupBox24.Size = new System.Drawing.Size(91, 154); + this.groupBox24.Size = new System.Drawing.Size(147, 162); this.groupBox24.TabIndex = 0; this.groupBox24.TabStop = false; this.groupBox24.Text = "Slot27"; @@ -1842,7 +1926,7 @@ this.hwin_turnoverSlot27.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot27.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot27.Name = "hwin_turnoverSlot27"; - this.hwin_turnoverSlot27.Size = new System.Drawing.Size(85, 134); + this.hwin_turnoverSlot27.Size = new System.Drawing.Size(141, 142); this.hwin_turnoverSlot27.TabIndex = 13; // // groupBox25 @@ -1850,9 +1934,9 @@ this.groupBox25.Controls.Add(this.hwin_turnoverSlot28); this.groupBox25.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox25.ForeColor = System.Drawing.Color.White; - this.groupBox25.Location = new System.Drawing.Point(294, 480); + this.groupBox25.Location = new System.Drawing.Point(462, 504); this.groupBox25.Name = "groupBox25"; - this.groupBox25.Size = new System.Drawing.Size(91, 154); + this.groupBox25.Size = new System.Drawing.Size(147, 162); this.groupBox25.TabIndex = 0; this.groupBox25.TabStop = false; this.groupBox25.Text = "Slot28"; @@ -1868,7 +1952,7 @@ this.hwin_turnoverSlot28.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot28.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot28.Name = "hwin_turnoverSlot28"; - this.hwin_turnoverSlot28.Size = new System.Drawing.Size(85, 134); + this.hwin_turnoverSlot28.Size = new System.Drawing.Size(141, 142); this.hwin_turnoverSlot28.TabIndex = 13; // // groupBox26 @@ -1876,9 +1960,9 @@ this.groupBox26.Controls.Add(this.hwin_turnoverSlot29); this.groupBox26.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox26.ForeColor = System.Drawing.Color.White; - this.groupBox26.Location = new System.Drawing.Point(391, 480); + this.groupBox26.Location = new System.Drawing.Point(615, 504); this.groupBox26.Name = "groupBox26"; - this.groupBox26.Size = new System.Drawing.Size(91, 154); + this.groupBox26.Size = new System.Drawing.Size(147, 162); this.groupBox26.TabIndex = 0; this.groupBox26.TabStop = false; this.groupBox26.Text = "Slot29"; @@ -1894,7 +1978,7 @@ this.hwin_turnoverSlot29.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot29.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot29.Name = "hwin_turnoverSlot29"; - this.hwin_turnoverSlot29.Size = new System.Drawing.Size(85, 134); + this.hwin_turnoverSlot29.Size = new System.Drawing.Size(141, 142); this.hwin_turnoverSlot29.TabIndex = 13; // // groupBox27 @@ -1902,9 +1986,9 @@ this.groupBox27.Controls.Add(this.hwin_turnoverSlot30); this.groupBox27.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox27.ForeColor = System.Drawing.Color.White; - this.groupBox27.Location = new System.Drawing.Point(488, 480); + this.groupBox27.Location = new System.Drawing.Point(768, 504); this.groupBox27.Name = "groupBox27"; - this.groupBox27.Size = new System.Drawing.Size(91, 154); + this.groupBox27.Size = new System.Drawing.Size(147, 162); this.groupBox27.TabIndex = 0; this.groupBox27.TabStop = false; this.groupBox27.Text = "Slot30"; @@ -1920,7 +2004,7 @@ this.hwin_turnoverSlot30.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot30.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot30.Name = "hwin_turnoverSlot30"; - this.hwin_turnoverSlot30.Size = new System.Drawing.Size(85, 134); + this.hwin_turnoverSlot30.Size = new System.Drawing.Size(141, 142); this.hwin_turnoverSlot30.TabIndex = 13; // // groupBox28 @@ -1928,9 +2012,9 @@ this.groupBox28.Controls.Add(this.hwin_turnoverSlot31); this.groupBox28.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox28.ForeColor = System.Drawing.Color.White; - this.groupBox28.Location = new System.Drawing.Point(585, 480); + this.groupBox28.Location = new System.Drawing.Point(921, 504); this.groupBox28.Name = "groupBox28"; - this.groupBox28.Size = new System.Drawing.Size(91, 154); + this.groupBox28.Size = new System.Drawing.Size(147, 162); this.groupBox28.TabIndex = 0; this.groupBox28.TabStop = false; this.groupBox28.Text = "Slot31"; @@ -1946,7 +2030,7 @@ this.hwin_turnoverSlot31.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot31.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot31.Name = "hwin_turnoverSlot31"; - this.hwin_turnoverSlot31.Size = new System.Drawing.Size(85, 134); + this.hwin_turnoverSlot31.Size = new System.Drawing.Size(141, 142); this.hwin_turnoverSlot31.TabIndex = 13; // // groupBox31 @@ -1954,9 +2038,9 @@ this.groupBox31.Controls.Add(this.hwin_turnoverSlot8); this.groupBox31.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox31.ForeColor = System.Drawing.Color.White; - this.groupBox31.Location = new System.Drawing.Point(682, 3); + this.groupBox31.Location = new System.Drawing.Point(1074, 3); this.groupBox31.Name = "groupBox31"; - this.groupBox31.Size = new System.Drawing.Size(92, 153); + this.groupBox31.Size = new System.Drawing.Size(149, 161); this.groupBox31.TabIndex = 0; this.groupBox31.TabStop = false; this.groupBox31.Text = "Slot8"; @@ -1972,7 +2056,7 @@ this.hwin_turnoverSlot8.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot8.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot8.Name = "hwin_turnoverSlot8"; - this.hwin_turnoverSlot8.Size = new System.Drawing.Size(86, 133); + this.hwin_turnoverSlot8.Size = new System.Drawing.Size(143, 141); this.hwin_turnoverSlot8.TabIndex = 13; // // groupBox32 @@ -1980,9 +2064,9 @@ this.groupBox32.Controls.Add(this.hwin_turnoverSlot16); this.groupBox32.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox32.ForeColor = System.Drawing.Color.White; - this.groupBox32.Location = new System.Drawing.Point(682, 162); + this.groupBox32.Location = new System.Drawing.Point(1074, 170); this.groupBox32.Name = "groupBox32"; - this.groupBox32.Size = new System.Drawing.Size(92, 153); + this.groupBox32.Size = new System.Drawing.Size(149, 161); this.groupBox32.TabIndex = 0; this.groupBox32.TabStop = false; this.groupBox32.Text = "Slot16"; @@ -1998,7 +2082,7 @@ this.hwin_turnoverSlot16.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot16.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot16.Name = "hwin_turnoverSlot16"; - this.hwin_turnoverSlot16.Size = new System.Drawing.Size(86, 133); + this.hwin_turnoverSlot16.Size = new System.Drawing.Size(143, 141); this.hwin_turnoverSlot16.TabIndex = 13; // // groupBox33 @@ -2006,9 +2090,9 @@ this.groupBox33.Controls.Add(this.hwin_turnoverSlot24); this.groupBox33.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox33.ForeColor = System.Drawing.Color.White; - this.groupBox33.Location = new System.Drawing.Point(682, 321); + this.groupBox33.Location = new System.Drawing.Point(1074, 337); this.groupBox33.Name = "groupBox33"; - this.groupBox33.Size = new System.Drawing.Size(92, 153); + this.groupBox33.Size = new System.Drawing.Size(149, 161); this.groupBox33.TabIndex = 0; this.groupBox33.TabStop = false; this.groupBox33.Text = "Slot24"; @@ -2024,7 +2108,7 @@ this.hwin_turnoverSlot24.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot24.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot24.Name = "hwin_turnoverSlot24"; - this.hwin_turnoverSlot24.Size = new System.Drawing.Size(86, 133); + this.hwin_turnoverSlot24.Size = new System.Drawing.Size(143, 141); this.hwin_turnoverSlot24.TabIndex = 13; // // groupBox34 @@ -2032,9 +2116,9 @@ this.groupBox34.Controls.Add(this.hwin_turnoverSlot32); this.groupBox34.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox34.ForeColor = System.Drawing.Color.White; - this.groupBox34.Location = new System.Drawing.Point(682, 480); + this.groupBox34.Location = new System.Drawing.Point(1074, 504); this.groupBox34.Name = "groupBox34"; - this.groupBox34.Size = new System.Drawing.Size(92, 154); + this.groupBox34.Size = new System.Drawing.Size(149, 162); this.groupBox34.TabIndex = 0; this.groupBox34.TabStop = false; this.groupBox34.Text = "Slot32"; @@ -2050,7 +2134,7 @@ this.hwin_turnoverSlot32.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverSlot32.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverSlot32.Name = "hwin_turnoverSlot32"; - this.hwin_turnoverSlot32.Size = new System.Drawing.Size(86, 134); + this.hwin_turnoverSlot32.Size = new System.Drawing.Size(143, 142); this.hwin_turnoverSlot32.TabIndex = 13; // // tableLayoutPanel4 @@ -2068,11 +2152,11 @@ this.tableLayoutPanel4.Controls.Add(this.groupBox29, 2, 0); this.tableLayoutPanel4.Controls.Add(this.groupBox35, 0, 0); this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 640); + this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 672); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.RowCount = 1; this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(777, 167); + this.tableLayoutPanel4.Size = new System.Drawing.Size(1226, 167); this.tableLayoutPanel4.TabIndex = 0; // // groupBox30 @@ -2080,9 +2164,9 @@ this.groupBox30.Controls.Add(this.hWindow_Final3); this.groupBox30.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox30.ForeColor = System.Drawing.Color.White; - this.groupBox30.Location = new System.Drawing.Point(100, 3); + this.groupBox30.Location = new System.Drawing.Point(156, 3); this.groupBox30.Name = "groupBox30"; - this.groupBox30.Size = new System.Drawing.Size(91, 161); + this.groupBox30.Size = new System.Drawing.Size(147, 161); this.groupBox30.TabIndex = 2; this.groupBox30.TabStop = false; this.groupBox30.Text = "中转盘定位"; @@ -2098,7 +2182,7 @@ this.hWindow_Final3.Location = new System.Drawing.Point(3, 17); this.hWindow_Final3.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final3.Name = "hWindow_Final3"; - this.hWindow_Final3.Size = new System.Drawing.Size(85, 141); + this.hWindow_Final3.Size = new System.Drawing.Size(141, 141); this.hWindow_Final3.TabIndex = 13; // // groupBox29 @@ -2106,9 +2190,9 @@ this.groupBox29.Controls.Add(this.hwin_turnoverTrayHasOrNot); this.groupBox29.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox29.ForeColor = System.Drawing.Color.White; - this.groupBox29.Location = new System.Drawing.Point(197, 3); + this.groupBox29.Location = new System.Drawing.Point(309, 3); this.groupBox29.Name = "groupBox29"; - this.groupBox29.Size = new System.Drawing.Size(91, 161); + this.groupBox29.Size = new System.Drawing.Size(147, 161); this.groupBox29.TabIndex = 1; this.groupBox29.TabStop = false; this.groupBox29.Text = "中转盘有无"; @@ -2124,7 +2208,7 @@ this.hwin_turnoverTrayHasOrNot.Location = new System.Drawing.Point(3, 17); this.hwin_turnoverTrayHasOrNot.Margin = new System.Windows.Forms.Padding(4); this.hwin_turnoverTrayHasOrNot.Name = "hwin_turnoverTrayHasOrNot"; - this.hwin_turnoverTrayHasOrNot.Size = new System.Drawing.Size(85, 141); + this.hwin_turnoverTrayHasOrNot.Size = new System.Drawing.Size(141, 141); this.hwin_turnoverTrayHasOrNot.TabIndex = 13; // // groupBox35 @@ -2134,7 +2218,7 @@ this.groupBox35.ForeColor = System.Drawing.Color.White; this.groupBox35.Location = new System.Drawing.Point(3, 3); this.groupBox35.Name = "groupBox35"; - this.groupBox35.Size = new System.Drawing.Size(91, 161); + this.groupBox35.Size = new System.Drawing.Size(147, 161); this.groupBox35.TabIndex = 1; this.groupBox35.TabStop = false; this.groupBox35.Text = "料仓有无"; @@ -2150,14 +2234,14 @@ this.hWindow_Final4.Location = new System.Drawing.Point(3, 17); this.hWindow_Final4.Margin = new System.Windows.Forms.Padding(4); this.hWindow_Final4.Name = "hWindow_Final4"; - this.hWindow_Final4.Size = new System.Drawing.Size(85, 141); + this.hWindow_Final4.Size = new System.Drawing.Size(141, 141); this.hWindow_Final4.TabIndex = 13; // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1242, 848); + this.ClientSize = new System.Drawing.Size(1691, 880); this.Controls.Add(this.tabControlEx1); this.Controls.Add(this.panel1); this.Margin = new System.Windows.Forms.Padding(4); @@ -2181,6 +2265,7 @@ this.tableLayoutPanel1.ResumeLayout(false); this.panelEx5.ResumeLayout(false); this.tableLayoutPanel7.ResumeLayout(false); + this.tableLayoutPanel6.ResumeLayout(false); this.tableLayoutPanel8.ResumeLayout(false); this.gboxNozzle5.ResumeLayout(false); this.gboxNozzle1.ResumeLayout(false); @@ -2271,7 +2356,6 @@ private Controls.PanelEx panelEx5; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel7; private Controls.RsTray trayTurnover; - private Controls.RsTray trayTest; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel8; private System.Windows.Forms.GroupBox gboxNozzle5; private ChoiceTech.Halcon.Control.HWindow_Final himgNozzle5; @@ -2366,5 +2450,9 @@ private ChoiceTech.Halcon.Control.HWindow_Final hwin_turnoverTrayHasOrNot; private System.Windows.Forms.GroupBox groupBox35; private ChoiceTech.Halcon.Control.HWindow_Final hWindow_Final4; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel6; + private Controls.RsTray trayTest; + private Controls.RsTray trayTurnoverNozzle; + private Controls.RsTray trayDischargeNozzle; } } \ No newline at end of file diff --git a/Rs.SkyLine/Home.cs b/Rs.SkyLine/Home.cs index 0fb3e67..ffa67e8 100644 --- a/Rs.SkyLine/Home.cs +++ b/Rs.SkyLine/Home.cs @@ -101,10 +101,8 @@ namespace Rs.MotionPlat else if (button == btnQuit) { button.Selected = false; - DialogResult dr = MessageBox.Show("确定要退出吗?", "提示", MessageBoxButtons.OKCancel); - if (dr == DialogResult.OK) + if(WindowsClose()) { - Ops.Quit(); System.Environment.Exit(-1); } } @@ -296,6 +294,7 @@ namespace Rs.MotionPlat DialogResult dr = MessageBox.Show("确定要退出吗?", "提示", MessageBoxButtons.OKCancel); if (dr == DialogResult.OK) { + LogHelper.Debug("手动退出软件"); Ops.Quit(); return true; } diff --git a/Rs.SkyLine/Properties/AssemblyInfo.cs b/Rs.SkyLine/Properties/AssemblyInfo.cs index 0311f99..9690fd5 100644 --- a/Rs.SkyLine/Properties/AssemblyInfo.cs +++ b/Rs.SkyLine/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: - [assembly: AssemblyVersion("2.20.24.15")] + [assembly: AssemblyVersion("2.20.24.19")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Rs.SkyLine/Rs.SkyLine.csproj b/Rs.SkyLine/Rs.SkyLine.csproj index f57a1d9..d7807ed 100644 --- a/Rs.SkyLine/Rs.SkyLine.csproj +++ b/Rs.SkyLine/Rs.SkyLine.csproj @@ -213,6 +213,7 @@ + diff --git a/Rs.SkyLine/SysConfig/StockControl.cs b/Rs.SkyLine/SysConfig/StockControl.cs index 7f2553e..6d008b9 100644 --- a/Rs.SkyLine/SysConfig/StockControl.cs +++ b/Rs.SkyLine/SysConfig/StockControl.cs @@ -31,7 +31,8 @@ namespace Rs.MotionPlat.SysConfig if (ok) { Task.Run(() => { - if (MachineManage.Instance.MachineStatus == EMachineStatus.Homed || MachineManage.Instance.MachineStatus == EMachineStatus.Stop) + //if (MachineManage.Instance.MachineStatus == EMachineStatus.Homed || MachineManage.Instance.MachineStatus == EMachineStatus.Stop) + if(true) { if (!StockManager.Instance.GetStock(result).IsRunning()) { @@ -56,6 +57,7 @@ namespace Rs.MotionPlat.SysConfig } else { + MessageQueue.Instance.Warn("Stock is busy"); Msg.ShowError("Stock is busy"); } } @@ -78,7 +80,8 @@ namespace Rs.MotionPlat.SysConfig { Task.Run(() => { - if(MachineManage.Instance.MachineStatus== EMachineStatus.Homed || MachineManage.Instance.MachineStatus== EMachineStatus.Stop) + //if(MachineManage.Instance.MachineStatus== EMachineStatus.Homed || MachineManage.Instance.MachineStatus== EMachineStatus.Stop) + if(true) { if (!StockManager.Instance.GetStock(result).IsRunning()) {