Skip to content

李娜 / SO664-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 663ad2f6 由 LN
选项

更改rfiddll

1 个父辈 2795400b
内嵌 并排
正在显示 24 个修改的文件 包含 202 行增加 和 204 行删除
dll/RFID/Asa.RFID.HiStation.dll 0 → 100644
此文件类型无法预览
dll/RFID/Asa.RFID.IReadAll.dll 0 → 100644
此文件类型无法预览
dll/RFID/Asa.RFID.dll deleted 100644 → 0
此文件类型无法预览
dll/RFID/Asa.RFID.xml deleted 100644 → 0
<?xml version="1.0"?>
<doc>
<assembly>
<name>Asa.RFID</name>
</assembly>
<members>
<member name="T:Asa.RFID.ReadAll">
<summary>
读取所有RFID
</summary>
</member>
<member name="T:Asa.RFID.ReadAll.ReceivedEvent">
<summary>
接收数据包事件
</summary>
<param name="ip"></param>
<param name="id"></param>
</member>
<member name="E:Asa.RFID.ReadAll.Received">
<summary>
接收数据包
</summary>
</member>
<member name="T:Asa.RFID.ReadAll.ReceiveBufferEvent">
<summary>
接收网卡缓存事件
</summary>
<param name="ip"></param>
<param name="buffer"></param>
</member>
<member name="E:Asa.RFID.ReadAll.ReceiveBuffer">
<summary>
接收网卡缓存
</summary>
</member>
<member name="M:Asa.RFID.ReadAll.#ctor(System.String)">
<summary>
读取所有RFID
</summary>
<param name="logName">日志名称</param>
</member>
<member name="M:Asa.RFID.ReadAll.Start(System.Int32)">
<summary>
开启
</summary>
<param name="port">RFID设备的端口</param>
</member>
<member name="M:Asa.RFID.ReadAll.Stop">
<summary>
停止
</summary>
</member>
<member name="M:Asa.RFID.ReadAll.Read(System.String)">
<summary>
读取ID号
</summary>
<param name="ip"></param>
<returns></returns>
</member>
<member name="M:Asa.RFID.ReadAll.Clear(System.String)">
<summary>
清除缓存
</summary>
<param name="ip"></param>
</member>
</members>
</doc>
dll/RFID/Basic.dll deleted 100644 → 0
此文件类型无法预览
dll/RFID/HFReader9CSharp.dll deleted 100644 → 0
此文件类型无法预览
dll/RFID/ReadMe.txt deleted 100644 → 0
1.0.0.0 2019-11-19
1、钉盘上传
\ No newline at end of file
dll/RFID/log4net.dll 0 → 100644
此文件类型无法预览
source/AssemblyLineClient/AssemblyLineClient.csproj
......@@ -284,6 +284,9 @@
<Content Include="image\green1.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="image\line.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="image\red0.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
......
source/AssemblyLineClient/FrmBase.Designer.cs
......@@ -42,6 +42,7 @@
this.Name = "FrmBase";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "FrmBase";
this.Load += new System.EventHandler(this.FrmBase_Load);
this.ResumeLayout(false);
}
......
source/AssemblyLineClient/FrmBase.cs
......@@ -56,6 +56,10 @@ namespace OnlineStore.AssemblyLine
{
InitializeComponent();
}
private void FrmBase_Load(object sender, EventArgs e)
{
}
}
}
source/AssemblyLineClient/FrmBase.resx
......@@ -112,12 +112,12 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, internalKeyToken=b77a5c561934e089</value>
<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, internalKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, internalKeyToken=b03f5f7f11d50a3a" />
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAA8AMDAQAAEABABoBgAA9gAAACgoEAABAAQAyAQAAF4HAAAgIBAAAQAEAOgCAAAmDAAAGBgQAAEA
......
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
......@@ -111,7 +111,6 @@
this.chbMoveStop = new System.Windows.Forms.CheckBox();
this.lblName = new System.Windows.Forms.Label();
this.btnScan = new System.Windows.Forms.Button();
this.groupBox10 = new System.Windows.Forms.GroupBox();
this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout();
......@@ -127,7 +126,6 @@
this.groupBox9.SuspendLayout();
this.groupBox2.SuspendLayout();
this.panel1.SuspendLayout();
this.groupBox10.SuspendLayout();
this.SuspendLayout();
//
// timer1
......@@ -307,6 +305,7 @@
this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel2.AutoScroll = true;
this.tableLayoutPanel2.ColumnCount = 1;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 14);
......@@ -334,6 +333,7 @@
this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel1.AutoScroll = true;
this.tableLayoutPanel1.ColumnCount = 1;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14);
......@@ -669,7 +669,7 @@
//
this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(537, 13);
this.chbDebug.Location = new System.Drawing.Point(537, 12);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 247;
......@@ -697,7 +697,7 @@
this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblStoreStatus.ForeColor = System.Drawing.Color.Green;
this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblStoreStatus.Location = new System.Drawing.Point(865, 15);
this.lblStoreStatus.Location = new System.Drawing.Point(865, 14);
this.lblStoreStatus.Name = "lblStoreStatus";
this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
this.lblStoreStatus.TabIndex = 245;
......@@ -709,7 +709,7 @@
this.btnStart.BackColor = System.Drawing.Color.White;
this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStart.Location = new System.Drawing.Point(190, 5);
this.btnStart.Location = new System.Drawing.Point(190, 4);
this.btnStart.Name = "btnStart";
this.btnStart.Size = new System.Drawing.Size(110, 40);
this.btnStart.TabIndex = 86;
......@@ -722,7 +722,7 @@
this.btnStop.BackColor = System.Drawing.Color.White;
this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStop.Location = new System.Drawing.Point(305, 5);
this.btnStop.Location = new System.Drawing.Point(305, 4);
this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(110, 40);
this.btnStop.TabIndex = 87;
......@@ -738,10 +738,10 @@
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Location = new System.Drawing.Point(5, 78);
this.tabControl1.Location = new System.Drawing.Point(5, 60);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1270, 552);
this.tabControl1.Size = new System.Drawing.Size(1270, 566);
this.tabControl1.TabIndex = 257;
//
// tabPage3
......@@ -749,7 +749,7 @@
this.tabPage3.Controls.Add(this.groupBox6);
this.tabPage3.Location = new System.Drawing.Point(4, 26);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(1262, 522);
this.tabPage3.Size = new System.Drawing.Size(1262, 536);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "状态信息";
this.tabPage3.UseVisualStyleBackColor = true;
......@@ -768,7 +768,7 @@
this.groupBox6.Controls.Add(this.lblThisSta);
this.groupBox6.Location = new System.Drawing.Point(3, 3);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(1256, 554);
this.groupBox6.Size = new System.Drawing.Size(1256, 568);
this.groupBox6.TabIndex = 278;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "消息";
......@@ -851,7 +851,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(1262, 522);
this.tabPage1.Size = new System.Drawing.Size(1262, 536);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO列表 ";
this.tabPage1.UseVisualStyleBackColor = true;
......@@ -873,6 +873,7 @@
this.tableLayoutPanel3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel3.AutoScroll = true;
this.tableLayoutPanel3.ColumnCount = 1;
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel3.Location = new System.Drawing.Point(6, 14);
......@@ -920,7 +921,7 @@
this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(1262, 522);
this.tabPage2.Size = new System.Drawing.Size(1262, 536);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 伺服信息 ";
this.tabPage2.UseVisualStyleBackColor = true;
......@@ -1311,6 +1312,7 @@
//
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel1.Controls.Add(this.btnClose);
this.panel1.Controls.Add(this.chbBoxSendShelf);
this.panel1.Controls.Add(this.chbMoveStop);
......@@ -1320,9 +1322,9 @@
this.panel1.Controls.Add(this.lblStoreStatus);
this.panel1.Controls.Add(this.btnStart);
this.panel1.Controls.Add(this.btnStop);
this.panel1.Location = new System.Drawing.Point(5, 14);
this.panel1.Location = new System.Drawing.Point(5, 4);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1265, 47);
this.panel1.Size = new System.Drawing.Size(1270, 50);
this.panel1.TabIndex = 258;
//
// btnClose
......@@ -1330,11 +1332,11 @@
this.btnClose.BackColor = System.Drawing.Color.White;
this.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClose.Location = new System.Drawing.Point(1150, 3);
this.btnClose.Location = new System.Drawing.Point(1150, 4);
this.btnClose.Name = "btnClose";
this.btnClose.Size = new System.Drawing.Size(110, 40);
this.btnClose.TabIndex = 259;
this.btnClose.Text = "返回";
this.btnClose.Text = "退出";
this.btnClose.UseVisualStyleBackColor = false;
this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
//
......@@ -1342,7 +1344,7 @@
//
this.chbBoxSendShelf.AutoSize = true;
this.chbBoxSendShelf.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbBoxSendShelf.Location = new System.Drawing.Point(717, 13);
this.chbBoxSendShelf.Location = new System.Drawing.Point(717, 12);
this.chbBoxSendShelf.Name = "chbBoxSendShelf";
this.chbBoxSendShelf.Size = new System.Drawing.Size(140, 24);
this.chbBoxSendShelf.TabIndex = 251;
......@@ -1354,7 +1356,7 @@
//
this.chbMoveStop.AutoSize = true;
this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbMoveStop.Location = new System.Drawing.Point(627, 13);
this.chbMoveStop.Location = new System.Drawing.Point(627, 12);
this.chbMoveStop.Name = "chbMoveStop";
this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
this.chbMoveStop.TabIndex = 250;
......@@ -1367,7 +1369,7 @@
this.lblName.BackColor = System.Drawing.Color.DodgerBlue;
this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblName.ForeColor = System.Drawing.Color.Black;
this.lblName.Location = new System.Drawing.Point(5, 5);
this.lblName.Location = new System.Drawing.Point(5, 4);
this.lblName.Name = "lblName";
this.lblName.Size = new System.Drawing.Size(180, 40);
this.lblName.TabIndex = 249;
......@@ -1379,7 +1381,7 @@
this.btnScan.BackColor = System.Drawing.Color.White;
this.btnScan.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnScan.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnScan.Location = new System.Drawing.Point(420, 5);
this.btnScan.Location = new System.Drawing.Point(420, 4);
this.btnScan.Name = "btnScan";
this.btnScan.Size = new System.Drawing.Size(110, 40);
this.btnScan.TabIndex = 248;
......@@ -1387,22 +1389,12 @@
this.btnScan.UseVisualStyleBackColor = false;
this.btnScan.Click += new System.EventHandler(this.btnScan_Click);
//
// groupBox10
//
this.groupBox10.Controls.Add(this.panel1);
this.groupBox10.Location = new System.Drawing.Point(5, 2);
this.groupBox10.Name = "groupBox10";
this.groupBox10.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.groupBox10.Size = new System.Drawing.Size(1270, 71);
this.groupBox10.TabIndex = 0;
this.groupBox10.TabStop = false;
//
// FrmFeedingEquip
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1281, 639);
this.Controls.Add(this.groupBox10);
this.Controls.Add(this.panel1);
this.Controls.Add(this.tabControl1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
......@@ -1433,7 +1425,6 @@
this.groupBox2.PerformLayout();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.groupBox10.ResumeLayout(false);
this.ResumeLayout(false);
}
......@@ -1527,7 +1518,6 @@
private System.Windows.Forms.Button SL_FixedCylinder_Up;
private System.Windows.Forms.Button SL_TopCylinder_Up;
private System.Windows.Forms.Button SL_RollerLine_Run;
private System.Windows.Forms.GroupBox groupBox10;
private System.Windows.Forms.Button SL_LocationCylinder_Down;
private System.Windows.Forms.Button SL_FixedCylinder_Down;
private System.Windows.Forms.Button SL_TopCylinder_Down;
......
source/AssemblyLineClient/FrmHYEquip.Designer.cs
......@@ -58,7 +58,6 @@
this.lblStoreStatus = new System.Windows.Forms.Label();
this.btnStart = new System.Windows.Forms.Button();
this.btnStop = new System.Windows.Forms.Button();
this.btnReset = new System.Windows.Forms.Button();
this.btnOutStore = new System.Windows.Forms.Button();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
......@@ -272,7 +271,7 @@
this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(251, 6);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(240, 503);
this.groupBox4.Size = new System.Drawing.Size(240, 507);
this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表";
......@@ -282,6 +281,7 @@
this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel2.AutoScroll = true;
this.tableLayoutPanel2.ColumnCount = 1;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 14);
......@@ -289,7 +289,7 @@
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(229, 483);
this.tableLayoutPanel2.Size = new System.Drawing.Size(229, 487);
this.tableLayoutPanel2.TabIndex = 103;
//
// groupBox3
......@@ -299,7 +299,7 @@
this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(6, 6);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(240, 503);
this.groupBox3.Size = new System.Drawing.Size(240, 507);
this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表";
......@@ -309,6 +309,7 @@
this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel1.AutoScroll = true;
this.tableLayoutPanel1.ColumnCount = 1;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14);
......@@ -316,7 +317,7 @@
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(229, 483);
this.tableLayoutPanel1.Size = new System.Drawing.Size(229, 487);
this.tableLayoutPanel1.TabIndex = 102;
//
// groupDo
......@@ -584,7 +585,7 @@
//
this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(673, 22);
this.chbDebug.Location = new System.Drawing.Point(558, 13);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 247;
......@@ -602,7 +603,7 @@
this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblThisSta.Location = new System.Drawing.Point(255, 13);
this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(470, 153);
this.lblThisSta.Size = new System.Drawing.Size(470, 157);
this.lblThisSta.TabIndex = 246;
this.lblThisSta.Text = "等待启动";
this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -613,7 +614,7 @@
this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblStoreStatus.ForeColor = System.Drawing.Color.Green;
this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblStoreStatus.Location = new System.Drawing.Point(788, 24);
this.lblStoreStatus.Location = new System.Drawing.Point(673, 15);
this.lblStoreStatus.Name = "lblStoreStatus";
this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
this.lblStoreStatus.TabIndex = 245;
......@@ -625,7 +626,7 @@
this.btnStart.BackColor = System.Drawing.Color.White;
this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStart.Location = new System.Drawing.Point(190, 13);
this.btnStart.Location = new System.Drawing.Point(190, 5);
this.btnStart.Name = "btnStart";
this.btnStart.Size = new System.Drawing.Size(110, 40);
this.btnStart.TabIndex = 86;
......@@ -638,7 +639,7 @@
this.btnStop.BackColor = System.Drawing.Color.White;
this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStop.Location = new System.Drawing.Point(305, 13);
this.btnStop.Location = new System.Drawing.Point(305, 5);
this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(110, 40);
this.btnStop.TabIndex = 87;
......@@ -646,26 +647,12 @@
this.btnStop.UseVisualStyleBackColor = false;
this.btnStop.Click += new System.EventHandler(this.btnStop_Click);
//
// btnReset
//
this.btnReset.BackColor = System.Drawing.Color.White;
this.btnReset.Enabled = false;
this.btnReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnReset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReset.Location = new System.Drawing.Point(420, 13);
this.btnReset.Name = "btnReset";
this.btnReset.Size = new System.Drawing.Size(110, 40);
this.btnReset.TabIndex = 95;
this.btnReset.Text = "复位";
this.btnReset.UseVisualStyleBackColor = false;
this.btnReset.Click += new System.EventHandler(this.btnReset_Click);
//
// btnOutStore
//
this.btnOutStore.BackColor = System.Drawing.Color.White;
this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOutStore.Location = new System.Drawing.Point(535, 13);
this.btnOutStore.Location = new System.Drawing.Point(420, 5);
this.btnOutStore.Name = "btnOutStore";
this.btnOutStore.Size = new System.Drawing.Size(110, 40);
this.btnOutStore.TabIndex = 101;
......@@ -680,10 +667,10 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Location = new System.Drawing.Point(5, 62);
this.tabControl1.Location = new System.Drawing.Point(5, 57);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1243, 545);
this.tabControl1.Size = new System.Drawing.Size(1243, 549);
this.tabControl1.TabIndex = 257;
//
// tabPage1
......@@ -696,7 +683,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(1235, 515);
this.tabPage1.Size = new System.Drawing.Size(1235, 519);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO列表 ";
this.tabPage1.UseVisualStyleBackColor = true;
......@@ -712,7 +699,7 @@
this.groupBox6.Controls.Add(this.lblThisSta);
this.groupBox6.Location = new System.Drawing.Point(497, 6);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(731, 178);
this.groupBox6.Size = new System.Drawing.Size(731, 182);
this.groupBox6.TabIndex = 278;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "消息";
......@@ -757,7 +744,7 @@
this.tabPage2.Controls.Add(this.axisMoveControl1);
this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(1235, 515);
this.tabPage2.Size = new System.Drawing.Size(1235, 519);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "伺服调试";
this.tabPage2.UseVisualStyleBackColor = true;
......@@ -1030,6 +1017,7 @@
//
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel1.Controls.Add(this.btnClose);
this.panel1.Controls.Add(this.lblName);
this.panel1.Controls.Add(this.chbDebug);
......@@ -1037,10 +1025,9 @@
this.panel1.Controls.Add(this.btnOutStore);
this.panel1.Controls.Add(this.btnStart);
this.panel1.Controls.Add(this.btnStop);
this.panel1.Controls.Add(this.btnReset);
this.panel1.Location = new System.Drawing.Point(2, 1);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1242, 58);
this.panel1.Size = new System.Drawing.Size(1246, 50);
this.panel1.TabIndex = 258;
//
// btnClose
......@@ -1048,11 +1035,11 @@
this.btnClose.BackColor = System.Drawing.Color.White;
this.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClose.Location = new System.Drawing.Point(1109, 13);
this.btnClose.Location = new System.Drawing.Point(1129, 5);
this.btnClose.Name = "btnClose";
this.btnClose.Size = new System.Drawing.Size(110, 40);
this.btnClose.TabIndex = 260;
this.btnClose.Text = "返回";
this.btnClose.Text = "退出";
this.btnClose.UseVisualStyleBackColor = false;
this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
//
......@@ -1061,7 +1048,7 @@
this.lblName.BackColor = System.Drawing.Color.DodgerBlue;
this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblName.ForeColor = System.Drawing.Color.Black;
this.lblName.Location = new System.Drawing.Point(5, 13);
this.lblName.Location = new System.Drawing.Point(5, 5);
this.lblName.Name = "lblName";
this.lblName.Size = new System.Drawing.Size(180, 40);
this.lblName.TabIndex = 259;
......@@ -1120,7 +1107,6 @@
private System.Windows.Forms.Label lblStoreStatus;
private System.Windows.Forms.Button btnStart;
private System.Windows.Forms.Button btnStop;
private System.Windows.Forms.Button btnReset;
private System.Windows.Forms.Button btnOutStore;
private System.Windows.Forms.CheckBox chbDebug;
private System.Windows.Forms.Button HY_StopDown;
......
source/AssemblyLineClient/FrmHYEquip.cs
......@@ -243,8 +243,7 @@ namespace OnlineStore.AssemblyLine
internal override void FormStatus(bool isStart)
{
btnStart.Enabled = !isStart;
btnStop.Enabled = true;
btnReset.Enabled = isStart;
btnStop.Enabled = true;
//btnInStore.Enabled = isStart;
btnOutStore.Enabled = isStart;
}
......@@ -256,8 +255,16 @@ namespace OnlineStore.AssemblyLine
private void btnStart_Click(object sender, EventArgs e)
{
LogUtil.info(equipBean.Name + "点击：启动调试");
StartDebug();
if (equipBase.runStatus.Equals(LineRunStatus.Wait))
{
LogUtil.info(equipBean.Name + "点击：启用调试");
StartDebug();
}
else
{
LogUtil.info(equipBean.Name + "点击：复位");
Reset();
}
}
private void btnStop_Click(object sender, EventArgs e)
{
......
source/AssemblyLineClient/FrmLineStore.Designer.cs
......@@ -75,7 +75,8 @@
this.btnUpdateTray = new System.Windows.Forms.Button();
this.listView1 = new System.Windows.Forms.ListView();
this.tabPage5 = new System.Windows.Forms.TabPage();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.panel5 = new System.Windows.Forms.Panel();
this.picLine = new System.Windows.Forms.PictureBox();
this.lblStatus = new System.Windows.Forms.Label();
this.lblWarnMsg = new System.Windows.Forms.Label();
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
......@@ -100,9 +101,9 @@
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.托盘初始化ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.iO模块状态ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
this.iO模块状态ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator();
this.查看托盘信息ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
......@@ -147,7 +148,8 @@
this.groupBox1.SuspendLayout();
this.groupBox3.SuspendLayout();
this.tabPage5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.panel5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picLine)).BeginInit();
this.contextMenuStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.contextMenuStrip_control.SuspendLayout();
......@@ -677,7 +679,7 @@
//
// tabPage5
//
this.tabPage5.Controls.Add(this.pictureBox1);
this.tabPage5.Controls.Add(this.panel5);
this.tabPage5.Location = new System.Drawing.Point(4, 29);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Size = new System.Drawing.Size(1328, 609);
......@@ -685,15 +687,26 @@
this.tabPage5.Text = "设备位置示意图";
this.tabPage5.UseVisualStyleBackColor = true;
//
// pictureBox1
// panel5
//
this.panel5.AutoScroll = true;
this.panel5.AutoSize = true;
this.panel5.Controls.Add(this.picLine);
this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel5.Location = new System.Drawing.Point(0, 0);
this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(1328, 609);
this.panel5.TabIndex = 108;
//
// picLine
//
this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.pictureBox1.Location = new System.Drawing.Point(0, 0);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(1328, 609);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 107;
this.pictureBox1.TabStop = false;
this.picLine.Dock = System.Windows.Forms.DockStyle.Fill;
this.picLine.Location = new System.Drawing.Point(0, 0);
this.picLine.Name = "picLine";
this.picLine.Size = new System.Drawing.Size(1328, 609);
this.picLine.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picLine.TabIndex = 107;
this.picLine.TabStop = false;
//
// lblStatus
//
......@@ -853,73 +866,73 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator6.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator6.Visible = false;
//
// 二维码学习ToolStripMenuItem
//
this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem";
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.二维码学习ToolStripMenuItem.Text = "二维码学习";
this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click);
//
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator7.Size = new System.Drawing.Size(173, 6);
//
// 托盘初始化ToolStripMenuItem
//
this.托盘初始化ToolStripMenuItem.Name = "托盘初始化ToolStripMenuItem";
this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.托盘初始化ToolStripMenuItem.Text = "托盘编码";
this.托盘初始化ToolStripMenuItem.Click += new System.EventHandler(this.托盘初始化ToolStripMenuItem_Click);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator9.Size = new System.Drawing.Size(173, 6);
//
// iO模块状态ToolStripMenuItem
// toolStripMenuItem2
//
this.iO模块状态ToolStripMenuItem.Name = "iO模块状态ToolStripMenuItem";
this.iO模块状态ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.iO模块状态ToolStripMenuItem.Text = "查看料仓状态";
this.iO模块状态ToolStripMenuItem.Click += new System.EventHandler(this.iO模块状态ToolStripMenuItem_Click);
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(176, 26);
this.toolStripMenuItem2.Text = "AGV调试";
this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
//
// toolStripSeparator13
//
this.toolStripSeparator13.Name = "toolStripSeparator13";
this.toolStripSeparator13.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator13.Size = new System.Drawing.Size(173, 6);
//
// toolStripMenuItem2
// iO模块状态ToolStripMenuItem
//
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 26);
this.toolStripMenuItem2.Text = "AGV调试";
this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
this.iO模块状态ToolStripMenuItem.Name = "iO模块状态ToolStripMenuItem";
this.iO模块状态ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.iO模块状态ToolStripMenuItem.Text = "查看料仓状态";
this.iO模块状态ToolStripMenuItem.Click += new System.EventHandler(this.iO模块状态ToolStripMenuItem_Click);
//
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
this.toolStripSeparator14.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator14.Size = new System.Drawing.Size(173, 6);
//
// 查看托盘信息ToolStripMenuItem
//
this.查看托盘信息ToolStripMenuItem.Name = "查看托盘信息ToolStripMenuItem";
this.查看托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.查看托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.查看托盘信息ToolStripMenuItem.Text = "查看托盘信息";
this.查看托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.btnTrayInfo_Click);
//
// toolStripSeparator12
//
this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator12.Size = new System.Drawing.Size(173, 6);
//
// 清空托盘信息ToolStripMenuItem
//
this.清空托盘信息ToolStripMenuItem.Name = "清空托盘信息ToolStripMenuItem";
this.清空托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.清空托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.清空托盘信息ToolStripMenuItem.Text = "清空托盘信息";
this.清空托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.清空托盘信息ToolStripMenuItem_Click);
//
......@@ -1129,6 +1142,7 @@
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.menuStrip1;
this.Name = "FrmLineStore";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "流水线系统";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmMain_FormClosing);
......@@ -1150,7 +1164,9 @@
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.tabPage5.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.tabPage5.PerformLayout();
this.panel5.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.picLine)).EndInit();
this.contextMenuStrip1.ResumeLayout(false);
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
......@@ -1264,7 +1280,8 @@
private System.Windows.Forms.Label label13;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.TabPage tabPage5;
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.PictureBox picLine;
private System.Windows.Forms.Panel panel5;
}
}
source/AssemblyLineClient/FrmLineStore.cs
......@@ -130,7 +130,8 @@ namespace OnlineStore.AssemblyLine
this.notifyIcon1.Visible = false;
this.ShowInTaskbar = true;
tabControl1.TabPages.Remove(tabPage4);
tabControl1.TabPages.Remove(tabPage5);
//tabControl1.TabPages.Remove(tabPage5);
picLine.Image = ManagerUtil.M_Line;
timer1.Start();
}
......
source/AssemblyLineClient/FrmMoveEquip.Designer.cs
......@@ -80,6 +80,7 @@
this.btnP2 = new System.Windows.Forms.Button();
this.txtP2 = new System.Windows.Forms.TextBox();
this.panel1 = new System.Windows.Forms.Panel();
this.button1 = new System.Windows.Forms.Button();
this.btnClose = new System.Windows.Forms.Button();
this.lblName = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
......@@ -262,7 +263,7 @@
this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(251, 6);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(240, 507);
this.groupBox4.Size = new System.Drawing.Size(240, 509);
this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表";
......@@ -280,7 +281,7 @@
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(229, 487);
this.tableLayoutPanel2.Size = new System.Drawing.Size(229, 489);
this.tableLayoutPanel2.TabIndex = 103;
//
// groupBox3
......@@ -290,7 +291,7 @@
this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(6, 6);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(240, 507);
this.groupBox3.Size = new System.Drawing.Size(240, 509);
this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表";
......@@ -308,7 +309,7 @@
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(229, 487);
this.tableLayoutPanel1.Size = new System.Drawing.Size(229, 489);
this.tableLayoutPanel1.TabIndex = 102;
//
// groupDO
......@@ -466,7 +467,7 @@
//
this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(682, 21);
this.chbDebug.Location = new System.Drawing.Point(682, 13);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 247;
......@@ -494,7 +495,7 @@
this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblStoreStatus.ForeColor = System.Drawing.Color.Green;
this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblStoreStatus.Location = new System.Drawing.Point(804, 23);
this.lblStoreStatus.Location = new System.Drawing.Point(804, 15);
this.lblStoreStatus.Name = "lblStoreStatus";
this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
this.lblStoreStatus.TabIndex = 245;
......@@ -506,7 +507,7 @@
this.btnStart.BackColor = System.Drawing.Color.White;
this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStart.Location = new System.Drawing.Point(188, 12);
this.btnStart.Location = new System.Drawing.Point(188, 5);
this.btnStart.Name = "btnStart";
this.btnStart.Size = new System.Drawing.Size(110, 40);
this.btnStart.TabIndex = 86;
......@@ -519,7 +520,7 @@
this.btnStop.BackColor = System.Drawing.Color.White;
this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStop.Location = new System.Drawing.Point(301, 12);
this.btnStop.Location = new System.Drawing.Point(301, 5);
this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(110, 40);
this.btnStop.TabIndex = 87;
......@@ -532,7 +533,7 @@
this.btnInStore.BackColor = System.Drawing.Color.White;
this.btnInStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInStore.Location = new System.Drawing.Point(527, 12);
this.btnInStore.Location = new System.Drawing.Point(527, 5);
this.btnInStore.Name = "btnInStore";
this.btnInStore.Size = new System.Drawing.Size(110, 40);
this.btnInStore.TabIndex = 102;
......@@ -545,7 +546,7 @@
this.btnOutStore.BackColor = System.Drawing.Color.White;
this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOutStore.Location = new System.Drawing.Point(414, 12);
this.btnOutStore.Location = new System.Drawing.Point(414, 5);
this.btnOutStore.Name = "btnOutStore";
this.btnOutStore.Size = new System.Drawing.Size(110, 40);
this.btnOutStore.TabIndex = 101;
......@@ -560,10 +561,10 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Location = new System.Drawing.Point(5, 58);
this.tabControl1.Location = new System.Drawing.Point(5, 56);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1173, 549);
this.tabControl1.Size = new System.Drawing.Size(1173, 551);
this.tabControl1.TabIndex = 257;
//
// tabPage1
......@@ -576,7 +577,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(1165, 519);
this.tabPage1.Size = new System.Drawing.Size(1165, 521);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO列表 ";
this.tabPage1.UseVisualStyleBackColor = true;
......@@ -592,7 +593,7 @@
this.groupBox6.Controls.Add(this.lblThisSta);
this.groupBox6.Location = new System.Drawing.Point(496, 6);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(661, 268);
this.groupBox6.Size = new System.Drawing.Size(661, 270);
this.groupBox6.TabIndex = 278;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "消息";
......@@ -640,7 +641,7 @@
this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(1165, 519);
this.tabPage2.Size = new System.Drawing.Size(1165, 521);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 伺服信息 ";
this.tabPage2.UseVisualStyleBackColor = true;
......@@ -911,6 +912,8 @@
//
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel1.Controls.Add(this.button1);
this.panel1.Controls.Add(this.btnClose);
this.panel1.Controls.Add(this.lblName);
this.panel1.Controls.Add(this.chbDebug);
......@@ -921,9 +924,21 @@
this.panel1.Controls.Add(this.btnStop);
this.panel1.Location = new System.Drawing.Point(2, 1);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1169, 54);
this.panel1.Size = new System.Drawing.Size(1176, 50);
this.panel1.TabIndex = 258;
//
// button1
//
this.button1.BackColor = System.Drawing.Color.White;
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(1060, 5);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(110, 40);
this.button1.TabIndex = 260;
this.button1.Text = "退出";
this.button1.UseVisualStyleBackColor = false;
//
// btnClose
//
this.btnClose.BackColor = System.Drawing.Color.White;
......@@ -942,11 +957,11 @@
this.lblName.BackColor = System.Drawing.Color.DodgerBlue;
this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblName.ForeColor = System.Drawing.Color.Black;
this.lblName.Location = new System.Drawing.Point(5, 12);
this.lblName.Location = new System.Drawing.Point(5, 5);
this.lblName.Name = "lblName";
this.lblName.Size = new System.Drawing.Size(180, 40);
this.lblName.TabIndex = 250;
this.lblName.Text = "出料流水线";
this.lblName.Text = "进仓移栽";
this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// FrmMoveEquip
......@@ -1051,6 +1066,7 @@
private System.Windows.Forms.Button BeforeAfterCylinder_After;
private System.Windows.Forms.Button UpDownCylinder_Down;
private System.Windows.Forms.Button TopCylinder_Down;
private System.Windows.Forms.Button button1;
}
}
source/AssemblyLineClient/ManagerUtil.cs
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Text;
using System.Windows;
......@@ -28,6 +30,41 @@ namespace OnlineStore.AssemblyLine
{
MessageBox.Show(ex.ToString());
}
}
}
public static Image M_Line;
/// <summary>
/// 是否已经初始化过了
/// </summary>
public static bool IsInit = false;
public static Image GetImage(string file)
{
Image result = null;
if (File.Exists(file))
{
Image image = Image.FromFile(file);
result = new System.Drawing.Bitmap(image);
image.Dispose();
}
else
{
}
return result;
}
public static void Init()
{
try
{
IsInit = true;
M_Line = GetImage(Application.StartupPath + "\\image\\line.png");
}
catch (Exception ex)
{
Console.Write(ex.ToString());
}
}
}
}
source/AssemblyLineClient/Program.cs
......@@ -102,6 +102,7 @@ namespace OnlineStore.AssemblyLine
XmlConfigurator.Configure();
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
ManagerUtil.Init();
Application.Run(new FrmLineStore());
}
}
......
source/DeviceLibrary/DeviceLibrary.csproj
......@@ -36,8 +36,11 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Asa.RFID">
<HintPath>..\..\dll\RFID\Asa.RFID.dll</HintPath>
<Reference Include="Asa.RFID.HiStation">
<HintPath>..\..\dll\RFID\Asa.RFID.HiStation.dll</HintPath>
</Reference>
<Reference Include="Asa.RFID.IReadAll">
<HintPath>..\..\dll\RFID\Asa.RFID.IReadAll.dll</HintPath>
</Reference>
<Reference Include="Client, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
......
source/DeviceLibrary/assemblymanager/RFIDManagercs.cs
......@@ -14,6 +14,7 @@ namespace OnlineStore.DeviceLibrary
{
public class RFIDManager
{
private static int DefaultTrayNum = ConfigAppSettings.GetIntValue(Setting_Init.DefaultTrayNum);
private static ReadAll readAll = new ReadAll("TheRFID");
private static bool IsOpen = false;
......
source/LoadCVSLibrary/FileEncoding.cs
......@@ -112,5 +112,5 @@ namespace OnlineStore.LoadCSVLibrary
}
return true;
}
}
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!