Skip to content

孙克 / RC1250-AssemblyLine

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

1

1 个父辈 272204ef
内嵌 并排
正在显示 39 个修改的文件 包含 268 行增加 和 244 行删除
doc/RC1250佳世达IO配置10-31.xlsx 0 → 100644
此文件类型无法预览
doc/RC1250网络IP配置图.pdf 0 → 100644
此文件类型无法预览
doc/流水线IO模块IP定义.xlsx 0 → 100644
此文件类型无法预览
source/AssemblyLineClient/FrmEquipBase.cs
......@@ -54,7 +54,7 @@ namespace OnlineStore.AssemblyLine
}
protected void BtnMove(Button btn, string defaultText, string targetText, string ioHighType)
{
LogUtil.info("点击【" + btn.Text + "】 ");
LogUtil.info(equipBase.Name+"点击【" + btn.Text + "】 ");
if (btn.Text.Equals(defaultText))
{
equipBase.IOMove(ioHighType, IO_VALUE.HIGH);
......@@ -71,7 +71,7 @@ namespace OnlineStore.AssemblyLine
protected void BtnMove(Button btn, string defaultText, string targetText, string ioLowType, string ioHighType)
{
LogUtil.info("点击【" + btn.Text + "】 ");
LogUtil.info(equipBase.Name + "点击【" + btn.Text + "】 ");
if (btn.Text.Equals(defaultText))
{
equipBase.CylinderMove(null, ioLowType, ioHighType);
......@@ -110,7 +110,7 @@ namespace OnlineStore.AssemblyLine
}
else
{
MessageBox.Show("请先启动设备");
MessageBox.Show(equipBase.Name + "请先启动设备");
}
}
catch (Exception ex)
......@@ -126,7 +126,7 @@ namespace OnlineStore.AssemblyLine
}
else
{
MessageBox.Show("请先启动设备");
MessageBox.Show(equipBase.Name + "请先启动设备");
}
}
internal virtual void FormStatus(bool status)
......
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
......@@ -124,7 +124,7 @@
this.groupBox1.Controls.Add(this.txtWriteTime);
this.groupBox1.Controls.Add(this.label5);
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(3, 476);
this.groupBox1.Location = new System.Drawing.Point(3, 488);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(394, 158);
this.groupBox1.TabIndex = 105;
......@@ -273,7 +273,7 @@
this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(488, 6);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(240, 463);
this.groupBox4.Size = new System.Drawing.Size(240, 475);
this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表";
......@@ -290,7 +290,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, 443);
this.tableLayoutPanel2.Size = new System.Drawing.Size(229, 455);
this.tableLayoutPanel2.TabIndex = 103;
//
// groupBox3
......@@ -300,7 +300,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, 463);
this.groupBox3.Size = new System.Drawing.Size(240, 475);
this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表";
......@@ -317,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, 443);
this.tableLayoutPanel1.Size = new System.Drawing.Size(229, 455);
this.tableLayoutPanel1.TabIndex = 102;
//
// groupBox5
......@@ -342,7 +342,7 @@
this.groupBox5.Controls.Add(this.btnFeedSideWay);
this.groupBox5.Location = new System.Drawing.Point(974, 6);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(384, 463);
this.groupBox5.Size = new System.Drawing.Size(338, 475);
this.groupBox5.TabIndex = 255;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "IO操作测试";
......@@ -352,7 +352,7 @@
this.btnBStopDown.BackColor = System.Drawing.Color.White;
this.btnBStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBStopDown.Location = new System.Drawing.Point(34, 130);
this.btnBStopDown.Location = new System.Drawing.Point(16, 130);
this.btnBStopDown.Name = "btnBStopDown";
this.btnBStopDown.Size = new System.Drawing.Size(153, 34);
this.btnBStopDown.TabIndex = 267;
......@@ -365,7 +365,7 @@
this.btnEStopDown.BackColor = System.Drawing.Color.White;
this.btnEStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnEStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnEStopDown.Location = new System.Drawing.Point(193, 83);
this.btnEStopDown.Location = new System.Drawing.Point(175, 83);
this.btnEStopDown.Name = "btnEStopDown";
this.btnEStopDown.Size = new System.Drawing.Size(153, 34);
this.btnEStopDown.TabIndex = 266;
......@@ -378,7 +378,7 @@
this.btnOSWRun.BackColor = System.Drawing.Color.White;
this.btnOSWRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOSWRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOSWRun.Location = new System.Drawing.Point(34, 83);
this.btnOSWRun.Location = new System.Drawing.Point(16, 83);
this.btnOSWRun.Name = "btnOSWRun";
this.btnOSWRun.Size = new System.Drawing.Size(153, 34);
this.btnOSWRun.TabIndex = 265;
......@@ -391,7 +391,7 @@
this.btnLSWRun.BackColor = System.Drawing.Color.White;
this.btnLSWRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLSWRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLSWRun.Location = new System.Drawing.Point(193, 36);
this.btnLSWRun.Location = new System.Drawing.Point(175, 36);
this.btnLSWRun.Name = "btnLSWRun";
this.btnLSWRun.Size = new System.Drawing.Size(153, 34);
this.btnLSWRun.TabIndex = 264;
......@@ -404,7 +404,7 @@
this.btnLineRun.BackColor = System.Drawing.Color.White;
this.btnLineRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLineRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLineRun.Location = new System.Drawing.Point(34, 36);
this.btnLineRun.Location = new System.Drawing.Point(16, 36);
this.btnLineRun.Name = "btnLineRun";
this.btnLineRun.Size = new System.Drawing.Size(153, 34);
this.btnLineRun.TabIndex = 263;
......@@ -417,7 +417,7 @@
this.btnFL_TopCylinder.BackColor = System.Drawing.Color.White;
this.btnFL_TopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFL_TopCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFL_TopCylinder.Location = new System.Drawing.Point(193, 130);
this.btnFL_TopCylinder.Location = new System.Drawing.Point(175, 130);
this.btnFL_TopCylinder.Name = "btnFL_TopCylinder";
this.btnFL_TopCylinder.Size = new System.Drawing.Size(153, 34);
this.btnFL_TopCylinder.TabIndex = 262;
......@@ -430,7 +430,7 @@
this.btnSwLocationCylinder.BackColor = System.Drawing.Color.White;
this.btnSwLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSwLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSwLocationCylinder.Location = new System.Drawing.Point(34, 318);
this.btnSwLocationCylinder.Location = new System.Drawing.Point(16, 318);
this.btnSwLocationCylinder.Name = "btnSwLocationCylinder";
this.btnSwLocationCylinder.Size = new System.Drawing.Size(153, 34);
this.btnSwLocationCylinder.TabIndex = 261;
......@@ -443,7 +443,7 @@
this.btnSWTop.BackColor = System.Drawing.Color.White;
this.btnSWTop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSWTop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSWTop.Location = new System.Drawing.Point(193, 318);
this.btnSWTop.Location = new System.Drawing.Point(175, 318);
this.btnSWTop.Name = "btnSWTop";
this.btnSWTop.Size = new System.Drawing.Size(153, 34);
this.btnSWTop.TabIndex = 260;
......@@ -456,7 +456,7 @@
this.btnCloseAll.BackColor = System.Drawing.Color.White;
this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAll.Location = new System.Drawing.Point(34, 405);
this.btnCloseAll.Location = new System.Drawing.Point(16, 405);
this.btnCloseAll.Name = "btnCloseAll";
this.btnCloseAll.Size = new System.Drawing.Size(153, 34);
this.btnCloseAll.TabIndex = 259;
......@@ -469,7 +469,7 @@
this.btnOutTopCylinder.BackColor = System.Drawing.Color.White;
this.btnOutTopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOutTopCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOutTopCylinder.Location = new System.Drawing.Point(193, 177);
this.btnOutTopCylinder.Location = new System.Drawing.Point(175, 177);
this.btnOutTopCylinder.Name = "btnOutTopCylinder";
this.btnOutTopCylinder.Size = new System.Drawing.Size(153, 34);
this.btnOutTopCylinder.TabIndex = 258;
......@@ -482,7 +482,7 @@
this.btnLocationCylinder.BackColor = System.Drawing.Color.White;
this.btnLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLocationCylinder.Location = new System.Drawing.Point(34, 177);
this.btnLocationCylinder.Location = new System.Drawing.Point(16, 177);
this.btnLocationCylinder.Name = "btnLocationCylinder";
this.btnLocationCylinder.Size = new System.Drawing.Size(153, 34);
this.btnLocationCylinder.TabIndex = 256;
......@@ -495,7 +495,7 @@
this.btnTrayLocationCylinder.BackColor = System.Drawing.Color.White;
this.btnTrayLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTrayLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTrayLocationCylinder.Location = new System.Drawing.Point(193, 271);
this.btnTrayLocationCylinder.Location = new System.Drawing.Point(175, 271);
this.btnTrayLocationCylinder.Name = "btnTrayLocationCylinder";
this.btnTrayLocationCylinder.Size = new System.Drawing.Size(153, 34);
this.btnTrayLocationCylinder.TabIndex = 255;
......@@ -508,7 +508,7 @@
this.btnFeedSideWayCylinder.BackColor = System.Drawing.Color.White;
this.btnFeedSideWayCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFeedSideWayCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFeedSideWayCylinder.Location = new System.Drawing.Point(193, 224);
this.btnFeedSideWayCylinder.Location = new System.Drawing.Point(175, 224);
this.btnFeedSideWayCylinder.Name = "btnFeedSideWayCylinder";
this.btnFeedSideWayCylinder.Size = new System.Drawing.Size(153, 34);
this.btnFeedSideWayCylinder.TabIndex = 252;
......@@ -521,7 +521,7 @@
this.btnFeedCylinder.BackColor = System.Drawing.Color.White;
this.btnFeedCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFeedCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFeedCylinder.Location = new System.Drawing.Point(34, 271);
this.btnFeedCylinder.Location = new System.Drawing.Point(16, 271);
this.btnFeedCylinder.Name = "btnFeedCylinder";
this.btnFeedCylinder.Size = new System.Drawing.Size(153, 34);
this.btnFeedCylinder.TabIndex = 249;
......@@ -534,7 +534,7 @@
this.btnFeedSideWay.BackColor = System.Drawing.Color.White;
this.btnFeedSideWay.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFeedSideWay.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFeedSideWay.Location = new System.Drawing.Point(34, 224);
this.btnFeedSideWay.Location = new System.Drawing.Point(16, 224);
this.btnFeedSideWay.Name = "btnFeedSideWay";
this.btnFeedSideWay.Size = new System.Drawing.Size(153, 34);
this.btnFeedSideWay.TabIndex = 246;
......@@ -561,9 +561,9 @@
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Red;
this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblThisSta.Location = new System.Drawing.Point(216, 19);
this.lblThisSta.Location = new System.Drawing.Point(216, 60);
this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(733, 77);
this.lblThisSta.Size = new System.Drawing.Size(687, 85);
this.lblThisSta.TabIndex = 246;
this.lblThisSta.Text = "等待启动";
this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -657,7 +657,7 @@
this.tabControl1.Location = new System.Drawing.Point(5, 69);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1373, 675);
this.tabControl1.Size = new System.Drawing.Size(1327, 687);
this.tabControl1.TabIndex = 257;
//
// tabPage1
......@@ -672,7 +672,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(1365, 645);
this.tabPage1.Size = new System.Drawing.Size(1319, 657);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO列表 ";
this.tabPage1.UseVisualStyleBackColor = true;
......@@ -685,9 +685,9 @@
this.groupBox6.Controls.Add(this.lblAgvInfo);
this.groupBox6.Controls.Add(this.lblInstoreList);
this.groupBox6.Controls.Add(this.lblThisSta);
this.groupBox6.Location = new System.Drawing.Point(403, 476);
this.groupBox6.Location = new System.Drawing.Point(403, 488);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(955, 160);
this.groupBox6.Size = new System.Drawing.Size(909, 160);
this.groupBox6.TabIndex = 278;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "消息";
......@@ -697,7 +697,7 @@
this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblMoveInfo.Location = new System.Drawing.Point(16, 69);
this.lblMoveInfo.Location = new System.Drawing.Point(16, 25);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(68, 17);
this.lblMoveInfo.TabIndex = 278;
......@@ -708,7 +708,7 @@
this.lblAgvInfo.AutoSize = true;
this.lblAgvInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblAgvInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblAgvInfo.Location = new System.Drawing.Point(14, 29);
this.lblAgvInfo.Location = new System.Drawing.Point(237, 29);
this.lblAgvInfo.Name = "lblAgvInfo";
this.lblAgvInfo.Size = new System.Drawing.Size(61, 17);
this.lblAgvInfo.TabIndex = 276;
......@@ -723,7 +723,7 @@
this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblInstoreList.Location = new System.Drawing.Point(216, 115);
this.lblInstoreList.Name = "lblInstoreList";
this.lblInstoreList.Size = new System.Drawing.Size(733, 109);
this.lblInstoreList.Size = new System.Drawing.Size(687, 109);
this.lblInstoreList.TabIndex = 277;
//
// groupBox7
......@@ -733,7 +733,7 @@
this.groupBox7.Controls.Add(this.tableLayoutPanel3);
this.groupBox7.Location = new System.Drawing.Point(247, 6);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(240, 463);
this.groupBox7.Size = new System.Drawing.Size(240, 475);
this.groupBox7.TabIndex = 279;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "DI列表";
......@@ -750,7 +750,7 @@
this.tableLayoutPanel3.RowCount = 2;
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel3.Size = new System.Drawing.Size(229, 443);
this.tableLayoutPanel3.Size = new System.Drawing.Size(229, 455);
this.tableLayoutPanel3.TabIndex = 102;
//
// groupBox8
......@@ -760,7 +760,7 @@
this.groupBox8.Controls.Add(this.tableLayoutPanel4);
this.groupBox8.Location = new System.Drawing.Point(728, 6);
this.groupBox8.Name = "groupBox8";
this.groupBox8.Size = new System.Drawing.Size(240, 463);
this.groupBox8.Size = new System.Drawing.Size(240, 475);
this.groupBox8.TabIndex = 280;
this.groupBox8.TabStop = false;
this.groupBox8.Text = "DO列表";
......@@ -777,7 +777,7 @@
this.tableLayoutPanel4.RowCount = 2;
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel4.Size = new System.Drawing.Size(229, 443);
this.tableLayoutPanel4.Size = new System.Drawing.Size(229, 455);
this.tableLayoutPanel4.TabIndex = 103;
//
// tabPage2
......@@ -788,7 +788,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(1365, 776);
this.tabPage2.Size = new System.Drawing.Size(1365, 645);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 伺服信息 ";
this.tabPage2.UseVisualStyleBackColor = true;
......@@ -1046,7 +1046,7 @@
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(1372, 68);
this.panel1.Size = new System.Drawing.Size(1326, 68);
this.panel1.TabIndex = 258;
//
// lblName
......@@ -1078,7 +1078,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1384, 750);
this.ClientSize = new System.Drawing.Size(1338, 762);
this.Controls.Add(this.panel1);
this.Controls.Add(this.tabControl1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
......
source/AssemblyLineClient/FrmFeedingEquip.cs
......@@ -106,7 +106,7 @@ namespace OnlineStore.AssemblyLine
//lblTrayNum.Text = "托盘编码：" + TrayManager.GetTrayNum(equipBean.DeviceID);
}
lblAgvInfo.Text ="AGV-"+equipBean.Config.AgvInName +" 状态："+ AgvClient.GetAction(equipBean.Config.AgvInName).ToString()+
"\nAGV-" + equipBean.Config.AgvOutName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvOutName).ToString() + "";
"\t AGV-" + equipBean.Config.AgvOutName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvOutName).ToString() + "";
string canOut =equipBean.Config.IsCanOut.Equals(1) ? "紧急出料模块" : "入料模块";
lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.lineStatus, equipBean.runStatus) + "(" + canOut + ")";
lblThisSta.Text = equipBean.WarnMsg;
......
source/AssemblyLineClient/FrmIOStatus.cs
......@@ -220,7 +220,7 @@ namespace OnlineStore.AssemblyLine
}
protected void BtnMove(Button btn, string defaultText, string targetText, string ioHighType)
{
LogUtil.info("点击【" + btn.Text + "】 ");
LogUtil.info(LineManager.Line.Name+ "点击【" + btn.Text + "】 ");
if (btn.Text.Equals(defaultText))
{
LineManager.Line.IOMove(ioHighType, IO_VALUE.HIGH);
......@@ -237,7 +237,7 @@ namespace OnlineStore.AssemblyLine
protected void BtnMove(Button btn, string defaultText, string targetText, string ioLowType, string ioHighType)
{
LogUtil.info("点击【" + btn.Text + "】 ");
LogUtil.info(LineManager.Line.Name + "点击【" + btn.Text + "】 ");
if (btn.Text.Equals(defaultText))
{
LineManager.Line.CylinderMove(null, ioLowType, ioHighType);
......
source/AssemblyLineClient/FrmLineStore.Designer.cs
......@@ -32,6 +32,14 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmLineStore));
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.chbAutoRun = new System.Windows.Forms.CheckBox();
this.btnUpdateStatus = new System.Windows.Forms.Button();
this.lblCID = new System.Windows.Forms.Label();
this.chkDebug = new System.Windows.Forms.CheckBox();
this.listView1 = new System.Windows.Forms.ListView();
this.btnCopyLog = new System.Windows.Forms.Button();
this.btnClearLog = new System.Windows.Forms.Button();
this.logBox = new System.Windows.Forms.RichTextBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.lblPosId = new System.Windows.Forms.Label();
this.txtPosId = new System.Windows.Forms.TextBox();
......@@ -39,14 +47,7 @@
this.btnInStoreTset = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.chkDebug = new System.Windows.Forms.CheckBox();
this.chbAutoRun = new System.Windows.Forms.CheckBox();
this.btnCopyLog = new System.Windows.Forms.Button();
this.btnClearLog = new System.Windows.Forms.Button();
this.logBox = new System.Windows.Forms.RichTextBox();
this.btnUpdateStatus = new System.Windows.Forms.Button();
this.lblStatus = new System.Windows.Forms.Label();
this.lblCID = new System.Windows.Forms.Label();
this.lblWarnMsg = new System.Windows.Forms.Label();
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.操作ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
......@@ -74,7 +75,6 @@
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.listView1 = new System.Windows.Forms.ListView();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBox1.SuspendLayout();
......@@ -112,9 +112,111 @@
this.tabPage1.Name = "tabPage1";
this.tabPage1.Size = new System.Drawing.Size(1316, 508);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 日志信息 ";
this.tabPage1.Text = "状态信息";
this.tabPage1.UseVisualStyleBackColor = true;
//
// chbAutoRun
//
this.chbAutoRun.AutoSize = true;
this.chbAutoRun.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRun.Location = new System.Drawing.Point(271, 19);
this.chbAutoRun.Name = "chbAutoRun";
this.chbAutoRun.Size = new System.Drawing.Size(140, 24);
this.chbAutoRun.TabIndex = 94;
this.chbAutoRun.Text = "开机自动启动软件";
this.chbAutoRun.UseVisualStyleBackColor = true;
this.chbAutoRun.CheckedChanged += new System.EventHandler(this.chbAutoRun_CheckedChanged);
//
// btnUpdateStatus
//
this.btnUpdateStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnUpdateStatus.BackColor = System.Drawing.Color.White;
this.btnUpdateStatus.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdateStatus.Location = new System.Drawing.Point(9, 467);
this.btnUpdateStatus.Name = "btnUpdateStatus";
this.btnUpdateStatus.Size = new System.Drawing.Size(222, 35);
this.btnUpdateStatus.TabIndex = 195;
this.btnUpdateStatus.Text = "更改为调试状态";
this.btnUpdateStatus.UseVisualStyleBackColor = false;
this.btnUpdateStatus.Click += new System.EventHandler(this.btnUpdateStatus_Click);
//
// lblCID
//
this.lblCID.AutoSize = true;
this.lblCID.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCID.Location = new System.Drawing.Point(18, 19);
this.lblCID.Name = "lblCID";
this.lblCID.Size = new System.Drawing.Size(33, 20);
this.lblCID.TabIndex = 95;
this.lblCID.Text = "CID";
//
// chkDebug
//
this.chkDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.chkDebug.AutoSize = true;
this.chkDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkDebug.Location = new System.Drawing.Point(366, 473);
this.chkDebug.Name = "chkDebug";
this.chkDebug.Size = new System.Drawing.Size(76, 24);
this.chkDebug.TabIndex = 194;
this.chkDebug.Text = "DEBUG";
this.chkDebug.UseVisualStyleBackColor = true;
//
// listView1
//
this.listView1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.listView1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listView1.FullRowSelect = true;
this.listView1.GridLines = true;
this.listView1.HideSelection = false;
this.listView1.Location = new System.Drawing.Point(9, 63);
this.listView1.MultiSelect = false;
this.listView1.Name = "listView1";
this.listView1.Size = new System.Drawing.Size(433, 398);
this.listView1.TabIndex = 191;
this.listView1.UseCompatibleStateImageBehavior = false;
this.listView1.View = System.Windows.Forms.View.Details;
this.listView1.SelectedIndexChanged += new System.EventHandler(this.listView1_SelectedIndexChanged);
//
// btnCopyLog
//
this.btnCopyLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnCopyLog.BackColor = System.Drawing.Color.White;
this.btnCopyLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCopyLog.Location = new System.Drawing.Point(232, 467);
this.btnCopyLog.Name = "btnCopyLog";
this.btnCopyLog.Size = new System.Drawing.Size(63, 35);
this.btnCopyLog.TabIndex = 191;
this.btnCopyLog.Text = "复制";
this.btnCopyLog.UseVisualStyleBackColor = false;
this.btnCopyLog.Click += new System.EventHandler(this.btnCopyLog_Click);
//
// btnClearLog
//
this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Location = new System.Drawing.Point(296, 467);
this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(63, 35);
this.btnClearLog.TabIndex = 190;
this.btnClearLog.Text = "清空";
this.btnClearLog.UseVisualStyleBackColor = false;
this.btnClearLog.Click += new System.EventHandler(this.btnClearLog_Click);
//
// logBox
//
this.logBox.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.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(448, 8);
this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(860, 494);
this.logBox.TabIndex = 106;
this.logBox.Text = "";
//
// groupBox1
//
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
......@@ -194,81 +296,6 @@
this.button1.UseVisualStyleBackColor = false;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// chkDebug
//
this.chkDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.chkDebug.AutoSize = true;
this.chkDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkDebug.Location = new System.Drawing.Point(366, 473);
this.chkDebug.Name = "chkDebug";
this.chkDebug.Size = new System.Drawing.Size(76, 24);
this.chkDebug.TabIndex = 194;
this.chkDebug.Text = "DEBUG";
this.chkDebug.UseVisualStyleBackColor = true;
//
// chbAutoRun
//
this.chbAutoRun.AutoSize = true;
this.chbAutoRun.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRun.Location = new System.Drawing.Point(271, 19);
this.chbAutoRun.Name = "chbAutoRun";
this.chbAutoRun.Size = new System.Drawing.Size(140, 24);
this.chbAutoRun.TabIndex = 94;
this.chbAutoRun.Text = "开机自动启动软件";
this.chbAutoRun.UseVisualStyleBackColor = true;
this.chbAutoRun.CheckedChanged += new System.EventHandler(this.chbAutoRun_CheckedChanged);
//
// btnCopyLog
//
this.btnCopyLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnCopyLog.BackColor = System.Drawing.Color.White;
this.btnCopyLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCopyLog.Location = new System.Drawing.Point(232, 467);
this.btnCopyLog.Name = "btnCopyLog";
this.btnCopyLog.Size = new System.Drawing.Size(63, 35);
this.btnCopyLog.TabIndex = 191;
this.btnCopyLog.Text = "复制";
this.btnCopyLog.UseVisualStyleBackColor = false;
this.btnCopyLog.Click += new System.EventHandler(this.btnCopyLog_Click);
//
// btnClearLog
//
this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Location = new System.Drawing.Point(296, 467);
this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(63, 35);
this.btnClearLog.TabIndex = 190;
this.btnClearLog.Text = "清空";
this.btnClearLog.UseVisualStyleBackColor = false;
this.btnClearLog.Click += new System.EventHandler(this.btnClearLog_Click);
//
// logBox
//
this.logBox.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.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(448, 8);
this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(860, 494);
this.logBox.TabIndex = 106;
this.logBox.Text = "";
//
// btnUpdateStatus
//
this.btnUpdateStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnUpdateStatus.BackColor = System.Drawing.Color.White;
this.btnUpdateStatus.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdateStatus.Location = new System.Drawing.Point(9, 467);
this.btnUpdateStatus.Name = "btnUpdateStatus";
this.btnUpdateStatus.Size = new System.Drawing.Size(222, 35);
this.btnUpdateStatus.TabIndex = 195;
this.btnUpdateStatus.Text = "更改为调试状态";
this.btnUpdateStatus.UseVisualStyleBackColor = false;
this.btnUpdateStatus.Click += new System.EventHandler(this.btnUpdateStatus_Click);
//
// lblStatus
//
this.lblStatus.AutoSize = true;
......@@ -280,16 +307,6 @@
this.lblStatus.TabIndex = 92;
this.lblStatus.Text = "等待启动";
//
// lblCID
//
this.lblCID.AutoSize = true;
this.lblCID.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCID.Location = new System.Drawing.Point(18, 19);
this.lblCID.Name = "lblCID";
this.lblCID.Size = new System.Drawing.Size(33, 20);
this.lblCID.TabIndex = 95;
this.lblCID.Text = "CID";
//
// lblWarnMsg
//
this.lblWarnMsg.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
......@@ -336,61 +353,61 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(141, 6);
//
// 启动AToolStripMenuItem
//
this.启动AToolStripMenuItem.Name = "启动AToolStripMenuItem";
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.启动AToolStripMenuItem.Text = "启动 ";
this.启动AToolStripMenuItem.Click += new System.EventHandler(this.启动所有料仓AToolStripMenuItem_Click);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator4.Size = new System.Drawing.Size(141, 6);
//
// 复位RToolStripMenuItem
//
this.复位RToolStripMenuItem.Name = "复位RToolStripMenuItem";
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.复位RToolStripMenuItem.Text = "复位";
this.复位RToolStripMenuItem.Click += new System.EventHandler(this.复位RToolStripMenuItem_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator3.Size = new System.Drawing.Size(141, 6);
//
// 停止TToolStripMenuItem
//
this.停止TToolStripMenuItem.Name = "停止TToolStripMenuItem";
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.停止TToolStripMenuItem.Text = "停止";
this.停止TToolStripMenuItem.Click += new System.EventHandler(this.停止所有料仓TToolStripMenuItem_Click);
//
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator5.Size = new System.Drawing.Size(141, 6);
//
// 入库模式ToolStripMenuItem
//
this.入库模式ToolStripMenuItem.Name = "入库模式ToolStripMenuItem";
this.入库模式ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.入库模式ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.入库模式ToolStripMenuItem.Text = "入库模式";
this.入库模式ToolStripMenuItem.Visible = false;
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator2.Size = new System.Drawing.Size(141, 6);
this.toolStripSeparator2.Visible = false;
//
// 退出ToolStripMenuItem
//
this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.退出ToolStripMenuItem.Text = "退出";
this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click_1);
//
......@@ -409,7 +426,7 @@
// 扫码测试ToolStripMenuItem
//
this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem";
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.扫码测试ToolStripMenuItem.Text = "扫码测试";
this.扫码测试ToolStripMenuItem.Visible = false;
this.扫码测试ToolStripMenuItem.Click += new System.EventHandler(this.扫码测试ToolStripMenuItem_Click);
......@@ -417,25 +434,25 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator6.Size = new System.Drawing.Size(157, 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(160, 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(157, 6);
//
// 托盘初始化ToolStripMenuItem
//
this.托盘初始化ToolStripMenuItem.Name = "托盘初始化ToolStripMenuItem";
this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.托盘初始化ToolStripMenuItem.Text = "托盘编码";
this.托盘初始化ToolStripMenuItem.Click += new System.EventHandler(this.托盘初始化ToolStripMenuItem_Click);
//
......@@ -450,7 +467,7 @@
// 版本号ToolStripMenuItem
//
this.版本号ToolStripMenuItem.Name = "版本号ToolStripMenuItem";
this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.版本号ToolStripMenuItem.Text = "关于软件";
this.版本号ToolStripMenuItem.Click += new System.EventHandler(this.版本号ToolStripMenuItem_Click);
//
......@@ -496,23 +513,6 @@
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// listView1
//
this.listView1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.listView1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listView1.FullRowSelect = true;
this.listView1.GridLines = true;
this.listView1.HideSelection = false;
this.listView1.Location = new System.Drawing.Point(9, 63);
this.listView1.MultiSelect = false;
this.listView1.Name = "listView1";
this.listView1.Size = new System.Drawing.Size(433, 398);
this.listView1.TabIndex = 191;
this.listView1.UseCompatibleStateImageBehavior = false;
this.listView1.View = System.Windows.Forms.View.Details;
this.listView1.SelectedIndexChanged += new System.EventHandler(this.listView1_SelectedIndexChanged);
//
// FrmLineStore
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
......
source/AssemblyLineClient/FrmLineStore.cs
......@@ -100,7 +100,7 @@ namespace OnlineStore.AssemblyLine
}
private void FrmMain_Load(object sender, EventArgs e)
{
FrmBase.GetVersion(true);
FrmBase.GetVersion(true);
if (!LineManager.Init())
{
LogUtil.error("加载配置失败，直接退出程序");
......
source/AssemblyLineClient/useControl/AxisMoveControl.cs
......@@ -148,6 +148,14 @@ namespace OnlineStore.AssemblyLine
btnComAlarmClear.ForeColor = color;
btnReadPosition.ForeColor = color;
btnGetAlarm.ForeColor = color;
this.txtAlarmStatus.Text = "";
this.txtBusyStatus.Text = "";
this.txtHomeStatus.Text = "";
this.txtHomeSingle.Text = "";
this.txtLimit1.Text = "";
this.txtLimit2.Text = "";
txtServoStatue.Text = "";
}
}
......
source/Common/util/AcSerialBean.cs
......@@ -495,23 +495,23 @@ namespace OnlineStore.Common
#endregion
#region 字节型转十六进制字符串
/// <summary>
/// 字节数组转16进制字符串
/// </summary>
/// <param name="bytes"></param>
/// <returns></returns>
public static string byteToHexStr(byte[] bytes)
{
string returnStr = "";
if (bytes != null)
{
for (int i = 0; i < bytes.Length; i++)
{
returnStr += bytes[i].ToString("X2");
}
}
return returnStr;
}
///// <summary>
///// 字节数组转16进制字符串
///// </summary>
///// <param name="bytes"></param>
///// <returns></returns>
//public static string byteToHexStr(byte[] bytes)
//{
// string returnStr = "";
// if (bytes != null)
// {
// for (int i = 0; i < bytes.Length; i++)
// {
// returnStr += bytes[i].ToString("X2");
// }
// }
// return returnStr;
//}
#endregion
#region 计算校验码
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_1.csv
......@@ -5,9 +5,9 @@ PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,对应的横移模块,SidesWayNum,1,,,,,
PRO,0,是否是用来出料,IsCanOut,0,,,,,
PRO,0,上料流水线入口AGV小车站号名称,AgvInName,D5,,,,,
PRO,0,上料流水线出口AGV小车站号名称,AgvOutName,D6,,,,
PRO,0,上料流水线出口AGV小车站号名称,AgvOutName,D6,,,,,
,,,,,,,,,
AXIS,0,提升上料轴,Batch_Axis,1,COM1,0,,,
AXIS,0,提升上料轴,Batch_Axis,1,COM5,0,,,
PRO,0,提升上料轴上升待机点 P1,BatchAxisP1,10000,,,,,
PRO,0,提升上料轴下降位置P2,BatchAxisP2,-500,,,,,
PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,10000,,,,,
......@@ -22,7 +22,7 @@ PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,400,,,,,
PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,50,,,,,
PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,5000,,,,,
,,,,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,2,COM1,0,,,
AXIS,0,移栽上下轴,UpDown_Axis,2,COM5,0,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴在移栽上下降的位置P2集合,UpDownP2ListP2,0=180000;,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
......@@ -92,10 +92,10 @@ DO,1000,环形线横移1顶升上升SOL,SW1_TopCylinder_Up,4,PRO_AOI_IP_12,0,环形线横移1
DO,1000,环形线横移1顶升下降SOL,SW1_TopCylinder_Down,5,PRO_AOI_IP_12,0,环形线横移1顶升下降SOL,Y126,Y126
DO,1000,环形线横移1定位上升SOL,SW1_LocationCylinder_Up,6,PRO_AOI_IP_12,0,环形线横移1定位上升SOL,Y127,Y127
DO,1000,环形线横移1定位下降SOL,SW1_LocationCylinder_Down,7,PRO_AOI_IP_12,0,环形线横移1定位下降SOL,Y128,Y128
DO,0,SL1提升伺服刹车ON,SL_UpAxis_BreakOn,8,PRO_AOI_IP_12,0,SL1提升伺服刹车ON,Y129,Y129
DO,0,SL1移载1伺服刹车ON,SL_MoveAxis_BreakOn,9,PRO_AOI_IP_12,0,SL1移载1伺服刹车ON,Y130,Y130
DO,0,SL1提升伺服运转ON,SL_UpAxis_ServoOn,10,PRO_AOI_IP_12,0,SL1提升伺服运转ON,Y131,Y131
DO,0,SL1移载1伺服运转ON,SL_MoveAxis_ServoOn,11,PRO_AOI_IP_12,0,SL1移载1伺服运转ON,Y132,Y132
DO,0,SL1提升伺服刹车ON,BatchAxis_BreakOn,8,PRO_AOI_IP_12,0,SL1提升伺服刹车ON,Y129,Y129
DO,0,SL1移载1伺服刹车ON,UpDownAxis_BreakOn,9,PRO_AOI_IP_12,0,SL1移载1伺服刹车ON,Y130,Y130
DO,0,SL1提升伺服运转ON,BatchAxis_ServoOn,10,PRO_AOI_IP_12,0,SL1提升伺服运转ON,Y131,Y131
DO,0,SL1移载1伺服运转ON,UpDownAxis_ServoOn,11,PRO_AOI_IP_12,0,SL1移载1伺服运转ON,Y132,Y132
DO,0,SL1出料线体运转,SL_OutLine_Run,12,PRO_AOI_IP_12,0,SL1出料线体运转,Y133,Y133
,,,,13,PRO_AOI_IP_12,0,,Y134,Y134
,,,,14,PRO_AOI_IP_12,0,,Y135,Y135
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_2.csv
......@@ -5,9 +5,9 @@ PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,对应的横移模块,SidesWayNum,0,,,,,
PRO,0,是否是用来出料,IsCanOut,0,,,,,
PRO,0,上料流水线入口AGV小车站号名称,AgvInName,D3,,,,,
PRO,0,上料流水线出口AGV小车站号名称,AgvOutName,D4,,,,
PRO,0,上料流水线出口AGV小车站号名称,AgvOutName,D4,,,,,
,,,,,,,,,
AXIS,0,提升上料轴,Batch_Axis,3,COM1,0,,,
AXIS,0,提升上料轴,Batch_Axis,3,COM5,0,,,
PRO,0,提升上料轴上升待机点 P1,BatchAxisP1,10000,,,,,
PRO,0,提升上料轴下降位置P2,BatchAxisP2,-500,,,,,
PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,10000,,,,,
......@@ -22,7 +22,7 @@ PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,400,,,,,
PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,50,,,,,
PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,5000,,,,,
,,,,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,4,COM1,0,,,
AXIS,0,移栽上下轴,UpDown_Axis,4,COM5,0,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴在移栽上下降的位置P2集合,UpDownP2ListP2,0=180000;,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
......@@ -92,10 +92,10 @@ DO,0,FL1阻挡1下降SOL,FL_StopCylinder_Down1,4,PRO_AOI_IP_14,0,FL1阻挡1下降SOL,Y16
DO,0,FL1阻挡2下降SOL,FL_StopCylinder_Down2,5,PRO_AOI_IP_14,0,FL1阻挡2下降SOL,Y166,Y166
DO,0,FL1顶升上升SOL,FL_TopCylinder_Up,6,PRO_AOI_IP_14,0,FL1顶升上升SOL,Y167,Y167
DO,0,FL1顶升下降SOL,FL_TopCylinder_Down,7,PRO_AOI_IP_14,0,FL1顶升下降SOL,Y168,Y168
DO,0,SL2提升伺服刹车ON,SL_UpAxis_BreakOn,8,PRO_AOI_IP_14,0,SL2提升伺服刹车ON,Y169,Y169
DO,0,SL2移载2伺服刹车ON,SL_MoveAxis_BreakOn,9,PRO_AOI_IP_14,0,SL2移载2伺服刹车ON,Y170,Y170
DO,0,SL2提升伺服运转ON,SL_UpAxis_ServoOn,10,PRO_AOI_IP_14,0,SL2提升伺服运转ON,Y171,Y171
DO,0,SL2移载2伺服运转ON,SL_MoveAxis_ServoOn,11,PRO_AOI_IP_14,0,SL2移载2伺服运转ON,Y172,Y172
DO,0,SL2提升伺服刹车ON,BatchAxis_BreakOn,8,PRO_AOI_IP_14,0,SL2提升伺服刹车ON,Y169,Y169
DO,0,SL2移载2伺服刹车ON,UpDownAxis_BreakOn,9,PRO_AOI_IP_14,0,SL2移载2伺服刹车ON,Y170,Y170
DO,0,SL2提升伺服运转ON,BatchAxis_ServoOn,10,PRO_AOI_IP_14,0,SL2提升伺服运转ON,Y171,Y171
DO,0,SL2移载2伺服运转ON,UpDownAxis_ServoOn,11,PRO_AOI_IP_14,0,SL2移载2伺服运转ON,Y172,Y172
DO,0,SL1出料线体运转,SL_OutLine_Run,12,PRO_AOI_IP_14,0,SL1出料线体运转,Y173,Y173
,,,,13,PRO_AOI_IP_14,0,,Y174,Y174
,,,,14,PRO_AOI_IP_14,0,,Y175,Y175
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_3.csv
......@@ -5,9 +5,9 @@ PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,对应的横移模块,SidesWayNum,2,,,,,
PRO,0,是否是用来出料,IsCanOut,0,,,,,
PRO,0,上料流水线入口AGV小车站号名称,AgvInName,D1,,,,,
PRO,0,上料流水线出口AGV小车站号名称,AgvOutName,D2,,,,
PRO,0,上料流水线出口AGV小车站号名称,AgvOutName,D2,,,,,
,,,,,,,,,
AXIS,0,提升上料轴,Batch_Axis,5,COM1,0,,,
AXIS,0,提升上料轴,Batch_Axis,5,COM5,0,,,
PRO,0,提升上料轴上升待机点 P1,BatchAxisP1,10000,,,,,
PRO,0,提升上料轴下降位置P2,BatchAxisP2,-500,,,,,
PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,10000,,,,,
......@@ -22,7 +22,7 @@ PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,400,,,,,
PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,50,,,,,
PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,5000,,,,,
,,,,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,6,COM1,0,,,
AXIS,0,移栽上下轴,UpDown_Axis,6,COM5,0,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴在移栽上下降的位置P2集合,UpDownP2ListP2,0=180000;,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
......@@ -92,10 +92,10 @@ DO,1000,环形线横移2顶升上升SOL,SW2_TopCylinder_Up,4,PRO_AOI_IP_16,0,环形线横移2
DO,1000,环形线横移2顶升下降SOL,SW2_TopCylinder_Down,5,PRO_AOI_IP_16,0,环形线横移2顶升下降SOL,Y206,Y206
DO,1000,环形线横移2定位上升SOL,SW2_LocationCylinder_Up,6,PRO_AOI_IP_16,0,环形线横移2定位上升SOL,Y207,Y207
DO,1000,环形线横移2定位下降SOL,SW2_LocationCylinder_Down,7,PRO_AOI_IP_16,0,环形线横移2定位下降SOL,Y208,Y208
DO,0,SL3提升伺服刹车ON,SL_UpAxis_BreakOn,8,PRO_AOI_IP_16,0,SL3提升伺服刹车ON,Y209,Y209
DO,0,SL3移载3伺服刹车ON,SL_MoveAxis_BreakOn,9,PRO_AOI_IP_16,0,SL3移载3伺服刹车ON,Y210,Y210
DO,0,SL3提升伺服运转ON,SL_UpAxis_ServoOn,10,PRO_AOI_IP_16,0,SL3提升伺服运转ON,Y211,Y211
DO,0,SL3移载3伺服运转ON,SL_MoveAxis_ServoOn,11,PRO_AOI_IP_16,0,SL3移载3伺服运转ON,Y212,Y212
DO,0,SL3提升伺服刹车ON,BatchAxis_BreakOn,8,PRO_AOI_IP_16,0,SL3提升伺服刹车ON,Y209,Y209
DO,0,SL3移载3伺服刹车ON,UpDownAxis_BreakOn,9,PRO_AOI_IP_16,0,SL3移载3伺服刹车ON,Y210,Y210
DO,0,SL3提升伺服运转ON,BatchAxis_ServoOn,10,PRO_AOI_IP_16,0,SL3提升伺服运转ON,Y211,Y211
DO,0,SL3移载3伺服运转ON,UpDownAxis_ServoOn,11,PRO_AOI_IP_16,0,SL3移载3伺服运转ON,Y212,Y212
DO,0,SL3出料线体运转,SL_OutLine_Run,12,PRO_AOI_IP_16,0,SL3出料线体运转,Y213,Y213
,,,,13,PRO_AOI_IP_16,0,,Y214,Y214
,,,,14,PRO_AOI_IP_16,0,,Y215,Y215
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_4.csv
......@@ -5,9 +5,9 @@ PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,对应的横移模块,SidesWayNum,3,,,,,
PRO,0,是否是用来出料,IsCanOut,1,,,,,
PRO,0,上料流水线入口AGV小车站号名称,AgvInName,D7,,,,,
PRO,0,上料流水线出口AGV小车站号名称,AgvOutName,D8,,,,
PRO,0,上料流水线出口AGV小车站号名称,AgvOutName,D8,,,,,
,,,,,,,,,
AXIS,0,提升上料轴,Batch_Axis,7,COM1,0,,,
AXIS,0,提升上料轴,Batch_Axis,7,COM5,0,,,
PRO,0,提升上料轴上升待机点 P1,BatchAxisP1,10000,,,,,
PRO,0,提升上料轴下降位置P2,BatchAxisP2,-500,,,,,
PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,10000,,,,,
......@@ -22,7 +22,7 @@ PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,400,,,,,
PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,50,,,,,
PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,5000,,,,,
,,,,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,8,COM1,0,,,
AXIS,0,移栽上下轴,UpDown_Axis,8,COM5,0,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴在移栽上下降的位置P2集合,UpDownP2ListP2,0=180000;,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
......@@ -92,10 +92,10 @@ DO,1000,环形线横移3顶升上升SOL,SW3_TopCylinder_Up,4,PRO_AOI_IP_18,0,环形线横移3
DO,1000,环形线横移3顶升下降SOL,SW3_TopCylinder_Down,5,PRO_AOI_IP_18,0,环形线横移3顶升下降SOL,Y246,Y246
DO,1000,环形线横移3定位上升SOL,SW3_LocationCylinder_Up,6,PRO_AOI_IP_18,0,环形线横移3定位上升SOL,Y247,Y247
DO,1000,环形线横移3定位下降SOL,SW3_LocationCylinder_Down,7,PRO_AOI_IP_18,0,环形线横移3定位下降SOL,Y248,Y248
DO,0,SL4提升伺服刹车ON,SL_UpAxis_BreakOn,8,PRO_AOI_IP_18,0,SL4提升伺服刹车ON,Y249,Y249
DO,0,SL4移载4伺服刹车ON,SL_MoveAxis_BreakOn,9,PRO_AOI_IP_18,0,SL4移载4伺服刹车ON,Y250,Y250
DO,0,SL4提升伺服运转ON,SL_UpAxis_ServoOn,10,PRO_AOI_IP_18,0,SL4提升伺服运转ON,Y251,Y251
DO,0,SL4移载4伺服运转ON,SL_MoveAxis_ServoOn,11,PRO_AOI_IP_18,0,SL4移载4伺服运转ON,Y252,Y252
DO,0,SL4提升伺服刹车ON,BatchAxis_BreakOn,8,PRO_AOI_IP_18,0,SL4提升伺服刹车ON,Y249,Y249
DO,0,SL4移载4伺服刹车ON,UpDownAxis_BreakOn,9,PRO_AOI_IP_18,0,SL4移载4伺服刹车ON,Y250,Y250
DO,0,SL4提升伺服运转ON,BatchAxis_ServoOn,10,PRO_AOI_IP_18,0,SL4提升伺服运转ON,Y251,Y251
DO,0,SL4移载4伺服运转ON,UpDownAxis_ServoOn,11,PRO_AOI_IP_18,0,SL4移载4伺服运转ON,Y252,Y252
DO,0,SL4出料线体运转,SL_OutLine_Run,12,PRO_AOI_IP_18,0,SL4出料线体运转,Y253,Y253
,,,,13,PRO_AOI_IP_18,0,,Y254,Y254
,,,,14,PRO_AOI_IP_18,0,,Y255,Y255
......
source/DeviceLibrary/LineConfig/Config_ProvidingEquip_1.csv
......@@ -5,7 +5,7 @@ PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,,,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,1,,,,,
,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,15,COM1,0,,,
AXIS,0,移栽上下轴,UpDown_Axis,15,COM5,0,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=180000;,,,,,,
PRO,0,移栽上下轴在出料线下降的位置,UpDownP3List,0=116000;,,,,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
......
source/DeviceLibrary/LineConfig/Config_ProvidingEquip_2.csv
......@@ -5,7 +5,7 @@ PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,,,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,2,,,,,
,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,16,COM1,0,,,
AXIS,0,移栽上下轴,UpDown_Axis,16,COM5,0,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=180000;,,,,,,
PRO,0,移栽上下轴在出料线下降的位置,UpDownP3List,0=116000;,,,,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
......
source/DeviceLibrary/LineConfig/Config_ProvidingEquip_3.csv
......@@ -5,7 +5,7 @@ PRO,0,设备对应的出料流水线的编号,DLineEquipNum,2,,,,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,1,,,,,
,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,9,COM1,0,,,
AXIS,0,移栽上下轴,UpDown_Axis,9,COM5,0,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=180000;,,,,,,
PRO,0,移栽上下轴在出料线下降的位置,UpDownP3List,0=116000;,,,,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
......
source/DeviceLibrary/LineConfig/Config_ProvidingEquip_4.csv
......@@ -5,7 +5,7 @@ PRO,0,设备对应的出料流水线的编号,DLineEquipNum,2,,,,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,2,,,,,
,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,10,COM1,0,,,
AXIS,0,移栽上下轴,UpDown_Axis,10,COM5,0,,,
PRO,0,移栽上下轴在移栽上下降的位置P2,UpDownP2List,0=180000;,,,,,,
PRO,0,移栽上下轴在出料线下降的位置P3,UpDownP3List,0=116000;,,,,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_03.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=180000;,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownP3List,0=116000;,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,11,COM1,0,,,
AXIS,0,移栽上下轴,UpDown_Axis,11,COM5,0,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_04.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=180000;,,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownP3List,0=116000;,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,12,COM1,0,,,
AXIS,0,移栽上下轴,UpDown_Axis,12,COM5,0,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_05.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=180000;,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownP3List,0=116000;,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,13,COM1,0,,,
AXIS,0,移栽上下轴,UpDown_Axis,13,COM5,0,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_06.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=180000;,,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownP3List,0=116000;,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,14,COM1,0,,,
AXIS,0,移栽上下轴,UpDown_Axis,14,COM5,0,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_09.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=180000;,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownP3List,0=116000;,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,17,COM1,0,,,
AXIS,0,移栽上下轴,UpDown_Axis,17,COM5,0,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_10.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=180000;,,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownP3List,0=116000;,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,18,COM1,0,,,
AXIS,0,移栽上下轴,UpDown_Axis,18,COM5,0,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_11.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,0,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=180000;,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownP3List,0=116000;,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM5,1,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_12.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,0,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=180000;,,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownP3List,0=116000;,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM5,1,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_13.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,0,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=180000;,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownP3List,0=116000;,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM5,1,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_14.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,0,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=180000;,,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownP3List,0=116000;,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM5,1,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_15.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,0,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=180000;,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownP3List,0=116000;,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM5,1,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_16.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,0,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=180000;,,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownP3List,0=116000;,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM5,1,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_17.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,0,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=180000;,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownP3List,0=116000;,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM5,1,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_18.csv
......@@ -4,7 +4,7 @@ PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,0,,,,,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=180000;,,,,,,
PRO,0,移栽上下轴在料仓门口下降的位置,UpDownP3List,0=116000;,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM1,1,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM5,1,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,20000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/assemblyLine/LineBean.cs
......@@ -119,20 +119,27 @@ namespace OnlineStore.DeviceLibrary
if (IsDebug)
{
List<int> testDeviceIdList = new List<int>() { 103, 104 };
ioList = new List<string>();
FeedingEquip feed = FeedingEquipMap[103];
ioList.AddRange(feed.Config.IOIPList);
foreach (int id in testDeviceIdList)
{
FeedingEquip feed = FeedingEquipMap[103];
ioList.AddRange(feed.Config.IOIPList);
}
}
Task.Factory.StartNew(delegate
{
IOManager.instance.ConnectionIOList(ioList);
Thread.Sleep(5);
Task.Factory.StartNew(delegate
if (!IsDebug)
{
Task.Factory.StartNew(delegate
{
//连接rfip
RFIDManager.ConnectRFIOList(new List<string>(DeviceConfig.ProRFIpMap.Values));
});
});
}
addLastDI(IO_Type.Airpressure_Check, IOValue(IO_Type.Airpressure_Check));
addLastDI(IO_Type.SuddenStop_BTN, IOValue(IO_Type.SuddenStop_BTN));
addLastDI(IO_Type.Reset_BTN, IOValue(IO_Type.Reset_BTN));
......
source/DeviceLibrary/deviceLibrary/IO/AIOBOX/AIOBOXManager.cs
......@@ -146,13 +146,14 @@ namespace OnlineStore.DeviceLibrary
if (result)
{
LogUtil.info("第【" + i + "】次连接 " + logName + " 成功：" + aioBox.ErrInfo);
Thread.Sleep(10);
//读取所有的DO
ReadAllDI(ioIp, 0);
if (IoIPLIst.Contains(ioIp))
{
IoIPLIst.Remove(ioIp);
}
Thread.Sleep(10);
//读取所有的DO
ReadAllDI(ioIp, 0);
break;
}
else
......@@ -327,7 +328,14 @@ namespace OnlineStore.DeviceLibrary
{
foreach (AIOBOX aio in AIOMap.Values)
{
aio.Close();
try
{
aio.Close();
}
catch (Exception ex)
{
LogUtil.error("aio.Close出错：" + ex.ToString());
}
}
AIOMap.Clear();
}
......
source/DeviceLibrary/deviceLibrary/PanasonicServo/ACServerManager_Partial.cs
......@@ -149,9 +149,10 @@ namespace OnlineStore.DeviceLibrary
else
{
int ret= bean.SendCommand(data, ref returnData, outTime, reviceLength);
string rDataStr = AcSerialBean.ByteToString(returnData);
if (!ret.Equals(reviceLength))
{
LogUtil.error("串口" + portName + " 写入数据：" + strSend + "，预计返回字节数【"+reviceLength+"】实际返回【"+ret+"】");
LogUtil.error("串口" + portName + " 写入数据：" + strSend + "，预计返回字节数【"+reviceLength+"】实际返回【"+ret+"】【"+rDataStr+"】");
}
System.Threading.Thread.Sleep(2);
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!