lhiven
/
Rs.SkyLine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、增加是否屏蔽治具真空检测

Browse Source 
2、当弹窗中没有重试或者跳过按钮时，点击物理重试跳过按钮时弹框不关闭
master
lhiven 2 years ago
parent 868b18babb
commit 559735ecf9
17 changed files with 822 additions and 5 deletions
Show Stats Download Patch File Download Diff File

9
Rs.SkyLine/Commom/GlobalVar.cs
Unescape Escape View File

@ -941,5 +941,14 @@ namespace Rs.Framework
return SysConfigParam.GetValue<bool>(nameof(DisableDoor));
}
}
/// <summary>
/// 是否屏蔽治具真空检测
/// </summary>
public static bool DisableFixtureVacuumCheck
{
get;
set;
}
}
}

8
Rs.SkyLine/Commom/Scheduling.cs
Unescape Escape View File

@ -704,6 +704,14 @@ namespace Rs.MotionPlat.Commom
/// 测试机状态
/// </summary>
TesterState,
/// <summary>
/// 一圈
/// </summary>
OneCycle,
/// <summary>
/// 是否屏蔽治具真空检测
/// </summary>
DisableFixtureVacuumCheck
}
}

24
Rs.SkyLine/Commom/TestCenterMessageBox.cs
Unescape Escape View File

@ -13,6 +13,7 @@ namespace Rs.MotionPlat.Commom
{
public class TestCenterMessageBox
{
static Dictionary<int, SchedulingMessageBox> msgList;
static Dictionary<int,ManualResetEvent> msgSentEvent;
static Dictionary<int, SchedulingMessageBox> resultMessageBox;
static object msgLock = new object();
@ -20,6 +21,7 @@ namespace Rs.MotionPlat.Commom
{
msgSentEvent = new Dictionary<int,ManualResetEvent>();
resultMessageBox = new Dictionary<int, SchedulingMessageBox>();
msgList = new Dictionary<int, SchedulingMessageBox>();
}
public static void Show(int id, string message, ETipButton button,bool bNeedStop=false)
@ -43,6 +45,10 @@ namespace Rs.MotionPlat.Commom
msgBox.Button = button;
msgBox.Instruction = EInstruction.ShowMessage;
msgBox.ID = id;
if(!msgList.ContainsKey(id))
{
msgList.Add(id, msgBox);
}
TestCenter.Instance.ShowMsgBox(msgBox);
if(!msgSentEvent.ContainsKey(id))
{
@ -78,6 +84,7 @@ namespace Rs.MotionPlat.Commom
msgSentEvent.Remove(id);
box = resultMessageBox[id];
resultMessageBox.Remove(id);
msgList.Remove(id);
}
return box;
}
@ -90,5 +97,22 @@ namespace Rs.MotionPlat.Commom
}
return -1;
}
/// <summary>
/// 根据按钮的类型获取弹框的ID
/// </summary>
/// <returns></returns>
public static int GetMsgID(ETipButton btnType)
{
if(msgList!=null && msgList.Count>0)
{
foreach (var button in msgList.Values.ToList())
{
if (button.Button.HasFlag(btnType))
return button.ID;
}
}
return -1;
}
}
}

35
Rs.SkyLine/Flow/LoadAndUnloadTask.cs
Unescape Escape View File

@ -884,6 +884,41 @@ namespace Rs.MotionPlat.Flow
else return slotIndex + 16;
}
/// <summary>
/// 创建周转盘清料任务
/// </summary>
public void CreateTurnoverTrayCleanTask()
{
lock(this)
{
for (int i = 0; i < 32; i++)
{
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);
}
}
}
/// <summary>
/// 创建测试治具清料任务
/// </summary>
private void CreateFixtureCleanTask()
{
}
}
/// <summary>

4
Rs.SkyLine/Flow/MonitorSystemButton.cs
Unescape Escape View File

@ -284,7 +284,7 @@ namespace Rs.MotionPlat.Flow
case EMonitorButtonStep.SkipButtonPressed:
//关闭消息
MessageQueue.Instance.Insert("跳过按钮按下");
msgID = TestCenterMessageBox.GetMsgID();
msgID = TestCenterMessageBox.GetMsgID( SchedulingMessageBox.ETipButton.Skip);
if (msgID>0)
{
SchedulingMessageBox box = new SchedulingMessageBox();
@ -307,7 +307,7 @@ namespace Rs.MotionPlat.Flow
case EMonitorButtonStep.RetryButtonPressed:
//关闭消息
MessageQueue.Instance.Insert("重试按钮按下");
msgID = TestCenterMessageBox.GetMsgID();
msgID = TestCenterMessageBox.GetMsgID( SchedulingMessageBox.ETipButton.Retry);
if (msgID > 0)
{
SchedulingMessageBox box = new SchedulingMessageBox();

9
Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs
Unescape Escape View File

@ -2195,6 +2195,15 @@ namespace Rs.MotionPlat.Flow
{
return $"{trayType}盘{slotIndex+1}穴位";
}
/// <summary>
/// 复位流程步序
/// </summary>
private void ResetFlow()
{
flowStep = EDischargeFlowStep.等待任务;
}
}
}

2
Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs
Unescape Escape View File

@ -962,7 +962,7 @@ namespace Rs.MotionPlat.Flow
}
if(nozzle.IsHasProduct)
{
if (Ops.IsOn($"测试{nozzle.NozzleIndex}号穴位真空吸检测") || GlobalVar.RunSpace)
if (Ops.IsOn($"测试{nozzle.NozzleIndex}号穴位真空吸检测") || GlobalVar.RunSpace || GlobalVar.DisableFixtureVacuumCheck)
{
GlobalTray.TestTray.ChangeStatus(nozzle.NozzleIndex, ESlotStatus.Have);
TestTrayManager.Instance.Slot(nozzle.NozzleIndex).AddProduct(nozzle);

2
Rs.SkyLine/Flow/SubFlow/LaserFlow.cs
Unescape Escape View File

@ -21,7 +21,7 @@ namespace Rs.MotionPlat.Flow.SubFlow
测高完成
}
/// <summary>
/// 镭射头到穴位上方
/// 镭射头测高
/// </summary>
public class LaserFlow
{

3
Rs.SkyLine/Flow/TestCenter.cs
Unescape Escape View File

@ -41,6 +41,9 @@ namespace Rs.MotionPlat.Flow
{
switch (ssi.Type)
{
case SchedulingStatusInfo.InfoType.DisableFixtureVacuumCheck:
GlobalVar.DisableFixtureVacuumCheck = bool.Parse(ssi.Info);
break;
case SchedulingStatusInfo.InfoType.State:
break;
case SchedulingStatusInfo.InfoType.RunStatus:

7
Rs.SkyLine/Home.cs
Unescape Escape View File

@ -228,6 +228,13 @@ namespace Rs.MotionPlat
//monitorTray.ShowInTaskbar = false;
monitorTray.Show();
});
new HotKeyManager(Keys.F, 1, (o, arg) => {
MonitorFlow mf = new MonitorFlow();
mf.StartPosition= FormStartPosition.CenterParent;
mf.HeaderBackgroundColor = Color.Gray;
mf.Show();
});
}
private void SetFormStyle()

495
Rs.SkyLine/MonitorFlow.Designer.cs generated
Unescape Escape View File

@ -0,0 +1,495 @@
namespace Rs.MotionPlat
{
partial class MonitorFlow
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.tv_DischargeFlow = new System.Windows.Forms.TreeView();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.tv_TurnoverFlow = new System.Windows.Forms.TreeView();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.groupBox7 = new System.Windows.Forms.GroupBox();
this.groupBox8 = new System.Windows.Forms.GroupBox();
this.groupBox9 = new System.Windows.Forms.GroupBox();
this.groupBox10 = new System.Windows.Forms.GroupBox();
this.groupBox11 = new System.Windows.Forms.GroupBox();
this.groupBox12 = new System.Windows.Forms.GroupBox();
this.groupBox13 = new System.Windows.Forms.GroupBox();
this.groupBox14 = new System.Windows.Forms.GroupBox();
this.groupBox15 = new System.Windows.Forms.GroupBox();
this.groupBox16 = new System.Windows.Forms.GroupBox();
this.groupBox17 = new System.Windows.Forms.GroupBox();
this.groupBox18 = new System.Windows.Forms.GroupBox();
this.groupBox19 = new System.Windows.Forms.GroupBox();
this.groupBox20 = new System.Windows.Forms.GroupBox();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.tv_TakeTrayFlow = new System.Windows.Forms.TreeView();
this.tv_DischargeDumpFlow = new System.Windows.Forms.TreeView();
this.tv_FiberWarningPressFlow = new System.Windows.Forms.TreeView();
this.treeView4 = new System.Windows.Forms.TreeView();
this.treeView5 = new System.Windows.Forms.TreeView();
this.treeView6 = new System.Windows.Forms.TreeView();
this.treeView7 = new System.Windows.Forms.TreeView();
this.treeView8 = new System.Windows.Forms.TreeView();
this.tableLayoutPanel2.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox5.SuspendLayout();
this.groupBox6.SuspendLayout();
this.groupBox7.SuspendLayout();
this.groupBox8.SuspendLayout();
this.groupBox9.SuspendLayout();
this.groupBox10.SuspendLayout();
this.SuspendLayout();
//
// tableLayoutPanel2
//
this.tableLayoutPanel2.ColumnCount = 10;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10F));
this.tableLayoutPanel2.Controls.Add(this.groupBox1, 0, 0);
this.tableLayoutPanel2.Controls.Add(this.groupBox2, 1, 0);
this.tableLayoutPanel2.Controls.Add(this.groupBox3, 2, 0);
this.tableLayoutPanel2.Controls.Add(this.groupBox4, 3, 0);
this.tableLayoutPanel2.Controls.Add(this.groupBox5, 4, 0);
this.tableLayoutPanel2.Controls.Add(this.groupBox6, 5, 0);
this.tableLayoutPanel2.Controls.Add(this.groupBox7, 6, 0);
this.tableLayoutPanel2.Controls.Add(this.groupBox8, 7, 0);
this.tableLayoutPanel2.Controls.Add(this.groupBox9, 8, 0);
this.tableLayoutPanel2.Controls.Add(this.groupBox10, 9, 0);
this.tableLayoutPanel2.Controls.Add(this.groupBox11, 0, 1);
this.tableLayoutPanel2.Controls.Add(this.groupBox12, 1, 1);
this.tableLayoutPanel2.Controls.Add(this.groupBox13, 2, 1);
this.tableLayoutPanel2.Controls.Add(this.groupBox14, 3, 1);
this.tableLayoutPanel2.Controls.Add(this.groupBox15, 4, 1);
this.tableLayoutPanel2.Controls.Add(this.groupBox16, 5, 1);
this.tableLayoutPanel2.Controls.Add(this.groupBox17, 6, 1);
this.tableLayoutPanel2.Controls.Add(this.groupBox18, 7, 1);
this.tableLayoutPanel2.Controls.Add(this.groupBox19, 8, 1);
this.tableLayoutPanel2.Controls.Add(this.groupBox20, 9, 1);
this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 40);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(1808, 820);
this.tableLayoutPanel2.TabIndex = 3;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.tv_DischargeFlow);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
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(174, 404);
this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "排料流程";
//
// tv_DischargeFlow
//
this.tv_DischargeFlow.Dock = System.Windows.Forms.DockStyle.Fill;
this.tv_DischargeFlow.Location = new System.Drawing.Point(3, 17);
this.tv_DischargeFlow.Name = "tv_DischargeFlow";
this.tv_DischargeFlow.Size = new System.Drawing.Size(168, 384);
this.tv_DischargeFlow.TabIndex = 0;
//
// groupBox2
//
this.groupBox2.Controls.Add(this.tv_TurnoverFlow);
this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox2.ForeColor = System.Drawing.Color.White;
this.groupBox2.Location = new System.Drawing.Point(183, 3);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(174, 404);
this.groupBox2.TabIndex = 0;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "周转流程";
//
// tv_TurnoverFlow
//
this.tv_TurnoverFlow.Dock = System.Windows.Forms.DockStyle.Fill;
this.tv_TurnoverFlow.Location = new System.Drawing.Point(3, 17);
this.tv_TurnoverFlow.Name = "tv_TurnoverFlow";
this.tv_TurnoverFlow.Size = new System.Drawing.Size(168, 384);
this.tv_TurnoverFlow.TabIndex = 0;
//
// groupBox3
//
this.groupBox3.Controls.Add(this.tv_TakeTrayFlow);
this.groupBox3.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox3.ForeColor = System.Drawing.Color.White;
this.groupBox3.Location = new System.Drawing.Point(363, 3);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(174, 404);
this.groupBox3.TabIndex = 0;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "料盘搬运流程";
//
// groupBox4
//
this.groupBox4.Controls.Add(this.tv_DischargeDumpFlow);
this.groupBox4.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox4.ForeColor = System.Drawing.Color.White;
this.groupBox4.Location = new System.Drawing.Point(543, 3);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(174, 404);
this.groupBox4.TabIndex = 0;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "排料取料失败放料流程";
//
// groupBox5
//
this.groupBox5.Controls.Add(this.tv_FiberWarningPressFlow);
this.groupBox5.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox5.ForeColor = System.Drawing.Color.White;
this.groupBox5.Location = new System.Drawing.Point(723, 3);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(174, 404);
this.groupBox5.TabIndex = 0;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "光纤异常下压一次流程";
//
// groupBox6
//
this.groupBox6.Controls.Add(this.treeView4);
this.groupBox6.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox6.ForeColor = System.Drawing.Color.White;
this.groupBox6.Location = new System.Drawing.Point(903, 3);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(174, 404);
this.groupBox6.TabIndex = 0;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "groupBox1";
//
// groupBox7
//
this.groupBox7.Controls.Add(this.treeView5);
this.groupBox7.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox7.ForeColor = System.Drawing.Color.White;
this.groupBox7.Location = new System.Drawing.Point(1083, 3);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(174, 404);
this.groupBox7.TabIndex = 0;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "groupBox1";
//
// groupBox8
//
this.groupBox8.Controls.Add(this.treeView6);
this.groupBox8.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox8.ForeColor = System.Drawing.Color.White;
this.groupBox8.Location = new System.Drawing.Point(1263, 3);
this.groupBox8.Name = "groupBox8";
this.groupBox8.Size = new System.Drawing.Size(174, 404);
this.groupBox8.TabIndex = 0;
this.groupBox8.TabStop = false;
this.groupBox8.Text = "groupBox1";
//
// groupBox9
//
this.groupBox9.Controls.Add(this.treeView7);
this.groupBox9.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox9.ForeColor = System.Drawing.Color.White;
this.groupBox9.Location = new System.Drawing.Point(1443, 3);
this.groupBox9.Name = "groupBox9";
this.groupBox9.Size = new System.Drawing.Size(174, 404);
this.groupBox9.TabIndex = 0;
this.groupBox9.TabStop = false;
this.groupBox9.Text = "groupBox1";
//
// groupBox10
//
this.groupBox10.Controls.Add(this.treeView8);
this.groupBox10.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox10.ForeColor = System.Drawing.Color.White;
this.groupBox10.Location = new System.Drawing.Point(1623, 3);
this.groupBox10.Name = "groupBox10";
this.groupBox10.Size = new System.Drawing.Size(182, 404);
this.groupBox10.TabIndex = 0;
this.groupBox10.TabStop = false;
this.groupBox10.Text = "groupBox1";
//
// groupBox11
//
this.groupBox11.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox11.ForeColor = System.Drawing.Color.White;
this.groupBox11.Location = new System.Drawing.Point(3, 413);
this.groupBox11.Name = "groupBox11";
this.groupBox11.Size = new System.Drawing.Size(174, 404);
this.groupBox11.TabIndex = 0;
this.groupBox11.TabStop = false;
this.groupBox11.Text = "groupBox1";
//
// groupBox12
//
this.groupBox12.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox12.ForeColor = System.Drawing.Color.White;
this.groupBox12.Location = new System.Drawing.Point(183, 413);
this.groupBox12.Name = "groupBox12";
this.groupBox12.Size = new System.Drawing.Size(174, 404);
this.groupBox12.TabIndex = 0;
this.groupBox12.TabStop = false;
this.groupBox12.Text = "groupBox1";
//
// groupBox13
//
this.groupBox13.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox13.ForeColor = System.Drawing.Color.White;
this.groupBox13.Location = new System.Drawing.Point(363, 413);
this.groupBox13.Name = "groupBox13";
this.groupBox13.Size = new System.Drawing.Size(174, 404);
this.groupBox13.TabIndex = 0;
this.groupBox13.TabStop = false;
this.groupBox13.Text = "groupBox1";
//
// groupBox14
//
this.groupBox14.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox14.ForeColor = System.Drawing.Color.White;
this.groupBox14.Location = new System.Drawing.Point(543, 413);
this.groupBox14.Name = "groupBox14";
this.groupBox14.Size = new System.Drawing.Size(174, 404);
this.groupBox14.TabIndex = 0;
this.groupBox14.TabStop = false;
this.groupBox14.Text = "groupBox1";
//
// groupBox15
//
this.groupBox15.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox15.ForeColor = System.Drawing.Color.White;
this.groupBox15.Location = new System.Drawing.Point(723, 413);
this.groupBox15.Name = "groupBox15";
this.groupBox15.Size = new System.Drawing.Size(174, 404);
this.groupBox15.TabIndex = 0;
this.groupBox15.TabStop = false;
this.groupBox15.Text = "groupBox1";
//
// groupBox16
//
this.groupBox16.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox16.ForeColor = System.Drawing.Color.White;
this.groupBox16.Location = new System.Drawing.Point(903, 413);
this.groupBox16.Name = "groupBox16";
this.groupBox16.Size = new System.Drawing.Size(174, 404);
this.groupBox16.TabIndex = 0;
this.groupBox16.TabStop = false;
this.groupBox16.Text = "groupBox1";
//
// groupBox17
//
this.groupBox17.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox17.ForeColor = System.Drawing.Color.White;
this.groupBox17.Location = new System.Drawing.Point(1083, 413);
this.groupBox17.Name = "groupBox17";
this.groupBox17.Size = new System.Drawing.Size(174, 404);
this.groupBox17.TabIndex = 0;
this.groupBox17.TabStop = false;
this.groupBox17.Text = "groupBox1";
//
// groupBox18
//
this.groupBox18.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox18.ForeColor = System.Drawing.Color.White;
this.groupBox18.Location = new System.Drawing.Point(1263, 413);
this.groupBox18.Name = "groupBox18";
this.groupBox18.Size = new System.Drawing.Size(174, 404);
this.groupBox18.TabIndex = 0;
this.groupBox18.TabStop = false;
this.groupBox18.Text = "groupBox1";
//
// groupBox19
//
this.groupBox19.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox19.ForeColor = System.Drawing.Color.White;
this.groupBox19.Location = new System.Drawing.Point(1443, 413);
this.groupBox19.Name = "groupBox19";
this.groupBox19.Size = new System.Drawing.Size(174, 404);
this.groupBox19.TabIndex = 0;
this.groupBox19.TabStop = false;
this.groupBox19.Text = "groupBox1";
//
// groupBox20
//
this.groupBox20.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox20.ForeColor = System.Drawing.Color.White;
this.groupBox20.Location = new System.Drawing.Point(1623, 413);
this.groupBox20.Name = "groupBox20";
this.groupBox20.Size = new System.Drawing.Size(182, 404);
this.groupBox20.TabIndex = 0;
this.groupBox20.TabStop = false;
this.groupBox20.Text = "groupBox1";
//
// timer1
//
this.timer1.Enabled = true;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// tv_TakeTrayFlow
//
this.tv_TakeTrayFlow.Dock = System.Windows.Forms.DockStyle.Fill;
this.tv_TakeTrayFlow.Location = new System.Drawing.Point(3, 17);
this.tv_TakeTrayFlow.Name = "tv_TakeTrayFlow";
this.tv_TakeTrayFlow.Size = new System.Drawing.Size(168, 384);
this.tv_TakeTrayFlow.TabIndex = 0;
//
// tv_DischargeDumpFlow
//
this.tv_DischargeDumpFlow.Dock = System.Windows.Forms.DockStyle.Fill;
this.tv_DischargeDumpFlow.Location = new System.Drawing.Point(3, 17);
this.tv_DischargeDumpFlow.Name = "tv_DischargeDumpFlow";
this.tv_DischargeDumpFlow.Size = new System.Drawing.Size(168, 384);
this.tv_DischargeDumpFlow.TabIndex = 0;
//
// tv_FiberWarningPressFlow
//
this.tv_FiberWarningPressFlow.Dock = System.Windows.Forms.DockStyle.Fill;
this.tv_FiberWarningPressFlow.Location = new System.Drawing.Point(3, 17);
this.tv_FiberWarningPressFlow.Name = "tv_FiberWarningPressFlow";
this.tv_FiberWarningPressFlow.Size = new System.Drawing.Size(168, 384);
this.tv_FiberWarningPressFlow.TabIndex = 0;
//
// treeView4
//
this.treeView4.Dock = System.Windows.Forms.DockStyle.Fill;
this.treeView4.Location = new System.Drawing.Point(3, 17);
this.treeView4.Name = "treeView4";
this.treeView4.Size = new System.Drawing.Size(168, 384);
this.treeView4.TabIndex = 0;
//
// treeView5
//
this.treeView5.Dock = System.Windows.Forms.DockStyle.Fill;
this.treeView5.Location = new System.Drawing.Point(3, 17);
this.treeView5.Name = "treeView5";
this.treeView5.Size = new System.Drawing.Size(168, 384);
this.treeView5.TabIndex = 0;
//
// treeView6
//
this.treeView6.Dock = System.Windows.Forms.DockStyle.Fill;
this.treeView6.Location = new System.Drawing.Point(3, 17);
this.treeView6.Name = "treeView6";
this.treeView6.Size = new System.Drawing.Size(168, 384);
this.treeView6.TabIndex = 0;
//
// treeView7
//
this.treeView7.Dock = System.Windows.Forms.DockStyle.Fill;
this.treeView7.Location = new System.Drawing.Point(3, 17);
this.treeView7.Name = "treeView7";
this.treeView7.Size = new System.Drawing.Size(168, 384);
this.treeView7.TabIndex = 0;
//
// treeView8
//
this.treeView8.Dock = System.Windows.Forms.DockStyle.Fill;
this.treeView8.Location = new System.Drawing.Point(3, 17);
this.treeView8.Name = "treeView8";
this.treeView8.Size = new System.Drawing.Size(176, 384);
this.treeView8.TabIndex = 0;
//
// MonitorFlow
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1808, 860);
this.Controls.Add(this.tableLayoutPanel2);
this.Name = "MonitorFlow";
this.Text = "MonitorFlow";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.Load += new System.EventHandler(this.MonitorFlow_Load);
this.Controls.SetChildIndex(this.tableLayoutPanel2, 0);
this.tableLayoutPanel2.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox2.ResumeLayout(false);
this.groupBox3.ResumeLayout(false);
this.groupBox4.ResumeLayout(false);
this.groupBox5.ResumeLayout(false);
this.groupBox6.ResumeLayout(false);
this.groupBox7.ResumeLayout(false);
this.groupBox8.ResumeLayout(false);
this.groupBox9.ResumeLayout(false);
this.groupBox10.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.GroupBox groupBox5;
private System.Windows.Forms.GroupBox groupBox6;
private System.Windows.Forms.GroupBox groupBox7;
private System.Windows.Forms.GroupBox groupBox8;
private System.Windows.Forms.GroupBox groupBox9;
private System.Windows.Forms.GroupBox groupBox10;
private System.Windows.Forms.GroupBox groupBox11;
private System.Windows.Forms.GroupBox groupBox12;
private System.Windows.Forms.GroupBox groupBox13;
private System.Windows.Forms.GroupBox groupBox14;
private System.Windows.Forms.GroupBox groupBox15;
private System.Windows.Forms.GroupBox groupBox16;
private System.Windows.Forms.GroupBox groupBox17;
private System.Windows.Forms.GroupBox groupBox18;
private System.Windows.Forms.GroupBox groupBox19;
private System.Windows.Forms.GroupBox groupBox20;
private System.Windows.Forms.TreeView tv_DischargeFlow;
private System.Windows.Forms.TreeView tv_TurnoverFlow;
private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.TreeView tv_TakeTrayFlow;
private System.Windows.Forms.TreeView tv_DischargeDumpFlow;
private System.Windows.Forms.TreeView tv_FiberWarningPressFlow;
private System.Windows.Forms.TreeView treeView4;
private System.Windows.Forms.TreeView treeView5;
private System.Windows.Forms.TreeView treeView6;
private System.Windows.Forms.TreeView treeView7;
private System.Windows.Forms.TreeView treeView8;
}
}

77
Rs.SkyLine/MonitorFlow.cs
Unescape Escape View File

@ -0,0 +1,77 @@
using Rs.MotionPlat.Flow;
using Rs.MotionPlat.Flow.SubFlow;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Rs.MotionPlat
{
public partial class MonitorFlow : BaseFormHeader
{
public MonitorFlow()
{
this.StartPosition = FormStartPosition.Manual;
InitializeComponent();
this.FormBorderStyle = FormBorderStyle.None;
this.MaximizedBounds = Screen.PrimaryScreen.WorkingArea;
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
}
private void MonitorFlow_Load(object sender, EventArgs e)
{
LoadFlowStep< EDischargeFlowStep>("DischargeFlow", tv_DischargeFlow);
LoadFlowStep<ETurnoverFlowStep>("TurnoverFlow", tv_TurnoverFlow);
LoadFlowStep<ETakeTrayFlowStep>("TakeTrayFlow", tv_TakeTrayFlow);
LoadFlowStep<EDischargeDumpFlowStep>("DischargeDumpFlow", tv_DischargeDumpFlow);
LoadFlowStep<EFiberWarningPressFlowStep>("FiberWarningPressFlow", tv_FiberWarningPressFlow);
}
void LoadFlowStep<T>(string flowname,TreeView tv) where T : Enum
{
string[] stepnames = Enum.GetNames(typeof(T));
TreeNode root = new TreeNode();
root.Text = flowname;
foreach (string stepname in stepnames)
{
root.Nodes.Add(new TreeNode(stepname));
}
tv.Nodes.Add(root);
tv.ExpandAll();
}
private void timer1_Tick(object sender, EventArgs e)
{
string stepname = DischargeFlow.Instance.GetCurStep();
foreach (TreeNode tn in tv_DischargeFlow.Nodes[0].Nodes)
{
if(tn.Text== stepname)
{
tn.ForeColor = Color.Red;
}
else
{
tn.ForeColor = Color.Black;
}
}
stepname = TurnoverFlow.Instance.GetStep();
foreach (TreeNode tn in tv_TurnoverFlow.Nodes[0].Nodes)
{
if (tn.Text == stepname)
{
tn.ForeColor = Color.Red;
}
else
{
tn.ForeColor = Color.Black;
}
}
}
}
}

123
Rs.SkyLine/MonitorFlow.resx
Unescape Escape View File

@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

2
Rs.SkyLine/Properties/AssemblyInfo.cs
Unescape Escape View File

@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
//
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
[assembly: AssemblyVersion("2.20.24.9")]
[assembly: AssemblyVersion("2.20.24.10")]
//[assembly: AssemblyVersion("1.0.0.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")]

9
Rs.SkyLine/Rs.SkyLine.csproj
Unescape Escape View File

@ -280,6 +280,12 @@
<Compile Include="MonitorConfig.designer.cs">
<DependentUpon>MonitorConfig.cs</DependentUpon>
</Compile>
<Compile Include="MonitorFlow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MonitorFlow.Designer.cs">
<DependentUpon>MonitorFlow.cs</DependentUpon>
</Compile>
<Compile Include="MonitorTray.cs">
<SubType>Form</SubType>
</Compile>
@ -555,6 +561,9 @@
<EmbeddedResource Include="MonitorConfig.resx">
<DependentUpon>MonitorConfig.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MonitorFlow.resx">
<DependentUpon>MonitorFlow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MonitorTray.resx">
<DependentUpon>MonitorTray.cs</DependentUpon>
</EmbeddedResource>

13
Rs.SkyLine/TestFrm.Designer.cs generated
Unescape Escape View File

@ -60,6 +60,7 @@
this.button24 = new System.Windows.Forms.Button();
this.button25 = new System.Windows.Forms.Button();
this.button26 = new System.Windows.Forms.Button();
this.button27 = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// btnTurnoverSlotException
@ -382,11 +383,22 @@
this.button26.UseVisualStyleBackColor = true;
this.button26.Click += new System.EventHandler(this.button26_Click);
//
// button27
//
this.button27.Location = new System.Drawing.Point(571, 567);
this.button27.Name = "button27";
this.button27.Size = new System.Drawing.Size(166, 60);
this.button27.TabIndex = 4;
this.button27.Text = "生成清料任务";
this.button27.UseVisualStyleBackColor = true;
this.button27.Click += new System.EventHandler(this.button27_Click);
//
// TestFrm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1336, 854);
this.Controls.Add(this.button27);
this.Controls.Add(this.button26);
this.Controls.Add(this.button24);
this.Controls.Add(this.button23);
@ -459,5 +471,6 @@
private System.Windows.Forms.Button button24;
private System.Windows.Forms.Button button25;
private System.Windows.Forms.Button button26;
private System.Windows.Forms.Button button27;
}
}

5
Rs.SkyLine/TestFrm.cs
Unescape Escape View File

@ -264,5 +264,10 @@ namespace Rs.MotionPlat
Msg.ShowInfo(button.ToString());
});
}
private void button27_Click(object sender, EventArgs e)
{
LoadAndUnloadTask.Instance.CreateTurnoverTrayCleanTask();
}
}
}

Write Preview
Loading…
Cancel
Save