Compare commits

...

2 Commits

Author SHA1 Message Date
lhiven ded2f3bc37 1、增加安全门禁屏蔽功能只有供应商有权限
2、增加不管门禁是否被禁用,主界面实时显示门禁状态。当门打开时显示红色,当门关闭时显示绿色
4 weeks ago
lhiven b075d4b6a9 空跑时增加获取拍照数据 4 weeks ago

@ -54,7 +54,7 @@ namespace Rs.MotionPlat.Commom
BuzzerManager.Instance.On();
LightManger.Instance.SetStatus(ELightStatus.Red);
}
Ops.Stop();
string logInfo = $"{alarmInfo.CN}";
LogHelper.Debug($"ShowDialog({logInfo},{buttons}, {warning})");
// LogHelper.Debug(logInfo);

@ -138,7 +138,7 @@ namespace Rs.MotionPlat.Flow
{
while (run)
{
if (stop)
if (stop || !SafeDoorCheck.Check())
{
Thread.Sleep(10);
continue;

@ -123,6 +123,7 @@ namespace Rs.MotionPlat.Flow.SubFlow
//AxisControl.LoadY2.ComparePulse(1, false);//开始拍照
if (GlobalVar.RunSpace)
{
vr = VisionHelper.Grab(EVisionScene.FixtureDumpProduct, $"M{curFixture.Index};");
flowStep = EFixturePlaceFlowStep.;
}
else

@ -144,6 +144,21 @@ namespace Rs.MotionPlat
btnLight.BackColor = Color.FromArgb(56, 56, 56);
}
if (!Ops.IsOn("门禁"))
{
if(btnDoorStatus.BackColor!=Color.Red)
{
btnDoorStatus.BackColor = Color.Red;
}
}
else
{
if (btnDoorStatus.BackColor != Color.Green)
{
btnDoorStatus.BackColor = Color.Green;
}
}
//获取运行信息
while (MessageQueue.Instance.HaveMessage())
{

@ -32,7 +32,7 @@ namespace Rs.MotionPlat
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.panel1 = new System.Windows.Forms.Panel();
this.groupBox37 = new System.Windows.Forms.GroupBox();
@ -156,6 +156,7 @@ namespace Rs.MotionPlat
this.timertc6 = new System.Windows.Forms.Timer(this.components);
this.timeruph = new System.Windows.Forms.Timer(this.components);
this.timerLight = new System.Windows.Forms.Timer(this.components);
this.btnDoorStatus = new System.Windows.Forms.Button();
this.panel1.SuspendLayout();
this.groupBox37.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dgv_errinfo)).BeginInit();
@ -224,14 +225,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;
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.Color.Red;
dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dgv_errinfo.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
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;
this.dgv_errinfo.ColumnHeadersHeight = 30;
this.dgv_errinfo.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.dataGridViewTextBoxColumn1,
@ -265,6 +266,7 @@ namespace Rs.MotionPlat
//
// groupBox36
//
this.groupBox36.Controls.Add(this.btnDoorStatus);
this.groupBox36.Controls.Add(this.btnSelectProduct);
this.groupBox36.Controls.Add(this.btnUpCameraGrab);
this.groupBox36.Controls.Add(this.btnClearData);
@ -286,7 +288,7 @@ namespace Rs.MotionPlat
this.btnSelectProduct.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSelectProduct.FlatAppearance.BorderSize = 0;
this.btnSelectProduct.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSelectProduct.Location = new System.Drawing.Point(8, 193);
this.btnSelectProduct.Location = new System.Drawing.Point(8, 164);
this.btnSelectProduct.Name = "btnSelectProduct";
this.btnSelectProduct.Size = new System.Drawing.Size(129, 35);
this.btnSelectProduct.TabIndex = 0;
@ -300,7 +302,7 @@ namespace Rs.MotionPlat
this.btnUpCameraGrab.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnUpCameraGrab.FlatAppearance.BorderSize = 0;
this.btnUpCameraGrab.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpCameraGrab.Location = new System.Drawing.Point(162, 193);
this.btnUpCameraGrab.Location = new System.Drawing.Point(162, 164);
this.btnUpCameraGrab.Name = "btnUpCameraGrab";
this.btnUpCameraGrab.Size = new System.Drawing.Size(147, 35);
this.btnUpCameraGrab.TabIndex = 0;
@ -314,7 +316,7 @@ namespace Rs.MotionPlat
this.btnClearData.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnClearData.FlatAppearance.BorderSize = 0;
this.btnClearData.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearData.Location = new System.Drawing.Point(8, 106);
this.btnClearData.Location = new System.Drawing.Point(8, 92);
this.btnClearData.Name = "btnClearData";
this.btnClearData.Size = new System.Drawing.Size(129, 35);
this.btnClearData.TabIndex = 0;
@ -356,7 +358,7 @@ namespace Rs.MotionPlat
this.btnBuzzer.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnBuzzer.FlatAppearance.BorderSize = 0;
this.btnBuzzer.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBuzzer.Location = new System.Drawing.Point(162, 106);
this.btnBuzzer.Location = new System.Drawing.Point(162, 92);
this.btnBuzzer.Name = "btnBuzzer";
this.btnBuzzer.Size = new System.Drawing.Size(147, 35);
this.btnBuzzer.TabIndex = 0;
@ -1794,6 +1796,20 @@ namespace Rs.MotionPlat
this.timerLight.Interval = 500;
this.timerLight.Tick += new System.EventHandler(this.timerLight_Tick);
//
// btnDoorStatus
//
this.btnDoorStatus.BackColor = System.Drawing.Color.Green;
this.btnDoorStatus.FlatAppearance.BorderSize = 0;
this.btnDoorStatus.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDoorStatus.Font = new System.Drawing.Font("宋体", 23F);
this.btnDoorStatus.ForeColor = System.Drawing.Color.White;
this.btnDoorStatus.Location = new System.Drawing.Point(8, 205);
this.btnDoorStatus.Name = "btnDoorStatus";
this.btnDoorStatus.Size = new System.Drawing.Size(301, 48);
this.btnDoorStatus.TabIndex = 1;
this.btnDoorStatus.Text = "Door";
this.btnDoorStatus.UseVisualStyleBackColor = false;
//
// FormMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@ -1966,5 +1982,6 @@ namespace Rs.MotionPlat
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
private System.Windows.Forms.Timer timerLight;
private System.Windows.Forms.Button btnDoorStatus;
}
}

@ -492,10 +492,10 @@ namespace Rs.MotionPlat.Commom
{
TargetPosition targetPos = new TargetPosition();
targetPos = FixtureManager.GetFixtureGrabPos(fixtureIndex);
MessageQueue.Instance.Insert($"治具拍照位:x:{targetPos.X},y:{targetPos.Y2}");
LogHelper.Debug($"治具{fixtureIndex}拍照位 X:{targetPos.X},Y2:{targetPos.Y2}");
targetPos.X += GetNozzleToCameraOffsetX(nozzleIndex);
targetPos.Y2 += GetNozzleToCameraOffsetY2(nozzleIndex);
MessageQueue.Instance.Insert($"吸嘴{nozzleIndex}到相机X:x-{GetNozzleToCameraOffsetX(nozzleIndex)},吸嘴{nozzleIndex}到相机Y2-{GetNozzleToCameraOffsetY2(nozzleIndex)}");
LogHelper.Debug($"吸嘴{nozzleIndex}到相机 X:{GetNozzleToCameraOffsetX(nozzleIndex)},Y2:{GetNozzleToCameraOffsetY2(nozzleIndex)}");
return targetPos;
}

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

@ -152,7 +152,6 @@
//
// groupBox8
//
resources.ApplyResources(this.groupBox8, "groupBox8");
this.groupBox8.Controls.Add(this.txtHightChannel);
this.groupBox8.Controls.Add(this.button1);
this.groupBox8.Controls.Add(this.cboxLanguage);
@ -164,6 +163,7 @@
this.groupBox8.Controls.Add(this.cboxEnableStock);
this.groupBox8.Controls.Add(this.cboxRunSpace);
this.groupBox8.Controls.Add(this.label14);
resources.ApplyResources(this.groupBox8, "groupBox8");
this.groupBox8.ForeColor = System.Drawing.Color.White;
this.groupBox8.Name = "groupBox8";
this.groupBox8.TabStop = false;
@ -176,9 +176,9 @@
//
// button1
//
resources.ApplyResources(this.button1, "button1");
this.button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56)))));
this.button1.FlatAppearance.BorderColor = System.Drawing.Color.White;
resources.ApplyResources(this.button1, "button1");
this.button1.ForeColor = System.Drawing.Color.White;
this.button1.Name = "button1";
this.button1.UseVisualStyleBackColor = false;
@ -186,11 +186,11 @@
//
// cboxLanguage
//
resources.ApplyResources(this.cboxLanguage, "cboxLanguage");
this.cboxLanguage.FormattingEnabled = true;
this.cboxLanguage.Items.AddRange(new object[] {
resources.GetString("cboxLanguage.Items"),
resources.GetString("cboxLanguage.Items1")});
resources.ApplyResources(this.cboxLanguage, "cboxLanguage");
this.cboxLanguage.Name = "cboxLanguage";
//
// label2
@ -248,7 +248,6 @@
//
// groupBox3
//
resources.ApplyResources(this.groupBox3, "groupBox3");
this.groupBox3.Controls.Add(this.btnSaveRelCategory);
this.groupBox3.Controls.Add(this.txtSiteID);
this.groupBox3.Controls.Add(this.comBoxCp);
@ -268,15 +267,16 @@
this.groupBox3.Controls.Add(this.label17);
this.groupBox3.Controls.Add(this.txtMachineID);
this.groupBox3.Controls.Add(this.label5);
resources.ApplyResources(this.groupBox3, "groupBox3");
this.groupBox3.ForeColor = System.Drawing.Color.White;
this.groupBox3.Name = "groupBox3";
this.groupBox3.TabStop = false;
//
// btnSaveRelCategory
//
resources.ApplyResources(this.btnSaveRelCategory, "btnSaveRelCategory");
this.btnSaveRelCategory.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56)))));
this.btnSaveRelCategory.FlatAppearance.BorderColor = System.Drawing.Color.White;
resources.ApplyResources(this.btnSaveRelCategory, "btnSaveRelCategory");
this.btnSaveRelCategory.ForeColor = System.Drawing.Color.White;
this.btnSaveRelCategory.Name = "btnSaveRelCategory";
this.btnSaveRelCategory.UseVisualStyleBackColor = false;
@ -290,47 +290,47 @@
//
// comBoxCp
//
resources.ApplyResources(this.comBoxCp, "comBoxCp");
this.comBoxCp.FormattingEnabled = true;
this.comBoxCp.Items.AddRange(new object[] {
resources.GetString("comBoxCp.Items"),
resources.GetString("comBoxCp.Items1"),
resources.GetString("comBoxCp.Items2")});
resources.ApplyResources(this.comBoxCp, "comBoxCp");
this.comBoxCp.Name = "comBoxCp";
this.comBoxCp.SelectedIndexChanged += new System.EventHandler(this.comBoxCp_SelectedIndexChanged);
//
// comBoxRelCategory
//
resources.ApplyResources(this.comBoxRelCategory, "comBoxRelCategory");
this.comBoxRelCategory.FormattingEnabled = true;
this.comBoxRelCategory.Items.AddRange(new object[] {
resources.GetString("comBoxRelCategory.Items"),
resources.GetString("comBoxRelCategory.Items1"),
resources.GetString("comBoxRelCategory.Items2")});
resources.ApplyResources(this.comBoxRelCategory, "comBoxRelCategory");
this.comBoxRelCategory.Name = "comBoxRelCategory";
this.comBoxRelCategory.SelectedIndexChanged += new System.EventHandler(this.comBoxRelCategory_SelectedIndexChanged);
//
// cboxHostType
//
resources.ApplyResources(this.cboxHostType, "cboxHostType");
this.cboxHostType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cboxHostType.FormattingEnabled = true;
this.cboxHostType.Items.AddRange(new object[] {
resources.GetString("cboxHostType.Items"),
resources.GetString("cboxHostType.Items1"),
resources.GetString("cboxHostType.Items2")});
resources.ApplyResources(this.cboxHostType, "cboxHostType");
this.cboxHostType.Name = "cboxHostType";
this.cboxHostType.SelectedIndexChanged += new System.EventHandler(this.cboxHostType_SelectedIndexChanged);
//
// cboxConfigName
//
resources.ApplyResources(this.cboxConfigName, "cboxConfigName");
this.cboxConfigName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cboxConfigName.FormattingEnabled = true;
this.cboxConfigName.Items.AddRange(new object[] {
resources.GetString("cboxConfigName.Items"),
resources.GetString("cboxConfigName.Items1"),
resources.GetString("cboxConfigName.Items2")});
resources.ApplyResources(this.cboxConfigName, "cboxConfigName");
this.cboxConfigName.Name = "cboxConfigName";
this.cboxConfigName.SelectedIndexChanged += new System.EventHandler(this.cboxConfigName_SelectedIndexChanged);
//
@ -405,7 +405,6 @@
//
// groupBox1
//
resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Controls.Add(this.cboxEnableCheckStickMaterial);
this.groupBox1.Controls.Add(this.txtUphRefreshCycle);
this.groupBox1.Controls.Add(this.cboxMsgShowEn);
@ -451,6 +450,7 @@
this.groupBox1.Controls.Add(this.lblTakeTrayFromNg2InputSpeed);
this.groupBox1.Controls.Add(this.lblWholeSpeed);
this.groupBox1.Controls.Add(this.label1);
resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.ForeColor = System.Drawing.Color.White;
this.groupBox1.Name = "groupBox1";
this.groupBox1.TabStop = false;
@ -458,8 +458,9 @@
// cboxEnableCheckStickMaterial
//
resources.ApplyResources(this.cboxEnableCheckStickMaterial, "cboxEnableCheckStickMaterial");
this.cboxEnableCheckStickMaterial.BackColor = System.Drawing.Color.Transparent;
this.cboxEnableCheckStickMaterial.Name = "cboxEnableCheckStickMaterial";
this.cboxEnableCheckStickMaterial.UseVisualStyleBackColor = true;
this.cboxEnableCheckStickMaterial.UseVisualStyleBackColor = false;
this.cboxEnableCheckStickMaterial.CheckedChanged += new System.EventHandler(this.cbox_CheckedChanged);
//
// txtUphRefreshCycle
@ -533,14 +534,15 @@
// label7
//
resources.ApplyResources(this.label7, "label7");
this.label7.BackColor = System.Drawing.Color.Transparent;
this.label7.Name = "label7";
//
// panelEx1
//
resources.ApplyResources(this.panelEx1, "panelEx1");
this.panelEx1.Controls.Add(this.btnSaveSpeedParam);
this.panelEx1.Controls.Add(this.cboxCurRecipe);
this.panelEx1.Controls.Add(this.label4);
resources.ApplyResources(this.panelEx1, "panelEx1");
this.panelEx1.Name = "panelEx1";
//
// btnSaveSpeedParam
@ -555,10 +557,10 @@
//
// cboxCurRecipe
//
resources.ApplyResources(this.cboxCurRecipe, "cboxCurRecipe");
this.cboxCurRecipe.FormattingEnabled = true;
this.cboxCurRecipe.Items.AddRange(new object[] {
resources.GetString("cboxCurRecipe.Items")});
resources.ApplyResources(this.cboxCurRecipe, "cboxCurRecipe");
this.cboxCurRecipe.Name = "cboxCurRecipe";
//
// label4
@ -590,99 +592,113 @@
// cboxEnableTC6
//
resources.ApplyResources(this.cboxEnableTC6, "cboxEnableTC6");
this.cboxEnableTC6.BackColor = System.Drawing.Color.Transparent;
this.cboxEnableTC6.Name = "cboxEnableTC6";
this.cboxEnableTC6.UseVisualStyleBackColor = true;
this.cboxEnableTC6.UseVisualStyleBackColor = false;
this.cboxEnableTC6.CheckedChanged += new System.EventHandler(this.cboxFixture_CheckedChanged);
//
// cboxEnableTC4
//
resources.ApplyResources(this.cboxEnableTC4, "cboxEnableTC4");
this.cboxEnableTC4.BackColor = System.Drawing.Color.Transparent;
this.cboxEnableTC4.Name = "cboxEnableTC4";
this.cboxEnableTC4.UseVisualStyleBackColor = true;
this.cboxEnableTC4.UseVisualStyleBackColor = false;
this.cboxEnableTC4.CheckedChanged += new System.EventHandler(this.cboxFixture_CheckedChanged);
//
// cboxEnableTC5
//
resources.ApplyResources(this.cboxEnableTC5, "cboxEnableTC5");
this.cboxEnableTC5.BackColor = System.Drawing.Color.Transparent;
this.cboxEnableTC5.Name = "cboxEnableTC5";
this.cboxEnableTC5.UseVisualStyleBackColor = true;
this.cboxEnableTC5.UseVisualStyleBackColor = false;
this.cboxEnableTC5.CheckedChanged += new System.EventHandler(this.cboxFixture_CheckedChanged);
//
// cboxEnableTC3
//
resources.ApplyResources(this.cboxEnableTC3, "cboxEnableTC3");
this.cboxEnableTC3.BackColor = System.Drawing.Color.Transparent;
this.cboxEnableTC3.Name = "cboxEnableTC3";
this.cboxEnableTC3.UseVisualStyleBackColor = true;
this.cboxEnableTC3.UseVisualStyleBackColor = false;
this.cboxEnableTC3.CheckedChanged += new System.EventHandler(this.cboxFixture_CheckedChanged);
//
// cboxEnableTC2
//
resources.ApplyResources(this.cboxEnableTC2, "cboxEnableTC2");
this.cboxEnableTC2.BackColor = System.Drawing.Color.Transparent;
this.cboxEnableTC2.Name = "cboxEnableTC2";
this.cboxEnableTC2.UseVisualStyleBackColor = true;
this.cboxEnableTC2.UseVisualStyleBackColor = false;
this.cboxEnableTC2.CheckedChanged += new System.EventHandler(this.cboxFixture_CheckedChanged);
//
// cboxEnableTC1
//
resources.ApplyResources(this.cboxEnableTC1, "cboxEnableTC1");
this.cboxEnableTC1.BackColor = System.Drawing.Color.Transparent;
this.cboxEnableTC1.Name = "cboxEnableTC1";
this.cboxEnableTC1.UseVisualStyleBackColor = true;
this.cboxEnableTC1.UseVisualStyleBackColor = false;
this.cboxEnableTC1.CheckedChanged += new System.EventHandler(this.cboxFixture_CheckedChanged);
//
// cboxEnableVirtualBarCode
//
resources.ApplyResources(this.cboxEnableVirtualBarCode, "cboxEnableVirtualBarCode");
this.cboxEnableVirtualBarCode.BackColor = System.Drawing.Color.Transparent;
this.cboxEnableVirtualBarCode.Name = "cboxEnableVirtualBarCode";
this.cboxEnableVirtualBarCode.UseVisualStyleBackColor = true;
this.cboxEnableVirtualBarCode.UseVisualStyleBackColor = false;
this.cboxEnableVirtualBarCode.CheckedChanged += new System.EventHandler(this.cbox_CheckedChanged);
//
// cboxEnableBeforePlaceTrayToOkGrab
//
resources.ApplyResources(this.cboxEnableBeforePlaceTrayToOkGrab, "cboxEnableBeforePlaceTrayToOkGrab");
this.cboxEnableBeforePlaceTrayToOkGrab.BackColor = System.Drawing.Color.Transparent;
this.cboxEnableBeforePlaceTrayToOkGrab.Name = "cboxEnableBeforePlaceTrayToOkGrab";
this.cboxEnableBeforePlaceTrayToOkGrab.UseVisualStyleBackColor = true;
this.cboxEnableBeforePlaceTrayToOkGrab.UseVisualStyleBackColor = false;
this.cboxEnableBeforePlaceTrayToOkGrab.CheckedChanged += new System.EventHandler(this.cbox_CheckedChanged);
//
// cboxEnableOkTrayCheckFull
//
resources.ApplyResources(this.cboxEnableOkTrayCheckFull, "cboxEnableOkTrayCheckFull");
this.cboxEnableOkTrayCheckFull.BackColor = System.Drawing.Color.Transparent;
this.cboxEnableOkTrayCheckFull.Name = "cboxEnableOkTrayCheckFull";
this.cboxEnableOkTrayCheckFull.UseVisualStyleBackColor = true;
this.cboxEnableOkTrayCheckFull.UseVisualStyleBackColor = false;
this.cboxEnableOkTrayCheckFull.CheckedChanged += new System.EventHandler(this.cbox_CheckedChanged);
//
// cboxEnableBeforePlaceProductGrab
//
resources.ApplyResources(this.cboxEnableBeforePlaceProductGrab, "cboxEnableBeforePlaceProductGrab");
this.cboxEnableBeforePlaceProductGrab.BackColor = System.Drawing.Color.Transparent;
this.cboxEnableBeforePlaceProductGrab.Name = "cboxEnableBeforePlaceProductGrab";
this.cboxEnableBeforePlaceProductGrab.UseVisualStyleBackColor = true;
this.cboxEnableBeforePlaceProductGrab.UseVisualStyleBackColor = false;
this.cboxEnableBeforePlaceProductGrab.CheckedChanged += new System.EventHandler(this.cbox_CheckedChanged);
//
// cboxScanFailToTest
//
resources.ApplyResources(this.cboxScanFailToTest, "cboxScanFailToTest");
this.cboxScanFailToTest.BackColor = System.Drawing.Color.Transparent;
this.cboxScanFailToTest.Name = "cboxScanFailToTest";
this.cboxScanFailToTest.UseVisualStyleBackColor = true;
this.cboxScanFailToTest.UseVisualStyleBackColor = false;
this.cboxScanFailToTest.CheckedChanged += new System.EventHandler(this.cbox_CheckedChanged);
//
// cboxDisableBuzzer
//
resources.ApplyResources(this.cboxDisableBuzzer, "cboxDisableBuzzer");
this.cboxDisableBuzzer.BackColor = System.Drawing.Color.Transparent;
this.cboxDisableBuzzer.Name = "cboxDisableBuzzer";
this.cboxDisableBuzzer.UseVisualStyleBackColor = true;
this.cboxDisableBuzzer.UseVisualStyleBackColor = false;
this.cboxDisableBuzzer.CheckedChanged += new System.EventHandler(this.cbox_CheckedChanged);
//
// cboxCheckVisionSwOpened
//
resources.ApplyResources(this.cboxCheckVisionSwOpened, "cboxCheckVisionSwOpened");
this.cboxCheckVisionSwOpened.BackColor = System.Drawing.Color.Transparent;
this.cboxCheckVisionSwOpened.Name = "cboxCheckVisionSwOpened";
this.cboxCheckVisionSwOpened.UseVisualStyleBackColor = true;
this.cboxCheckVisionSwOpened.UseVisualStyleBackColor = false;
this.cboxCheckVisionSwOpened.CheckedChanged += new System.EventHandler(this.cbox_CheckedChanged);
//
// cboxIsSimTest
//
resources.ApplyResources(this.cboxIsSimTest, "cboxIsSimTest");
this.cboxIsSimTest.BackColor = System.Drawing.Color.Transparent;
this.cboxIsSimTest.Name = "cboxIsSimTest";
this.cboxIsSimTest.UseVisualStyleBackColor = true;
this.cboxIsSimTest.UseVisualStyleBackColor = false;
this.cboxIsSimTest.CheckedChanged += new System.EventHandler(this.cbox_CheckedChanged);
//
// cboxPrintTC6Communicate
@ -730,8 +746,9 @@
// cboxDisableDoor
//
resources.ApplyResources(this.cboxDisableDoor, "cboxDisableDoor");
this.cboxDisableDoor.BackColor = System.Drawing.Color.Transparent;
this.cboxDisableDoor.Name = "cboxDisableDoor";
this.cboxDisableDoor.UseVisualStyleBackColor = true;
this.cboxDisableDoor.UseVisualStyleBackColor = false;
this.cboxDisableDoor.CheckedChanged += new System.EventHandler(this.cbox_CheckedChanged);
//
// tbarWholeSpeed
@ -777,7 +794,6 @@
//
// groupBox4
//
resources.ApplyResources(this.groupBox4, "groupBox4");
this.groupBox4.Controls.Add(this.dataGridView1);
this.groupBox4.Controls.Add(this.label6);
this.groupBox4.Controls.Add(this.panel1);
@ -787,13 +803,13 @@
this.groupBox4.Controls.Add(this.txtControlCenterPort);
this.groupBox4.Controls.Add(this.cboxEnableExceptionHandlingNozzle);
this.groupBox4.Controls.Add(this.cboxEnableScanBarCodeByDownCamera);
resources.ApplyResources(this.groupBox4, "groupBox4");
this.groupBox4.ForeColor = System.Drawing.Color.White;
this.groupBox4.Name = "groupBox4";
this.groupBox4.TabStop = false;
//
// dataGridView1
//
resources.ApplyResources(this.dataGridView1, "dataGridView1");
this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@ -802,6 +818,7 @@
this.,
this.,
this.});
resources.ApplyResources(this.dataGridView1, "dataGridView1");
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellEndEdit);
@ -849,9 +866,9 @@
//
// panel1
//
resources.ApplyResources(this.panel1, "panel1");
this.panel1.Controls.Add(this.radioButton4);
this.panel1.Controls.Add(this.radioButton3);
resources.ApplyResources(this.panel1, "panel1");
this.panel1.Name = "panel1";
//
// radioButton4
@ -872,9 +889,9 @@
//
// txtControlCenterIP
//
resources.ApplyResources(this.txtControlCenterIP, "txtControlCenterIP");
this.txtControlCenterIP.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16)))));
this.txtControlCenterIP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
resources.ApplyResources(this.txtControlCenterIP, "txtControlCenterIP");
this.txtControlCenterIP.ForeColor = System.Drawing.Color.White;
this.txtControlCenterIP.Name = "txtControlCenterIP";
//
@ -890,9 +907,9 @@
//
// txtControlCenterPort
//
resources.ApplyResources(this.txtControlCenterPort, "txtControlCenterPort");
this.txtControlCenterPort.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16)))));
this.txtControlCenterPort.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
resources.ApplyResources(this.txtControlCenterPort, "txtControlCenterPort");
this.txtControlCenterPort.ForeColor = System.Drawing.Color.White;
this.txtControlCenterPort.Name = "txtControlCenterPort";
//

@ -96,6 +96,7 @@ namespace Rs.MotionPlat.SysConfig
{
label14.Visible=txtHightChannel.Visible=cboxEnableStock.Visible = cboxRunSpace.Visible = cboxVirtualAxis.Visible = cboxEnableVirtuleBarCode.Visible = cboxInputTrayLoop.Visible = cboxCheckSafeEnable.Visible =true;
}
dataGridView1.AutoGenerateColumns = false;
BindMenu();
relCategorieList.Clear();
@ -116,6 +117,14 @@ namespace Rs.MotionPlat.SysConfig
comBoxRelCategory.SelectedItem = GlobalVar.RelCategory;
CheckPermission();
if (GlobalUser.IsVender())
{
cboxDisableDoor.Enabled = true;
}
else
{
cboxDisableDoor.Enabled = false;
}
}
private void BindMenu()

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save