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

1、优化放料到料仓流程

Browse Source 
2、优化登录后参数更改工鞥男
master
lhiven 2 years ago
parent 751f0e8530
commit 5fb22861e2
6 changed files with 205 additions and 240 deletions
Show Stats Download Patch File Download Diff File

203
Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs
Unescape Escape View File

@ -107,6 +107,11 @@ namespace Rs.MotionPlat.Flow
/// </summary>
int takeSlotIndex = 1;
/// <summary>
/// 一拍十六定位结果
/// </summary>
ProductLocationResult[] productLocationResult;
/// <summary>
/// 最后一次换料的治具编号
/// </summary>
@ -223,71 +228,136 @@ namespace Rs.MotionPlat.Flow
break;
case EDischargeFlowStep.进料盘产品定位:
ProductLocationFlow.Instance.Grab(takeSlotIndex);
ProductLocationResult[] results = OneGrabSixteenManager.Instance.GetResults();
if(results!=null)
productLocationResult = OneGrabSixteenManager.Instance.GetResults();
if(productLocationResult != null)
{
//foreach (ProductLocationResult item in results)
//{
// if(item.Result== EOneGrabSixteenResult.Slant || item.Result== EOneGrabSixteenResult.LocationOkScanBarcodeFail)
// {
// bool exit = false;
// while (!exit)
// {
// //凡是定位失败的，需要定位重拍
// ProductLocationResult vr = FixedGrabProductFlow.Instance.Grab(ETrayType.Input, item.SlotIndex);
// if (vr.Result == EOneGrabSixteenResult.Ok)//拍照OK
// {
// item.Change(vr.SN, vr.OffsetX, vr.OffsetY);
// exit = true;
// }
// else if (vr.Result == EOneGrabSixteenResult.Slant)//拍照失败
// {
// //报警弹框
// EButtonType buttonSelect = Msgbox.ShowDialog(EButtonType.Skip| EButtonType.Retry, $"穴位{item.SlotIndex}定位失败，请把产品手动取走后点击跳过");
// if (buttonSelect == EButtonType.Skip)
// {
// GlobalTray.InputTray.ChangeStatus(item.SlotIndex, ESlotStatus.NotHave);
// exit = true;
// }
// }
// else if (vr.Result == EOneGrabSixteenResult.LocationOkScanBarcodeFail)//定位成功，拍照失败
// {
// //这里需要把产品取到拍照NG料盘中
// //取料
// Nozzle idleNozzle = NozzleManager.GetIdelNozzle();
// StockTakeFlow.Instance.Take(item.SlotIndex, idleNozzle.NozzleIndex);
// //放料
// TraySlot noProductSlot = GlobalTray.RetestTray.GetSlot(ESlotStatus.NotHave);
// if (noProductSlot != null)
// {
// StockPlaceFlow.Instance.Place(ETrayType.ReTest, noProductSlot.Index, idleNozzle.NozzleIndex);
// }
// else
// {
// Msgbox.ShowDialog(EButtonType.Ok, "Retest料盘已放满，请更换料盘，更换完成后点击确定");
// GlobalTray.RetestTray.ChangeStatus(ESlotStatus.NotHave);
// ThreePointLocationFlow.Instance.Location(ETrayType.ReTest);
// //放料
// noProductSlot = GlobalTray.RetestTray.GetSlot(ESlotStatus.NotHave);
// StockPlaceFlow.Instance.Place(ETrayType.ReTest, noProductSlot.Index, idleNozzle.NozzleIndex);
// }
// exit = true;
// }
// }
// }
//}
//对结果进行处理
flowStep = EDischargeFlowStep.料仓取料;
}
break;
case EDischargeFlowStep.料仓取料:
ProductLocationResult ret = productLocationResult.Where(r => r.SlotIndex == takeSlotIndex).First();
if(ret != null)
{
foreach (ProductLocationResult item in results)
if(ret.Result== EOneGrabSixteenResult.Ok)
{
StockTakeFlow.Instance.Take(takeSlotIndex, NozzleManager.GetIdelNozzle().NozzleIndex);
takeSlotIndex++;
flowStep = EDischargeFlowStep.判断是否需要从料仓取料;
}
else
{
if(item.Result== EOneGrabSixteenResult.Slant || item.Result== EOneGrabSixteenResult.LocationOkScanBarcodeFail)
bool exit = false;
while (!exit)
{
bool exit = false;
while (!exit)
ProductLocationResult fixtureret = FixedGrabProductFlow.Instance.Grab(ETrayType.Input, ret.SlotIndex);
if (ret.Result == EOneGrabSixteenResult.Ok)
{
//凡是定位失败的，需要定位重拍
ProductLocationResult vr = FixedGrabProductFlow.Instance.Grab(ETrayType.Input, item.SlotIndex);
if (vr.Result == EOneGrabSixteenResult.Ok)//拍照OK
ret.Change(fixtureret.SN, fixtureret.OffsetX, fixtureret.OffsetY);
takeSlotIndex++;
flowStep = EDischargeFlowStep.判断是否需要从料仓取料;
exit = true;
}
else if (ret.Result == EOneGrabSixteenResult.LocationOkScanBarcodeFail)
{
Nozzle idleNozzle = NozzleManager.GetIdelNozzle();
StockTakeFlow.Instance.Take(ret.SlotIndex, idleNozzle.NozzleIndex);
//放料
TraySlot noProductSlot = GlobalTray.RetestTray.GetSlot(ESlotStatus.NotHave);
if (noProductSlot != null)
{
item.Change(vr.SN, vr.OffsetX, vr.OffsetY);
exit = true;
StockPlaceFlow.Instance.Place(ETrayType.ReTest, noProductSlot.Index, idleNozzle.NozzleIndex);
}
else if (vr.Result == EOneGrabSixteenResult.Slant)//拍照失败
else
{
//报警弹框
EButtonType buttonSelect = Msgbox.ShowDialog(EButtonType.Skip| EButtonType.Retry, $"穴位{item.SlotIndex}定位失败，请把产品手动取走后点击跳过");
if (buttonSelect == EButtonType.Skip)
{
GlobalTray.InputTray.ChangeStatus(item.SlotIndex, ESlotStatus.NotHave);
exit = true;
}
Msgbox.ShowDialog(EButtonType.Ok, "Retest料盘已放满，请更换料盘，更换完成后点击确定");
GlobalTray.RetestTray.ChangeStatus(ESlotStatus.NotHave);
ThreePointLocationFlow.Instance.Location(ETrayType.ReTest);
//放料
noProductSlot = GlobalTray.RetestTray.GetSlot(ESlotStatus.NotHave);
StockPlaceFlow.Instance.Place(ETrayType.ReTest, noProductSlot.Index, idleNozzle.NozzleIndex);
}
else if (vr.Result == EOneGrabSixteenResult.LocationOkScanBarcodeFail)//定位成功，拍照失败
takeSlotIndex++;
flowStep = EDischargeFlowStep.判断是否需要从料仓取料;
exit = true;
}
else if (ret.Result == EOneGrabSixteenResult.Slant)
{
//报警弹框
EButtonType buttonSelect = Msgbox.ShowDialog(EButtonType.Skip | EButtonType.Retry | EButtonType.EndInput, $"穴位{ret.SlotIndex}定位失败，请把产品手动取走后点击跳过");
if (buttonSelect == EButtonType.Skip)
{
GlobalTray.InputTray.ChangeStatus(ret.SlotIndex, ESlotStatus.NotHave);
}
else if (buttonSelect == EButtonType.EndInput)
{
//这里需要把产品取到拍照NG料盘中
//取料
Nozzle idleNozzle = NozzleManager.GetIdelNozzle();
StockTakeFlow.Instance.Take(item.SlotIndex, idleNozzle.NozzleIndex);
//放料
TraySlot noProductSlot = GlobalTray.RetestTray.GetSlot(ESlotStatus.NotHave);
if (noProductSlot != null)
{
StockPlaceFlow.Instance.Place(ETrayType.ReTest, noProductSlot.Index, idleNozzle.NozzleIndex);
}
else
{
Msgbox.ShowDialog(EButtonType.Ok, "Retest料盘已放满，请更换料盘，更换完成后点击确定");
GlobalTray.RetestTray.ChangeStatus(ESlotStatus.NotHave);
ThreePointLocationFlow.Instance.Location(ETrayType.ReTest);
//放料
noProductSlot = GlobalTray.RetestTray.GetSlot(ESlotStatus.NotHave);
StockPlaceFlow.Instance.Place(ETrayType.ReTest, noProductSlot.Index, idleNozzle.NozzleIndex);
}
exit = true;
GlobalVar.Clear = true;
takeSlotIndex++;
flowStep = EDischargeFlowStep.判断是否需要从料仓取料;
}
}
}
}
}
//对结果进行处理
flowStep = EDischargeFlowStep.料仓取料;
break;
case EDischargeFlowStep.料仓取料:
if(GlobalTray.InputTray.GetSlot(takeSlotIndex).SlotStatus == ESlotStatus.Have)
{
StockTakeFlow.Instance.Take(takeSlotIndex, NozzleManager.GetIdelNozzle().NozzleIndex);
}
takeSlotIndex++;
flowStep = EDischargeFlowStep.判断是否需要从料仓取料;
//if (GlobalTray.InputTray.GetSlot(takeSlotIndex).SlotStatus == ESlotStatus.Have)
//{
// StockTakeFlow.Instance.Take(takeSlotIndex, NozzleManager.GetIdelNozzle().NozzleIndex);
//}
//takeSlotIndex++;
//flowStep = EDischargeFlowStep.判断是否需要从料仓取料;
break;
#endregion
@ -428,18 +498,35 @@ namespace Rs.MotionPlat.Flow
int placeNozzleIndex = placeNozzle.NozzleIndex;
//placeNozzle.Product.Result
//这里先方到OK料仓
TraySlot waitPlaceSlot = GlobalTray.OkTary.GetSlot(ESlotStatus.NotHave);
if(waitPlaceSlot!=null)
if(placeNozzle.Product.Result=="true")
{
StockPlaceFlow.Instance.Place(ETrayType.Ok,waitPlaceSlot.Index, placeNozzleIndex);
TraySlot waitPlaceSlot = GlobalTray.OkTary.GetSlot(ESlotStatus.NotHave);
if (waitPlaceSlot != null)
{
StockPlaceFlow.Instance.Place(ETrayType.Ok, waitPlaceSlot.Index, placeNozzleIndex);
}
else
{
//料盘放满了，更换料盘
DischargeModuleGoSafePosFlow.Instance.GoSafePostion();
TakeTrayFlow.Instance.Take(ETrayType.Empty, ETrayType.Ok);
GlobalTray.OkTary.ChangeStatus(ESlotStatus.NotHave);
//料盘已满
}
}
else
{
//料盘放满了，更换料盘
DischargeModuleGoSafePosFlow.Instance.GoSafePostion();
TakeTrayFlow.Instance.Take(ETrayType.Empty, ETrayType.Ok);
GlobalTray.OkTary.ChangeStatus(ESlotStatus.NotHave);
//料盘已满
TraySlot waitPlaceSlot = GlobalTray.NgTray.GetSlot(ESlotStatus.NotHave);
if (waitPlaceSlot != null)
{
StockPlaceFlow.Instance.Place(ETrayType.Ng, waitPlaceSlot.Index, placeNozzleIndex);
}
else
{
//提示更换料盘
Msgbox.ShowDialog(EButtonType.Ok, "NG料盘已满，请更换料盘，更换完成后点击确定");
GlobalTray.NgTray.ChangeStatus(ESlotStatus.NotHave);
}
}
// flowStep = EDischargeFlowStep.到料仓放料位上方;
}

34
Rs.DeweyTester/FormMain.cs
Unescape Escape View File

@ -193,6 +193,16 @@ namespace Rs.MotionPlat
timertc4.Enabled = true;
timertc5.Enabled = true;
timertc6.Enabled = true;
if(GlobalUser.UserName!="")
{
txtConfig.Enabled = true;
cboxConfigName.Enabled = true;
txtSubLotName.Enabled = true;
txtSiteID.Enabled = true;
txtProjectID.Enabled = true;
cboxMtcp.Enabled = true;
cboxNoise.Enabled = true;
}
}
@ -492,5 +502,29 @@ namespace Rs.MotionPlat
{
uTestCell6.RefreshStatus(TestFixtureManager.Instance.GetTestFixture(6));
}
private void cboxMtcp_Click(object sender, EventArgs e)
{
if(cboxMtcp.Checked)
{
SysConfigParam.Update("Mtcp","true");
}
else
{
SysConfigParam.Update("Mtcp", "false");
}
}
private void cboxNoise_Click(object sender, EventArgs e)
{
if (cboxNoise.Checked)
{
SysConfigParam.Update("Noise", "true");
}
else
{
SysConfigParam.Update("Noise", "false");
}
}
}
}

199
Rs.DeweyTester/FormMain.designer.cs generated
Unescape Escape View File

@ -32,8 +32,8 @@ namespace Rs.MotionPlat
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.panel1 = new System.Windows.Forms.Panel();
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
@ -193,42 +193,7 @@ namespace Rs.MotionPlat
this.panel21.SuspendLayout();
this.tabPage2.SuspendLayout();
this.tableLayoutPanel5.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.groupBox11.SuspendLayout();
this.groupBox12.SuspendLayout();
this.groupBox13.SuspendLayout();
this.groupBox14.SuspendLayout();
this.groupBox15.SuspendLayout();
this.groupBox16.SuspendLayout();
this.groupBox17.SuspendLayout();
this.groupBox18.SuspendLayout();
this.groupBox19.SuspendLayout();
this.groupBox20.SuspendLayout();
this.groupBox21.SuspendLayout();
this.groupBox22.SuspendLayout();
this.groupBox23.SuspendLayout();
this.groupBox24.SuspendLayout();
this.groupBox25.SuspendLayout();
this.groupBox26.SuspendLayout();
this.groupBox27.SuspendLayout();
this.groupBox28.SuspendLayout();
this.groupBox31.SuspendLayout();
this.groupBox32.SuspendLayout();
this.groupBox33.SuspendLayout();
this.groupBox34.SuspendLayout();
this.tableLayoutPanel4.SuspendLayout();
this.groupBox30.SuspendLayout();
this.groupBox29.SuspendLayout();
this.groupBox35.SuspendLayout();
this.SuspendLayout();
//
// timer1
@ -278,14 +243,14 @@ namespace Rs.MotionPlat
this.dgv_errinfo.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgv_errinfo.BackgroundColor = System.Drawing.SystemColors.ActiveCaptionText;
this.dgv_errinfo.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.Red;
dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgv_errinfo.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.Red;
dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle3.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgv_errinfo.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3;
this.dgv_errinfo.ColumnHeadersHeight = 30;
this.dgv_errinfo.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.dataGridViewTextBoxColumn1,
@ -363,8 +328,8 @@ namespace Rs.MotionPlat
// Time
//
this.Time.DataPropertyName = "Time";
dataGridViewCellStyle2.BackColor = System.Drawing.Color.Red;
this.Time.DefaultCellStyle = dataGridViewCellStyle2;
dataGridViewCellStyle4.BackColor = System.Drawing.Color.Red;
this.Time.DefaultCellStyle = dataGridViewCellStyle4;
this.Time.FillWeight = 25F;
this.Time.HeaderText = "Time";
this.Time.MinimumWidth = 6;
@ -760,6 +725,7 @@ namespace Rs.MotionPlat
this.cboxMtcp.TabIndex = 0;
this.cboxMtcp.Text = "MTCP";
this.cboxMtcp.UseVisualStyleBackColor = false;
this.cboxMtcp.Click += new System.EventHandler(this.cboxMtcp_Click);
//
// panel9
//
@ -782,6 +748,7 @@ namespace Rs.MotionPlat
this.cboxNoise.TabIndex = 0;
this.cboxNoise.Text = "Noise";
this.cboxNoise.UseVisualStyleBackColor = false;
this.cboxNoise.Click += new System.EventHandler(this.cboxNoise_Click);
//
// panel10
//
@ -821,6 +788,7 @@ namespace Rs.MotionPlat
this.txtConfig.Name = "txtConfig";
this.txtConfig.Size = new System.Drawing.Size(113, 21);
this.txtConfig.TabIndex = 0;
this.txtConfig.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp);
//
// panel12
//
@ -840,6 +808,7 @@ namespace Rs.MotionPlat
this.txtSubLotName.Name = "txtSubLotName";
this.txtSubLotName.Size = new System.Drawing.Size(113, 21);
this.txtSubLotName.TabIndex = 0;
this.txtSubLotName.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp);
//
// panel13
//
@ -859,6 +828,7 @@ namespace Rs.MotionPlat
this.txtSiteID.Name = "txtSiteID";
this.txtSiteID.Size = new System.Drawing.Size(113, 21);
this.txtSiteID.TabIndex = 0;
this.txtSiteID.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp);
//
// panel14
//
@ -878,6 +848,7 @@ namespace Rs.MotionPlat
this.txtProjectID.Name = "txtProjectID";
this.txtProjectID.Size = new System.Drawing.Size(113, 21);
this.txtProjectID.TabIndex = 0;
this.txtProjectID.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtSysParam_KeyUp);
//
// panel15
//
@ -1354,7 +1325,6 @@ namespace Rs.MotionPlat
this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Slot1";
//
// groupBox2
//
@ -1366,10 +1336,6 @@ namespace Rs.MotionPlat
this.groupBox2.TabIndex = 0;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Slot2";
//
// hwin_turnoverSlot2
//
//
// groupBox3
//
@ -1381,7 +1347,6 @@ namespace Rs.MotionPlat
this.groupBox3.TabIndex = 0;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Slot3";
//
// groupBox4
//
@ -1405,9 +1370,6 @@ namespace Rs.MotionPlat
this.groupBox5.TabStop = false;
this.groupBox5.Text = "Slot5";
//
// hwin_turnoverSlot5
//
//
// groupBox6
//
this.groupBox6.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1419,9 +1381,6 @@ namespace Rs.MotionPlat
this.groupBox6.TabStop = false;
this.groupBox6.Text = "Slot6";
//
// hwin_turnoverSlot6
//
//
// groupBox7
//
this.groupBox7.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1433,9 +1392,6 @@ namespace Rs.MotionPlat
this.groupBox7.TabStop = false;
this.groupBox7.Text = "Slot7";
//
// hwin_turnoverSlot7
//
//
// groupBox8
//
this.groupBox8.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1447,9 +1403,6 @@ namespace Rs.MotionPlat
this.groupBox8.TabStop = false;
this.groupBox8.Text = "Slot9";
//
// hwin_turnoverSlot9
//
//
// groupBox9
//
this.groupBox9.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1461,9 +1414,6 @@ namespace Rs.MotionPlat
this.groupBox9.TabStop = false;
this.groupBox9.Text = "Slot10";
//
// hwin_turnoverSlot10
//
//
// groupBox10
//
this.groupBox10.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1475,9 +1425,6 @@ namespace Rs.MotionPlat
this.groupBox10.TabStop = false;
this.groupBox10.Text = "Slot11";
//
// hwin_turnoverSlot11
//
//
// groupBox11
//
this.groupBox11.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1489,9 +1436,6 @@ namespace Rs.MotionPlat
this.groupBox11.TabStop = false;
this.groupBox11.Text = "Slot12";
//
// hwin_turnoverSlot12
//
//
// groupBox12
//
this.groupBox12.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1503,9 +1447,6 @@ namespace Rs.MotionPlat
this.groupBox12.TabStop = false;
this.groupBox12.Text = "Slot13";
//
// hwin_turnoverSlot13
//
//
// groupBox13
//
this.groupBox13.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1517,9 +1458,6 @@ namespace Rs.MotionPlat
this.groupBox13.TabStop = false;
this.groupBox13.Text = "Slot14";
//
// hwin_turnoverSlot14
//
//
// groupBox14
//
this.groupBox14.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1531,9 +1469,6 @@ namespace Rs.MotionPlat
this.groupBox14.TabStop = false;
this.groupBox14.Text = "Slot15";
//
// hwin_turnoverSlot15
//
//
// groupBox15
//
this.groupBox15.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1545,9 +1480,6 @@ namespace Rs.MotionPlat
this.groupBox15.TabStop = false;
this.groupBox15.Text = "Slot17";
//
// hwin_turnoverSlot17
//
//
// groupBox16
//
this.groupBox16.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1559,9 +1491,6 @@ namespace Rs.MotionPlat
this.groupBox16.TabStop = false;
this.groupBox16.Text = "Slot18";
//
// hwin_turnoverSlot18
//
//
// groupBox17
//
this.groupBox17.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1573,9 +1502,6 @@ namespace Rs.MotionPlat
this.groupBox17.TabStop = false;
this.groupBox17.Text = "Slot19";
//
// hwin_turnoverSlot19
//
//
// groupBox18
//
this.groupBox18.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1587,9 +1513,6 @@ namespace Rs.MotionPlat
this.groupBox18.TabStop = false;
this.groupBox18.Text = "Slot20";
//
// hwin_turnoverSlot20
//
//
// groupBox19
//
this.groupBox19.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1601,9 +1524,6 @@ namespace Rs.MotionPlat
this.groupBox19.TabStop = false;
this.groupBox19.Text = "Slot21";
//
// hwin_turnoverSlot21
//
//
// groupBox20
//
this.groupBox20.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1615,9 +1535,6 @@ namespace Rs.MotionPlat
this.groupBox20.TabStop = false;
this.groupBox20.Text = "Slot22";
//
// hwin_turnoverSlot22
//
//
// groupBox21
//
this.groupBox21.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1629,9 +1546,6 @@ namespace Rs.MotionPlat
this.groupBox21.TabStop = false;
this.groupBox21.Text = "Slot23";
//
// hwin_turnoverSlot23
//
//
// groupBox22
//
this.groupBox22.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1643,9 +1557,6 @@ namespace Rs.MotionPlat
this.groupBox22.TabStop = false;
this.groupBox22.Text = "Slot25";
//
// hwin_turnoverSlot25
//
//
// groupBox23
//
this.groupBox23.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1657,9 +1568,6 @@ namespace Rs.MotionPlat
this.groupBox23.TabStop = false;
this.groupBox23.Text = "Slot26";
//
// hwin_turnoverSlot26
//
//
// groupBox24
//
this.groupBox24.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1671,9 +1579,6 @@ namespace Rs.MotionPlat
this.groupBox24.TabStop = false;
this.groupBox24.Text = "Slot27";
//
// hwin_turnoverSlot27
//
//
// groupBox25
//
this.groupBox25.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1685,9 +1590,6 @@ namespace Rs.MotionPlat
this.groupBox25.TabStop = false;
this.groupBox25.Text = "Slot28";
//
// hwin_turnoverSlot28
//
//
// groupBox26
//
this.groupBox26.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1699,9 +1601,6 @@ namespace Rs.MotionPlat
this.groupBox26.TabStop = false;
this.groupBox26.Text = "Slot29";
//
// hwin_turnoverSlot29
//
//
// groupBox27
//
this.groupBox27.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1713,9 +1612,6 @@ namespace Rs.MotionPlat
this.groupBox27.TabStop = false;
this.groupBox27.Text = "Slot30";
//
// hwin_turnoverSlot30
//
//
// groupBox28
//
this.groupBox28.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1727,9 +1623,6 @@ namespace Rs.MotionPlat
this.groupBox28.TabStop = false;
this.groupBox28.Text = "Slot31";
//
// hwin_turnoverSlot31
//
//
// groupBox31
//
this.groupBox31.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1741,9 +1634,6 @@ namespace Rs.MotionPlat
this.groupBox31.TabStop = false;
this.groupBox31.Text = "Slot8";
//
// hwin_turnoverSlot8
//
//
// groupBox32
//
this.groupBox32.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1755,9 +1645,6 @@ namespace Rs.MotionPlat
this.groupBox32.TabStop = false;
this.groupBox32.Text = "Slot16";
//
// hwin_turnoverSlot16
//
//
// groupBox33
//
this.groupBox33.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1769,9 +1656,6 @@ namespace Rs.MotionPlat
this.groupBox33.TabStop = false;
this.groupBox33.Text = "Slot24";
//
// hwin_turnoverSlot24
//
//
// groupBox34
//
this.groupBox34.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1783,9 +1667,6 @@ namespace Rs.MotionPlat
this.groupBox34.TabStop = false;
this.groupBox34.Text = "Slot32";
//
// hwin_turnoverSlot32
//
//
// tableLayoutPanel4
//
this.tableLayoutPanel4.ColumnCount = 8;
@ -1819,9 +1700,6 @@ namespace Rs.MotionPlat
this.groupBox30.TabStop = false;
this.groupBox30.Text = "TurnoverTray location";
//
// hWindow_Final3
//
//
// groupBox29
//
this.groupBox29.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1833,9 +1711,6 @@ namespace Rs.MotionPlat
this.groupBox29.TabStop = false;
this.groupBox29.Text = "TurnoverTray have or not";
//
// hwin_turnoverTrayHasOrNot
//
//
// groupBox35
//
this.groupBox35.Dock = System.Windows.Forms.DockStyle.Fill;
@ -1847,9 +1722,6 @@ namespace Rs.MotionPlat
this.groupBox35.TabStop = false;
this.groupBox35.Text = "Stock have or not";
//
// hWindow_Final4
//
//
// timer2
//
this.timer2.Tick += new System.EventHandler(this.timer2_Tick);
@ -1941,42 +1813,7 @@ namespace Rs.MotionPlat
this.panel21.ResumeLayout(false);
this.tabPage2.ResumeLayout(false);
this.tableLayoutPanel5.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.groupBox11.ResumeLayout(false);
this.groupBox12.ResumeLayout(false);
this.groupBox13.ResumeLayout(false);
this.groupBox14.ResumeLayout(false);
this.groupBox15.ResumeLayout(false);
this.groupBox16.ResumeLayout(false);
this.groupBox17.ResumeLayout(false);
this.groupBox18.ResumeLayout(false);
this.groupBox19.ResumeLayout(false);
this.groupBox20.ResumeLayout(false);
this.groupBox21.ResumeLayout(false);
this.groupBox22.ResumeLayout(false);
this.groupBox23.ResumeLayout(false);
this.groupBox24.ResumeLayout(false);
this.groupBox25.ResumeLayout(false);
this.groupBox26.ResumeLayout(false);
this.groupBox27.ResumeLayout(false);
this.groupBox28.ResumeLayout(false);
this.groupBox31.ResumeLayout(false);
this.groupBox32.ResumeLayout(false);
this.groupBox33.ResumeLayout(false);
this.groupBox34.ResumeLayout(false);
this.tableLayoutPanel4.ResumeLayout(false);
this.groupBox30.ResumeLayout(false);
this.groupBox29.ResumeLayout(false);
this.groupBox35.ResumeLayout(false);
this.ResumeLayout(false);
}

6
Rs.DeweyTester/FormMain.resx
Unescape Escape View File

@ -132,6 +132,12 @@
<metadata name="Content.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Time.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Content.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>107, 17</value>
</metadata>

1
Rs.DeweyTester/Home.cs
Unescape Escape View File

@ -210,6 +210,7 @@ namespace Rs.MotionPlat
form = new UserForm();
form.OnloginSuccessEvent += (uname) => {
btnPermission.ShowText += $"-({uname})";
btnMain.PerformClick();
};
form.StartPosition = FormStartPosition.CenterScreen;
form.Opacity = 1;

2
Rs.DeweyTester/UserForm.cs
Unescape Escape View File

@ -67,7 +67,7 @@ namespace Rs.MotionPlat
}
else if (username == "Vender")
{
if (userpwd == "rs@rs")
if (userpwd == "1")
{
OnloginSuccessEvent?.Invoke(username);
GlobalUser.UserLevel = EUserLevel.Vender;

Write Preview
Loading…
Cancel
Save