Commit bc895e37 刘韬

1

1 个父辈 ec715035
......@@ -48,8 +48,9 @@
<Reference Include="ConfigHelper">
<HintPath>..\..\ConfigHelper\ConfigHelper\bin\Debug\ConfigHelper.dll</HintPath>
</Reference>
<Reference Include="halcondotnet">
<HintPath>..\..\RC1271-DUOStore\dll\halcondotnet.dll</HintPath>
<Reference Include="halcondotnet, Version=12.0.0.0, Culture=neutral, PublicKeyToken=4973bed59ddbf2b8, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\TheMachine\bin\Debug\halcondotnet.dll</HintPath>
</Reference>
<Reference Include="HuichuanLibrary">
<HintPath>..\..\HuichuanLibrary\HuichuanLibrary\bin\Debug\HuichuanLibrary.dll</HintPath>
......
......@@ -151,7 +151,7 @@ namespace DeviceLibrary
LogUtil.error("加载HIK相机出错:" + ex.ToString());
}
}
string[] names = Camera._cam.Name;
string[] names = Camera._cam?.Name;
if (names != null)
......
......@@ -294,8 +294,8 @@ namespace DeviceLibrary
case MoveStep.Labeling14_1:
LabelingMoveInfo.NextMoveStep(MoveStep.Labeling15);
IOMove(IO_Type.Label_Vacuum, IO_VALUE.HIGH);
if (Setting_Init.Module_No.Val==Module_SO.SO20031)
IOMove(IO_Type.Label_PasteBlow, IO_VALUE.HIGH);
//if (Setting_Init.Module_No.Val==Module_SO.SO20031)
// IOMove(IO_Type.Label_PasteBlow, IO_VALUE.HIGH);
CylinderMove(LabelingMoveInfo, IO_Type.Labeling_Down, IO_Type.Labeling_Up, IO_VALUE.LOW);
//LabelingMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
......
......@@ -60,7 +60,7 @@ namespace DeviceLibrary
// return;
//}
LabelingMoveInfo.MoveParam.IsNg = true;
LabelingMoveInfo.MoveParam.NgMsg = "重置前物料正在贴标,NG处理";
LabelingMoveInfo.MoveParam.NgMsg = crc.GetString("Res0182.e64e34d1","重置前物料正在贴标,NG处理");
StoreMoveInfo.NextMoveStep(MoveStep.StoreIn03);
//if (!string.IsNullOrEmpty(Setting_Init.Runtime_FromPosid))
//{
......@@ -240,7 +240,7 @@ namespace DeviceLibrary
if (!boxTransport.IsComplateOrFree)
break;
Setting_Init.Runtime_Step = Runtime_StepE.None;
if (StoreMoveInfo.MoveParam.usedCount == 0 && !Setting_Init.Device_Disable_RFID_Check)
if (StoreMoveInfo.MoveParam.usedCount == 0 && !Setting_Init.Device_Disable_RFID_Check || Setting_Init.Module_No.Val == Module_SO.SO21637)
{
if (StoreMoveInfo.MoveParam.RFID.Length > 16)
StoreMoveInfo.MoveParam.RFID = StoreMoveInfo.MoveParam.RFID.Substring(0, 16);
......
......@@ -128,8 +128,15 @@ namespace DeviceLibrary
IsLoadOk = false;
msg += crc.GetString("Res0117","找不到库位配置文件:") + StoragePostionFile + "\n";
}
CodeManager.LoadConfig();
CodeManager.CameraScan(CodeManager.hikNameList);
try
{
CodeManager.LoadConfig();
CodeManager.CameraScan(CodeManager.hikNameList);
}
catch (Exception ex) {
IsLoadOk = false;
msg += ex.Message + "\n";
}
//mainMachine.ScanCode();
......
......@@ -29,7 +29,7 @@ namespace TheMachine
/// </summary>
private void InitializeComponent()
{
this.panel1 = new System.Windows.Forms.Panel();
this.panel1 = new System.Windows.Forms.FlowLayoutPanel();
this.axisMoveControl1 = new DeviceLibrary.AxisMoveControl();
this.configControl1 = new TheMachine.ConfigControl();
this.panel1.SuspendLayout();
......@@ -58,10 +58,10 @@ namespace TheMachine
// configControl1
//
this.configControl1.Config = null;
this.configControl1.Location = new System.Drawing.Point(568, 3);
this.configControl1.Location = new System.Drawing.Point(569, 4);
this.configControl1.Margin = new System.Windows.Forms.Padding(4);
this.configControl1.Name = "configControl1";
this.configControl1.Size = new System.Drawing.Size(647, 627);
this.configControl1.Size = new System.Drawing.Size(647, 353);
this.configControl1.TabIndex = 1;
this.configControl1.Tag = "not";
//
......@@ -83,6 +83,6 @@ namespace TheMachine
private DeviceLibrary.AxisMoveControl axisMoveControl1;
private ConfigControl configControl1;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.FlowLayoutPanel panel1;
}
}
......@@ -95,10 +95,10 @@ namespace TheMachine
emptycol.Width = 0;
ColumnHeader msgcol = new ColumnHeader();
msgcol.Text = crc.GetString("Res0001","信息");
msgcol.Width = 530;
msgcol.Width = 800;
ColumnHeader timecol = new ColumnHeader();
timecol.Text = crc.GetString("Res0002","时间");
timecol.Width = 150;
timecol.Width = 80;
listView1.Columns.Add(emptycol);
listView1.Columns.Add(timecol);
listView1.Columns.Add(msgcol);
......@@ -420,7 +420,7 @@ namespace TheMachine
if (string.IsNullOrEmpty(msg.msgtxt) || msg.datetime==null)
continue;
ListViewItem lvi = new ListViewItem(new string[] { "", msg.datetime.ToString(), msg.msgtxt });
ListViewItem lvi = new ListViewItem(new string[] { "", msg.datetime.ToString("HH:mm:ss"), msg.msgtxt });
if (msg.msgLevel == MsgLevel.info)
lvi.ForeColor = Color.DarkGreen;
else
......
......@@ -51,13 +51,13 @@ namespace TheMachine
this.cylinderButton3 = new TheMachine.CylinderButton();
this.cylinderButton14 = new TheMachine.CylinderButton();
this.cylinderButton4 = new TheMachine.CylinderButton();
this.cylinderButton9 = new TheMachine.CylinderButton();
this.cylinderButton16 = new TheMachine.CylinderButton();
this.cylinderButton7 = new TheMachine.CylinderButton();
this.cylinderButton15 = new TheMachine.CylinderButton();
this.cylinderButton13 = new TheMachine.CylinderButton();
this.cylinderButton11 = new TheMachine.CylinderButton();
this.ioControl1 = new TheMachine.IOControl();
this.cylinderButton9 = new TheMachine.CylinderButton();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
......@@ -370,6 +370,20 @@ namespace TheMachine
this.cylinderButton4.Text = "Entry_Drawer_Lock";
this.cylinderButton4.UseVisualStyleBackColor = false;
//
// cylinderButton9
//
this.cylinderButton9.BackColor = System.Drawing.Color.White;
this.cylinderButton9.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton9.IO_HIGH = "Label_PasteBlow";
this.cylinderButton9.IO_LOW = "";
this.cylinderButton9.Location = new System.Drawing.Point(739, 474);
this.cylinderButton9.Name = "cylinderButton9";
this.cylinderButton9.Size = new System.Drawing.Size(191, 35);
this.cylinderButton9.TabIndex = 1;
this.cylinderButton9.Tag = "not";
this.cylinderButton9.Text = "Label_PasteBlow";
this.cylinderButton9.UseVisualStyleBackColor = false;
//
// cylinderButton16
//
this.cylinderButton16.BackColor = System.Drawing.Color.White;
......@@ -444,27 +458,14 @@ namespace TheMachine
//
this.ioControl1.BackColor = System.Drawing.Color.White;
this.ioControl1.Config = null;
this.ioControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ioControl1.Location = new System.Drawing.Point(0, 0);
this.ioControl1.Name = "ioControl1";
this.ioControl1.Size = new System.Drawing.Size(975, 878);
this.ioControl1.Size = new System.Drawing.Size(975, 881);
this.ioControl1.TabIndex = 0;
this.ioControl1.Tag = "not";
this.ioControl1.Load += new System.EventHandler(this.ioControl1_Load);
//
// cylinderButton9
//
this.cylinderButton9.BackColor = System.Drawing.Color.White;
this.cylinderButton9.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton9.IO_HIGH = "Label_PasteBlow";
this.cylinderButton9.IO_LOW = "";
this.cylinderButton9.Location = new System.Drawing.Point(739, 474);
this.cylinderButton9.Name = "cylinderButton9";
this.cylinderButton9.Size = new System.Drawing.Size(191, 35);
this.cylinderButton9.TabIndex = 1;
this.cylinderButton9.Tag = "not";
this.cylinderButton9.Text = "Label_PasteBlow";
this.cylinderButton9.UseVisualStyleBackColor = false;
//
// IOControls
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
......
......@@ -117,4 +117,94 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="btn_FlipEquip.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="panel1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button10.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button9.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button8.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button4.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button7.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button6.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button5.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button3.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="button2.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton5.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton8.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton6.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton10.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton2.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton12.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton3.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton14.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton4.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton9.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton16.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton7.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton15.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton13.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cylinderButton11.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ioControl1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>
\ No newline at end of file
......@@ -41,9 +41,11 @@ namespace TheMachine
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.txtDOIndex = new System.Windows.Forms.TextBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.flp = new System.Windows.Forms.FlowLayoutPanel();
this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout();
this.groupBox1.SuspendLayout();
this.flp.SuspendLayout();
this.SuspendLayout();
//
// tableLayoutPanel1
......@@ -59,7 +61,7 @@ namespace TheMachine
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(244, 340);
this.tableLayoutPanel1.Size = new System.Drawing.Size(244, 542);
this.tableLayoutPanel1.TabIndex = 102;
this.tableLayoutPanel1.Tag = "not";
//
......@@ -76,18 +78,16 @@ namespace TheMachine
this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(244, 340);
this.tableLayoutPanel2.Size = new System.Drawing.Size(264, 542);
this.tableLayoutPanel2.TabIndex = 103;
this.tableLayoutPanel2.Tag = "not";
//
// groupBox4
//
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(262, 3);
this.groupBox4.Location = new System.Drawing.Point(264, 3);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(255, 360);
this.groupBox4.Size = new System.Drawing.Size(275, 562);
this.groupBox4.TabIndex = 110;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表";
......@@ -171,12 +171,10 @@ namespace TheMachine
//
// groupBox3
//
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(3, 3);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(255, 360);
this.groupBox3.Size = new System.Drawing.Size(255, 562);
this.groupBox3.TabIndex = 109;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表";
......@@ -194,8 +192,6 @@ namespace TheMachine
//
// groupBox1
//
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox1.Controls.Add(this.btnOpenDo);
this.groupBox1.Controls.Add(this.btnCloseDO);
this.groupBox1.Controls.Add(this.txtDOIndex);
......@@ -204,26 +200,36 @@ namespace TheMachine
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.cmbWriteIO);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(521, 3);
this.groupBox1.Location = new System.Drawing.Point(545, 3);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(361, 360);
this.groupBox1.Size = new System.Drawing.Size(311, 562);
this.groupBox1.TabIndex = 111;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入";
//
// flp
//
this.flp.Controls.Add(this.groupBox3);
this.flp.Controls.Add(this.groupBox4);
this.flp.Controls.Add(this.groupBox1);
this.flp.Dock = System.Windows.Forms.DockStyle.Fill;
this.flp.Location = new System.Drawing.Point(0, 0);
this.flp.Name = "flp";
this.flp.Size = new System.Drawing.Size(931, 568);
this.flp.TabIndex = 112;
//
// IOControl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.Controls.Add(this.groupBox4);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.flp);
this.Name = "IOControl";
this.Size = new System.Drawing.Size(911, 366);
this.Size = new System.Drawing.Size(931, 568);
this.Load += new System.EventHandler(this.IOControl_Load);
this.groupBox4.ResumeLayout(false);
this.groupBox3.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.flp.ResumeLayout(false);
this.ResumeLayout(false);
}
......@@ -242,5 +248,6 @@ namespace TheMachine
private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.TextBox txtDOIndex;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.FlowLayoutPanel flp;
}
}
......@@ -71,8 +71,8 @@ namespace TheMachine
//
// btnSavePos
//
this.btnSavePos.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnSavePos.Location = new System.Drawing.Point(424, 311);
this.btnSavePos.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnSavePos.Location = new System.Drawing.Point(4, 307);
this.btnSavePos.Margin = new System.Windows.Forms.Padding(4);
this.btnSavePos.Name = "btnSavePos";
this.btnSavePos.Size = new System.Drawing.Size(170, 31);
......
......@@ -31,6 +31,7 @@ namespace TheMachine
{
this.components = new System.ComponentModel.Container();
this.groupInout = new System.Windows.Forms.GroupBox();
this.btn_autoinout = new System.Windows.Forms.Button();
this.cb_inoutdebugmode = new System.Windows.Forms.CheckBox();
this.btnInStore = new System.Windows.Forms.Button();
this.btnOutStore = new System.Windows.Forms.Button();
......@@ -40,7 +41,6 @@ namespace TheMachine
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.label_verify = new System.Windows.Forms.Label();
this.storePosControl1 = new TheMachine.StorePosControl();
this.btn_autoinout = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.groupInout.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
......@@ -59,6 +59,20 @@ namespace TheMachine
this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作";
//
// btn_autoinout
//
this.btn_autoinout.BackColor = System.Drawing.SystemColors.Control;
this.btn_autoinout.Enabled = false;
this.btn_autoinout.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_autoinout.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btn_autoinout.Location = new System.Drawing.Point(6, 162);
this.btn_autoinout.Name = "btn_autoinout";
this.btn_autoinout.Size = new System.Drawing.Size(173, 32);
this.btn_autoinout.TabIndex = 104;
this.btn_autoinout.Text = "自动库位测试";
this.btn_autoinout.UseVisualStyleBackColor = false;
this.btn_autoinout.Click += new System.EventHandler(this.btn_autoinout_Click);
//
// cb_inoutdebugmode
//
this.cb_inoutdebugmode.AutoSize = true;
......@@ -163,30 +177,16 @@ namespace TheMachine
this.storePosControl1.Location = new System.Drawing.Point(266, 315);
this.storePosControl1.Margin = new System.Windows.Forms.Padding(4);
this.storePosControl1.Name = "storePosControl1";
this.storePosControl1.Size = new System.Drawing.Size(711, 210);
this.storePosControl1.Size = new System.Drawing.Size(693, 210);
this.storePosControl1.TabIndex = 227;
this.storePosControl1.Tag = "not";
//
// btn_autoinout
//
this.btn_autoinout.BackColor = System.Drawing.SystemColors.Control;
this.btn_autoinout.Enabled = false;
this.btn_autoinout.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_autoinout.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btn_autoinout.Location = new System.Drawing.Point(6, 162);
this.btn_autoinout.Name = "btn_autoinout";
this.btn_autoinout.Size = new System.Drawing.Size(173, 32);
this.btn_autoinout.TabIndex = 104;
this.btn_autoinout.Text = "自动库位测试";
this.btn_autoinout.UseVisualStyleBackColor = false;
this.btn_autoinout.Click += new System.EventHandler(this.btn_autoinout_Click);
//
// button1
//
this.button1.BackColor = System.Drawing.SystemColors.Control;
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button1.Location = new System.Drawing.Point(266, 488);
this.button1.Location = new System.Drawing.Point(469, 488);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(173, 32);
this.button1.TabIndex = 105;
......
......@@ -86,7 +86,7 @@ namespace TheMachine
//
// TestALL
//
this.TestALL.Location = new System.Drawing.Point(741, 13);
this.TestALL.Location = new System.Drawing.Point(3, 529);
this.TestALL.Name = "TestALL";
this.TestALL.Size = new System.Drawing.Size(94, 35);
this.TestALL.TabIndex = 1;
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!