Skip to content

孙克 / RC1250-AssemblyLine

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

1

1 个父辈 977277ba
内嵌 并排
正在显示 17 个修改的文件 包含 95 行增加 和 79 行删除
source/AssemblyLineClient/FrmFeedingEquip.cs
...@@ -212,11 +212,12 @@ namespace OnlineStore.AssemblyLine ...@@ -212,11 +212,12 @@ namespace OnlineStore.AssemblyLine
SlvAddr = equipBean.Config.Batch_Axis.GetAxisValue(); SlvAddr = equipBean.Config.Batch_Axis.GetAxisValue();
txtAxisDeviceName.Text = portName; txtAxisDeviceName.Text = portName;
txtSlaveId.Text = SlvAddr.ToString(); txtSlaveId.Text = SlvAddr.ToString();
txtAxisValue.Text = SlvAddr.ToString();
comboBox1.Items.Clear(); comboBox1.Items.Clear();
comboBox1.Items.Add(equipBean.Config.Batch_Axis.Explain); comboBox1.Items.Add(equipBean.Config.Batch_Axis.Explain);
comboBox1.Items.Add(equipBean.Config.UpDown_Axis.Explain); comboBox1.Items.Add(equipBean.Config.UpDown_Axis.Explain);
comboBox1.SelectedIndex = 0; comboBox1.SelectedIndex = 0;
txtAxisValue.Text = SlvAddr.ToString();
cmbSizeList.Items.Clear(); cmbSizeList.Items.Clear();
...@@ -601,7 +602,7 @@ namespace OnlineStore.AssemblyLine ...@@ -601,7 +602,7 @@ namespace OnlineStore.AssemblyLine
SlvAddr = equipBean.Config.UpDown_Axis.GetAxisValue(); SlvAddr = equipBean.Config.UpDown_Axis.GetAxisValue();
txtAxisDeviceName.Text = portName; txtAxisDeviceName.Text = portName;
txtSlaveId.Text = SlvAddr.ToString(); txtSlaveId.Text = SlvAddr.ToString();
txtAxisValue.Text = SlvAddr.ToString();
} }
else if (comboBox1.SelectedIndex.Equals(1)) else if (comboBox1.SelectedIndex.Equals(1))
{ {
...@@ -609,6 +610,7 @@ namespace OnlineStore.AssemblyLine ...@@ -609,6 +610,7 @@ namespace OnlineStore.AssemblyLine
SlvAddr = equipBean.Config.Batch_Axis.GetAxisValue(); SlvAddr = equipBean.Config.Batch_Axis.GetAxisValue();
txtAxisDeviceName.Text = portName; txtAxisDeviceName.Text = portName;
txtSlaveId.Text = SlvAddr.ToString(); txtSlaveId.Text = SlvAddr.ToString();
txtAxisValue.Text = SlvAddr.ToString();
} }
} }
......
source/AssemblyLineClient/FrmMoveEquip.resx
...@@ -112,18 +112,18 @@ ...@@ -112,18 +112,18 @@
<value>2.0</value> <value>2.0</value>
</resheader> </resheader>
<resheader name="reader"> <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>
<resheader name="writer"> <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> </resheader>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, internalKeyToken=b03f5f7f11d50a3a"> <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 11</value> <value>17, 11</value>
</metadata> </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, internalKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value> <value>25</value>
</metadata> </metadata>
<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"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAABAA8AMDAQAAEABABoBgAA9gAAACgoEAABAAQAyAQAAF4HAAAgIBAAAQAEAOgCAAAmDAAAGBgQAAEA AAABAA8AMDAQAAEABABoBgAA9gAAACgoEAABAAQAyAQAAF4HAAAgIBAAAQAEAOgCAAAmDAAAGBgQAAEA
......
source/AssemblyLineClient/FrmRFIPEdit.Designer.cs
...@@ -42,6 +42,8 @@ ...@@ -42,6 +42,8 @@
this.numNum = new System.Windows.Forms.NumericUpDown(); this.numNum = new System.Windows.Forms.NumericUpDown();
this.btnFind = new System.Windows.Forms.Button(); this.btnFind = new System.Windows.Forms.Button();
this.lblHas = new System.Windows.Forms.Label(); this.lblHas = new System.Windows.Forms.Label();
this.txtSearchIp = new System.Windows.Forms.TextBox();
this.btnSearch = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.numNum)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numNum)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -49,7 +51,7 @@ ...@@ -49,7 +51,7 @@
// //
this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(46, 72); this.label1.Location = new System.Drawing.Point(46, 130);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(167, 25); this.label1.Size = new System.Drawing.Size(167, 25);
this.label1.TabIndex = 0; this.label1.TabIndex = 0;
...@@ -61,7 +63,7 @@ ...@@ -61,7 +63,7 @@
this.btnNext.Anchor = System.Windows.Forms.AnchorStyles.Top; this.btnNext.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.btnNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNext.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnNext.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNext.Location = new System.Drawing.Point(257, 392); this.btnNext.Location = new System.Drawing.Point(257, 416);
this.btnNext.Name = "btnNext"; this.btnNext.Name = "btnNext";
this.btnNext.Size = new System.Drawing.Size(120, 45); this.btnNext.Size = new System.Drawing.Size(120, 45);
this.btnNext.TabIndex = 275; this.btnNext.TabIndex = 275;
...@@ -74,7 +76,7 @@ ...@@ -74,7 +76,7 @@
this.btnBack.Anchor = System.Windows.Forms.AnchorStyles.Top; this.btnBack.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBack.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBack.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBack.Location = new System.Drawing.Point(420, 392); this.btnBack.Location = new System.Drawing.Point(420, 416);
this.btnBack.Name = "btnBack"; this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(120, 45); this.btnBack.Size = new System.Drawing.Size(120, 45);
this.btnBack.TabIndex = 274; this.btnBack.TabIndex = 274;
...@@ -85,9 +87,8 @@ ...@@ -85,9 +87,8 @@
// txtIP // txtIP
// //
this.txtIP.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtIP.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtIP.Location = new System.Drawing.Point(222, 128); this.txtIP.Location = new System.Drawing.Point(222, 184);
this.txtIP.Name = "txtIP"; this.txtIP.Name = "txtIP";
this.txtIP.ReadOnly = true;
this.txtIP.Size = new System.Drawing.Size(233, 26); this.txtIP.Size = new System.Drawing.Size(233, 26);
this.txtIP.TabIndex = 276; this.txtIP.TabIndex = 276;
// //
...@@ -96,7 +97,7 @@ ...@@ -96,7 +97,7 @@
this.comboxType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboxType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboxType.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comboxType.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comboxType.FormattingEnabled = true; this.comboxType.FormattingEnabled = true;
this.comboxType.Location = new System.Drawing.Point(222, 72); this.comboxType.Location = new System.Drawing.Point(222, 130);
this.comboxType.Name = "comboxType"; this.comboxType.Name = "comboxType";
this.comboxType.Size = new System.Drawing.Size(318, 28); this.comboxType.Size = new System.Drawing.Size(318, 28);
this.comboxType.TabIndex = 277; this.comboxType.TabIndex = 277;
...@@ -106,7 +107,7 @@ ...@@ -106,7 +107,7 @@
// //
this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label2.Location = new System.Drawing.Point(46, 128); this.label2.Location = new System.Drawing.Point(46, 183);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(167, 25); this.label2.Size = new System.Drawing.Size(167, 25);
this.label2.TabIndex = 278; this.label2.TabIndex = 278;
...@@ -119,9 +120,12 @@ ...@@ -119,9 +120,12 @@
this.comType.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comType.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comType.FormattingEnabled = true; this.comType.FormattingEnabled = true;
this.comType.Items.AddRange(new object[] { this.comType.Items.AddRange(new object[] {
"流水线托盘", "A",
"料架"}); "B",
this.comType.Location = new System.Drawing.Point(222, 187); "C",
"D",
"E"});
this.comType.Location = new System.Drawing.Point(222, 236);
this.comType.Name = "comType"; this.comType.Name = "comType";
this.comType.Size = new System.Drawing.Size(120, 28); this.comType.Size = new System.Drawing.Size(120, 28);
this.comType.TabIndex = 280; this.comType.TabIndex = 280;
...@@ -130,7 +134,7 @@ ...@@ -130,7 +134,7 @@
// //
this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(46, 187); this.label3.Location = new System.Drawing.Point(46, 236);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(167, 25); this.label3.Size = new System.Drawing.Size(167, 25);
this.label3.TabIndex = 279; this.label3.TabIndex = 279;
...@@ -142,7 +146,7 @@ ...@@ -142,7 +146,7 @@
this.button1.Anchor = System.Windows.Forms.AnchorStyles.Top; this.button1.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button1.Location = new System.Drawing.Point(121, 392); this.button1.Location = new System.Drawing.Point(121, 416);
this.button1.Name = "button1"; this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(120, 45); this.button1.Size = new System.Drawing.Size(120, 45);
this.button1.TabIndex = 281; this.button1.TabIndex = 281;
...@@ -154,7 +158,7 @@ ...@@ -154,7 +158,7 @@
// //
this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(46, 248); this.label4.Location = new System.Drawing.Point(46, 289);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(167, 25); this.label4.Size = new System.Drawing.Size(167, 25);
this.label4.TabIndex = 282; this.label4.TabIndex = 282;
...@@ -164,7 +168,7 @@ ...@@ -164,7 +168,7 @@
// numNum // numNum
// //
this.numNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.numNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.numNum.Location = new System.Drawing.Point(222, 248); this.numNum.Location = new System.Drawing.Point(222, 290);
this.numNum.Minimum = new decimal(new int[] { this.numNum.Minimum = new decimal(new int[] {
1, 1,
0, 0,
...@@ -184,7 +188,7 @@ ...@@ -184,7 +188,7 @@
this.btnFind.Anchor = System.Windows.Forms.AnchorStyles.Bottom; this.btnFind.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.btnFind.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnFind.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFind.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFind.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFind.Location = new System.Drawing.Point(121, 311); this.btnFind.Location = new System.Drawing.Point(121, 354);
this.btnFind.Name = "btnFind"; this.btnFind.Name = "btnFind";
this.btnFind.Size = new System.Drawing.Size(120, 45); this.btnFind.Size = new System.Drawing.Size(120, 45);
this.btnFind.TabIndex = 284; this.btnFind.TabIndex = 284;
...@@ -197,18 +201,41 @@ ...@@ -197,18 +201,41 @@
this.lblHas.AutoSize = true; this.lblHas.AutoSize = true;
this.lblHas.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblHas.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblHas.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblHas.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblHas.Location = new System.Drawing.Point(253, 321); this.lblHas.Location = new System.Drawing.Point(253, 364);
this.lblHas.Name = "lblHas"; this.lblHas.Name = "lblHas";
this.lblHas.Size = new System.Drawing.Size(51, 20); this.lblHas.Size = new System.Drawing.Size(51, 20);
this.lblHas.TabIndex = 285; this.lblHas.TabIndex = 285;
this.lblHas.Text = "无标签"; this.lblHas.Text = "无标签";
this.lblHas.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblHas.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtSearchIp
//
this.txtSearchIp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSearchIp.Location = new System.Drawing.Point(222, 51);
this.txtSearchIp.Name = "txtSearchIp";
this.txtSearchIp.Size = new System.Drawing.Size(233, 26);
this.txtSearchIp.TabIndex = 286;
//
// btnSearch
//
this.btnSearch.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSearch.Location = new System.Drawing.Point(96, 42);
this.btnSearch.Name = "btnSearch";
this.btnSearch.Size = new System.Drawing.Size(120, 45);
this.btnSearch.TabIndex = 287;
this.btnSearch.Text = "搜索IP";
this.btnSearch.UseVisualStyleBackColor = false;
this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
//
// FrmRFIPEdit // FrmRFIPEdit
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(662, 524); this.ClientSize = new System.Drawing.Size(662, 524);
this.Controls.Add(this.btnSearch);
this.Controls.Add(this.txtSearchIp);
this.Controls.Add(this.lblHas); this.Controls.Add(this.lblHas);
this.Controls.Add(this.btnFind); this.Controls.Add(this.btnFind);
this.Controls.Add(this.numNum); this.Controls.Add(this.numNum);
...@@ -247,5 +274,7 @@ ...@@ -247,5 +274,7 @@
private System.Windows.Forms.NumericUpDown numNum; private System.Windows.Forms.NumericUpDown numNum;
private System.Windows.Forms.Button btnFind; private System.Windows.Forms.Button btnFind;
private System.Windows.Forms.Label lblHas; private System.Windows.Forms.Label lblHas;
private System.Windows.Forms.TextBox txtSearchIp;
private System.Windows.Forms.Button btnSearch;
} }
} }
\ No newline at end of file \ No newline at end of file
source/AssemblyLineClient/FrmRFIPEdit.cs
...@@ -37,7 +37,7 @@ namespace OnlineStore.AssemblyLine ...@@ -37,7 +37,7 @@ namespace OnlineStore.AssemblyLine
private void btnNext_Click(object sender, EventArgs e) private void btnNext_Click(object sender, EventArgs e)
{ {
string ip = txtIP.Text; string ip = txtIP.Text;
int type = comType.SelectedIndex+1; char type = comType.Text.ToCharArray()[0];
int value = (int)numNum.Value; int value = (int)numNum.Value;
DialogResult result = MessageBox.Show( "确定将【"+comboxType.Text+"】当前的托盘编号定为【"+value+"】?", "确定提示", MessageBoxButtons.OKCancel); DialogResult result = MessageBox.Show( "确定将【"+comboxType.Text+"】当前的托盘编号定为【"+value+"】?", "确定提示", MessageBoxButtons.OKCancel);
if (result.Equals(DialogResult.OK)) if (result.Equals(DialogResult.OK))
...@@ -91,5 +91,11 @@ namespace OnlineStore.AssemblyLine ...@@ -91,5 +91,11 @@ namespace OnlineStore.AssemblyLine
lblHas.ForeColor = Color.Red; lblHas.ForeColor = Color.Red;
} }
} }
private void btnSearch_Click(object sender, EventArgs e)
{
string ip = RFIDManager.SearchIP("192.168.1.88");
txtSearchIp.Text = ip;
}
} }
} }
source/AssemblyLineClient/记录.txt
新建阳光电源流水线料项目 在阳光电源流水线的基础上新建佳世达流水线料项目
测高信号共四个，用零点的设备。
料仓123放7存盘，第四台是13寸盘；
第四台移栽上升下降根据料盘高度，伺服移动到对应位置。
移栽配置修改，增加伺服参数配置。
伺服改为波特率可配置模式。
增加信号超时异常清理功能。
灯闪烁功能改为在LED中处理。
20190723
DIDO 都以0开始。
20190724
料盘检测123作为编码信号，料盘检测4作为检测是否有料信号
移栽上下料轴参数可配置。
增加切换BOX调试和工作的功能。
180000；
20000；
116000；
20190823修改
移栽在出库过程中，不扫码。
托盘顶升之后不再检测编码是否正确。
需要修改
流水线自动运转 需要打开才能启动流水线。
\ No newline at end of file \ No newline at end of file
source/DeviceLibrary/LineConfig/Config_Line.csv
...@@ -74,7 +74,7 @@ PRO,0,移载装置(上下为气缸）17、18,PRO_AOI_IP_35,192.168.100.45,,,,, ...@@ -74,7 +74,7 @@ PRO,0,移载装置(上下为气缸）17、18,PRO_AOI_IP_35,192.168.100.45,,,,,
PRO,0,移载装置(上下为气缸）17、18,PRO_AOI_IP_36,192.168.100.46,,,,, PRO,0,移载装置(上下为气缸）17、18,PRO_AOI_IP_36,192.168.100.46,,,,,
,,,,,,,,, ,,,,,,,,,
,,,,,,,,, ,,,,,,,,,
PRO,0,移栽装置1-托盘-RFID-IP,PRO_RFIP_001,192.168.1.190,,,,, PRO,0,移栽装置1-托盘-RFID-IP,PRO_RFIP_001,192.168.1.192,,,,,
PRO,0,移栽装置2-托盘-RFID-IP,PRO_RFIP_002,192.168.100.112,,,,, PRO,0,移栽装置2-托盘-RFID-IP,PRO_RFIP_002,192.168.100.112,,,,,
PRO,0,移栽装置3-托盘-RFID-IP,PRO_RFIP_003,192.168.100.113,,,,, PRO,0,移栽装置3-托盘-RFID-IP,PRO_RFIP_003,192.168.100.113,,,,,
PRO,0,移栽装置4-托盘-RFID-IP,PRO_RFIP_004,192.168.100.114,,,,, PRO,0,移栽装置4-托盘-RFID-IP,PRO_RFIP_004,192.168.100.114,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_01.csv
...@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,, ...@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,, PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,, PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,, PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM2,1,,, AXIS,0,移栽上下轴,UpDown_Axis,1,COM2,,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,, PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,, PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,, PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_02.csv
...@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,, ...@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,, PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,, PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,, PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM2,2,,, AXIS,0,移栽上下轴,UpDown_Axis,2,COM2,2,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,, PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,, PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,, PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_03.csv
...@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,, ...@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,, PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,, PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,, PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM2,3,,, AXIS,0,移栽上下轴,UpDown_Axis,3,COM2,3,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,, PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,, PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,, PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_04.csv
...@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,, ...@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,, PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,, PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,, PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM2,4,,, AXIS,0,移栽上下轴,UpDown_Axis,4,COM2,4,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,, PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,, PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,, PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_05.csv
...@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,, ...@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,, PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,, PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,, PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM2,5,,, AXIS,0,移栽上下轴,UpDown_Axis,5,COM2,5,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,, PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,, PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,, PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_06.csv
...@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,, ...@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,, PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,, PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,, PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM2,6,,, AXIS,0,移栽上下轴,UpDown_Axis,6,COM2,6,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,, PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,, PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,, PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_07.csv
...@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,, ...@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,, PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,, PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,, PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM2,7,,, AXIS,0,移栽上下轴,UpDown_Axis,7,COM2,7,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,, PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,, PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,, PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_08.csv
...@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,, ...@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,, PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,, PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,, PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM2,8,,, AXIS,0,移栽上下轴,UpDown_Axis,8,COM2,8,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,, PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,, PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,, PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_09.csv
...@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,, ...@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,, PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,, PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,, PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM2,9,,, AXIS,0,移栽上下轴,UpDown_Axis,9,COM2,9,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,, PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,, PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,, PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_10.csv
...@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,, ...@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,, PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,, PRO,0,移栽上下轴在移栽上下降的位置,UpDownPositions,0=180000;,,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,, PRO,0,移栽上下轴在料仓门口下降的位置,UpDownBoxPositions,0=116000;,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM2,10,,, AXIS,0,移栽上下轴,UpDown_Axis,10,COM2,10,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,, PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,, PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,, PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/deviceLibrary/RFID/RFIDManager.cs
...@@ -143,6 +143,20 @@ namespace OnlineStore.DeviceLibrary ...@@ -143,6 +143,20 @@ namespace OnlineStore.DeviceLibrary
} }
return null; return null;
} }
public static string SearchIP(string localIp)
{
string ip = "";
try
{
Reader rfReader = new Reader();
rfReader.LocalIP = localIp;
ip = rfReader.FindIP();
}
catch (Exception ex)
{
}
return ip;
}
public static bool FindRFID(string IP) public static bool FindRFID(string IP)
{ {
try try
...@@ -159,7 +173,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -159,7 +173,7 @@ namespace OnlineStore.DeviceLibrary
} }
return false; return false;
} }
public static byte[] ReadData(string IP, int reReadCount = 1,int startIndex=0,int readLength=10) public static byte[] ReadData(string IP, int reReadCount = 1,int startIndex=0,int readLength=8)
{ {
try try
{ {
...@@ -226,15 +240,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -226,15 +240,15 @@ namespace OnlineStore.DeviceLibrary
public class RFIDData public class RFIDData
{ {
/// <summary> /// <summary>
/// RFID类型，区分是料架还是托盘，托盘=L /// RFID类型，区分是料架还是托盘，托盘=E
/// </summary> /// </summary>
public int RFType= 1; public char RFType= 'E';
/// <summary> /// <summary>
/// 托盘编号，从1-32 /// 托盘编号，从1-32
/// </summary> /// </summary>
public int Num = 0; public int Num = 0;
public RFIDData (int num,int t=1) public RFIDData (int num,char t='E')
{ {
this.RFType = t; this.RFType = t;
this.Num = num; this.Num = num;
...@@ -244,8 +258,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -244,8 +258,8 @@ namespace OnlineStore.DeviceLibrary
{ {
try try
{ {
RFType = (int)data[0]; RFType =(char)data[1];
Num = Convert.ToInt32(data[1]); Num = Convert.ToInt32(data[2]);
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -265,7 +279,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -265,7 +279,7 @@ namespace OnlineStore.DeviceLibrary
} }
public string ToStr() public string ToStr()
{ {
return "["+RFType+"],Num=["+Num+"]"; return "Type=["+RFType+"],Num=["+Num+"]";
} }
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!