Skip to content

李娜 / SO664-AssemblyLine

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

界面调整

1 个父辈 90c6b431
全部展开
内嵌 并排
正在显示 17 个修改的文件 包含 154 行增加 和 138 行删除
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
......@@ -149,7 +149,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(685, 408);
this.groupBox1.Location = new System.Drawing.Point(685, 404);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(568, 107);
this.groupBox1.TabIndex = 105;
......@@ -386,9 +386,9 @@
this.SL_TrayLocation_After.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_TrayLocation_After.Location = new System.Drawing.Point(183, 339);
this.SL_TrayLocation_After.Name = "SL_TrayLocation_After";
this.SL_TrayLocation_After.Size = new System.Drawing.Size(140, 34);
this.SL_TrayLocation_After.Size = new System.Drawing.Size(153, 34);
this.SL_TrayLocation_After.TabIndex = 282;
this.SL_TrayLocation_After.Text = "升降盘定位气缸后退";
this.SL_TrayLocation_After.Text = "升降盘定位气缸后退<<";
this.SL_TrayLocation_After.UseVisualStyleBackColor = false;
this.SL_TrayLocation_After.Click += new System.EventHandler(this.SL_TrayLocation_After_Click);
//
......@@ -529,9 +529,9 @@
this.SL_TrayLocation_Before.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_TrayLocation_Before.Location = new System.Drawing.Point(20, 339);
this.SL_TrayLocation_Before.Name = "SL_TrayLocation_Before";
this.SL_TrayLocation_Before.Size = new System.Drawing.Size(140, 34);
this.SL_TrayLocation_Before.Size = new System.Drawing.Size(153, 34);
this.SL_TrayLocation_Before.TabIndex = 255;
this.SL_TrayLocation_Before.Text = "升降盘定位气缸前进";
this.SL_TrayLocation_Before.Text = "升降盘定位气缸前进>>";
this.SL_TrayLocation_Before.UseVisualStyleBackColor = false;
this.SL_TrayLocation_Before.Click += new System.EventHandler(this.btnTrayLocationCylinder_Click);
//
......@@ -1065,7 +1065,7 @@
this.btnBP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBP3.Size = new System.Drawing.Size(163, 34);
this.btnBP3.TabIndex = 312;
this.btnBP3.Text = "上料目标位置P3";
this.btnBP3.Text = "上料目标点P3";
this.btnBP3.UseVisualStyleBackColor = true;
this.btnBP3.Click += new System.EventHandler(this.btnBP3_Click);
//
......@@ -1122,7 +1122,7 @@
this.btnBP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBP1.Size = new System.Drawing.Size(163, 34);
this.btnBP1.TabIndex = 307;
this.btnBP1.Text = "上升待机位置P1：";
this.btnBP1.Text = "上升待机点P1：";
this.btnBP1.UseVisualStyleBackColor = true;
this.btnBP1.Click += new System.EventHandler(this.btnBP1_Click);
//
......@@ -1138,7 +1138,7 @@
this.btnBP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBP2.Size = new System.Drawing.Size(163, 34);
this.btnBP2.TabIndex = 306;
this.btnBP2.Text = "下降点位置P2";
this.btnBP2.Text = "下降固定料串点P2";
this.btnBP2.UseVisualStyleBackColor = true;
this.btnBP2.Click += new System.EventHandler(this.btnBP2_Click);
//
......@@ -1207,7 +1207,7 @@
this.btnUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP3.Size = new System.Drawing.Size(163, 34);
this.btnUpdownP3.TabIndex = 311;
this.btnUpdownP3.Text = "移栽升降轴取料位置P3：";
this.btnUpdownP3.Text = "升降轴取料点P3：";
this.btnUpdownP3.UseVisualStyleBackColor = true;
this.btnUpdownP3.Click += new System.EventHandler(this.btnUpdownP3_Click);
//
......@@ -1250,7 +1250,7 @@
this.btnMoveToP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMoveToP1.Size = new System.Drawing.Size(163, 34);
this.btnMoveToP1.TabIndex = 307;
this.btnMoveToP1.Text = "移栽升降轴待机位置P1：";
this.btnMoveToP1.Text = "升降轴待机点P1：";
this.btnMoveToP1.UseVisualStyleBackColor = true;
this.btnMoveToP1.Click += new System.EventHandler(this.button3_Click);
//
......@@ -1289,7 +1289,7 @@
this.btnMoveto.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMoveto.Size = new System.Drawing.Size(163, 34);
this.btnMoveto.TabIndex = 306;
this.btnMoveto.Text = "托盘放料位置P2";
this.btnMoveto.Text = "托盘放料点P2";
this.btnMoveto.UseVisualStyleBackColor = true;
this.btnMoveto.Click += new System.EventHandler(this.btnMoveto_Click);
//
......
source/AssemblyLineClient/FrmFeedingEquip.cs
......@@ -420,7 +420,7 @@ namespace OnlineStore.AssemblyLine
int size = 0;
try { size = Convert.ToInt32(cmbSizeList.Text); } catch (Exception ex) { }
txtSizePosition.Text = equipBean.Config.GetUpdownP2(size).ToString();
btnMoveto.Text = size + "mm盘放料位置P2 :";
btnMoveto.Text = size + "mm盘托盘放料点P2 :";
}
private void btnMoveto_Click(object sender, EventArgs e)
......
source/AssemblyLineClient/FrmHYEquip.Designer.cs
......@@ -733,7 +733,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, 96);
this.lblMoveInfo.Location = new System.Drawing.Point(16, 94);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(68, 17);
this.lblMoveInfo.TabIndex = 280;
......@@ -904,7 +904,7 @@
this.btnP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnP3.Size = new System.Drawing.Size(163, 34);
this.btnP3.TabIndex = 312;
this.btnP3.Text = "出料皮带线位置P3";
this.btnP3.Text = "接驳台放料点P3";
this.btnP3.UseVisualStyleBackColor = true;
this.btnP3.Click += new System.EventHandler(this.btnBoxP_Click);
//
......@@ -961,7 +961,7 @@
this.btnMoveToP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMoveToP1.Size = new System.Drawing.Size(163, 34);
this.btnMoveToP1.TabIndex = 307;
this.btnMoveToP1.Text = "移栽升降轴待机位置P1：";
this.btnMoveToP1.Text = "升降轴待机点P1：";
this.btnMoveToP1.UseVisualStyleBackColor = true;
this.btnMoveToP1.Click += new System.EventHandler(this.btnMoveToP1_Click);
//
......@@ -1000,7 +1000,7 @@
this.btnP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnP2.Size = new System.Drawing.Size(163, 34);
this.btnP2.TabIndex = 306;
this.btnP2.Text = "移栽位置P2";
this.btnP2.Text = "托盘取料点P2";
this.btnP2.UseVisualStyleBackColor = true;
this.btnP2.Click += new System.EventHandler(this.btnMoveto_Click);
//
......
source/AssemblyLineClient/FrmHYEquip.cs
......@@ -378,8 +378,8 @@ namespace OnlineStore.AssemblyLine
try { size = Convert.ToInt32(cmbSizeList.Text); } catch (Exception ex) { }
txtP2.Text = equipBean.Config.GetUpdownP2(size).ToString();
txtP3.Text = equipBean.Config.GetUpdownP3(size).ToString();
btnP2.Text = size + "mm盘移栽位置P2 :";
btnP3.Text = size + "mm盘出料皮带线位置P3 :";
btnP2.Text = size + "mm盘托盘取料点P2 :";
btnP3.Text = size + "mm盘接驳台放料点P3 :";
}
private void btnSave_Click(object sender, EventArgs e)
......
source/AssemblyLineClient/FrmIOTest.cs
......@@ -40,13 +40,13 @@ namespace OnlineStore.AssemblyLine
lblDO.Text = "";
foreach (ConfigIO ioValue in DIList)
{
lblDI.Text+= ioValue.ElectricalDefinition + "_" + ioValue.Explain +"_"+ioValue.ProName+"\r\n";
lblDI.Text+= ioValue.DisplayStr + "\r\n";
}
foreach (ConfigIO ioValue in DOList)
{
lblDO.Text += ioValue.ElectricalDefinition + "_" + ioValue.Explain + "_" + ioValue.ProName + "\r\n";
lblDO.Text += ioValue.DisplayStr + "\r\n";
}
if (LineManager.Line.HYEquipMap.ContainsKey(subType))
......
source/AssemblyLineClient/FrmLineIO.cs
......@@ -65,8 +65,8 @@ namespace OnlineStore.AssemblyLine
count = 19;
tableLayoutPanel2.RowStyles.Clear();
this.tableLayoutPanel2.RowCount = count;
this.tableLayoutPanel4.RowStyles.Clear();
this.tableLayoutPanel4.RowCount = count;
//this.tableLayoutPanel4.RowStyles.Clear();
//this.tableLayoutPanel4.RowCount = count;
roleindex = 0;
foreach (ConfigIO ioValue in LineManager.Config.DOList.Values)
{
......@@ -74,8 +74,8 @@ namespace OnlineStore.AssemblyLine
control.Click += Control_Click;
if (roleindex >= count)
{
this.tableLayoutPanel4.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
this.tableLayoutPanel4.Controls.Add(control, 0, roleindex - count);
//this.tableLayoutPanel4.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
//this.tableLayoutPanel4.Controls.Add(control, 0, roleindex - count);
}
else
{
......@@ -109,7 +109,7 @@ namespace OnlineStore.AssemblyLine
if ( this.Visible)
{
ReadIOList();
// lblTrayNum.Text = "托盘编码：" + TrayManager.GetTrayNum(0);
lblMoveInfo.Text = LineManager.Line.GetMoveStr();
}
}
......@@ -272,24 +272,13 @@ namespace OnlineStore.AssemblyLine
}
}
private void btnDriveMotor_Run_Click(object sender, EventArgs e)
{
if (btnDriveMotor_Run.Text.Equals("驱动电机正转"))
{
btnDriveMotor_Run.Text = "驱动电机停止";
btnDriveMotor_Run.BackColor = Color.Aqua;
LineManager.Line.WriteDrivetMotorRun(IO_VALUE.HIGH);
}
else
{
LineManager.Line.WriteDrivetMotorRun(IO_VALUE.LOW);
btnDriveMotor_Run.Text = "驱动电机正转";
btnDriveMotor_Run.BackColor = Color.White;
}
{
LineManager.Line.WriteDrivetMotorRun(IO_VALUE.HIGH);
}
private void btnSWRun_Click(object sender, EventArgs e)
{
BtnMove(btnTopDown, "T3-C1顶升上升", "T3-C1顶升下降", IO_Type.HY_TopCylinder_Down,IO_Type.HY_TopCylinder_Up );
LineManager.Line.CylinderMove(null, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
}
......@@ -306,6 +295,17 @@ namespace OnlineStore.AssemblyLine
private void btn34Top_Click(object sender, EventArgs e)
{
BtnMove(btnStopDown, "T3-C1前阻挡上升", "T3-C1前阻挡下降", IO_Type.HY_StopDown);
}
}
private void button2_Click(object sender, EventArgs e)
{
LineManager.Line.CylinderMove(null, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
}
private void btnLineStop_Click(object sender, EventArgs e)
{
LineManager.Line.WriteDrivetMotorRun(IO_VALUE.LOW);
}
}
}
source/AssemblyLineClient/FrmLineStore.cs
......@@ -119,14 +119,18 @@ namespace OnlineStore.AssemblyLine
Application.Exit();
return;
}
//Task.Factory.StartNew(delegate {
LoadStoreData();
//} );
this.Opacity = 100;
this.Visible = true;
this.WindowState = FormWindowState.Maximized;
this.notifyIcon1.Visible = false;
this.ShowInTaskbar = true;
tabControl1.TabPages.Remove(tabPage4);
tabControl1.TabPages.Remove(tabPage5);
timer1.Start();
}
......@@ -498,10 +502,7 @@ namespace OnlineStore.AssemblyLine
return;
}
string canScanCode = "";
//if (lineBean.lineStatus.Equals(LineStatus.StoreOnline) && lineBean.runStatus.Equals(LineRunStatus.Runing))
//{
// //canScanCode = lineBean.CanScanCode() ? "（可扫码入库）" : "（出库未完成，不可扫码入库）";
if (AgvClient.CurrCancelState)
{
aGVCancelStateToolStripMenuItem.Text = gouStr + " AGV cancelState";
......@@ -514,7 +515,6 @@ namespace OnlineStore.AssemblyLine
string time = LineManager.Line.alarmType.Equals(LineAlarmType.None) ? "" : LineManager.Line.LastAlarmTime.ToLongTimeString();
string warnMsg = LineManager.Line.WarnMsg.Equals("") ? "" : time + LineManager.Line.WarnMsg + "\r\n";
lblMoveInfo.Text = LineManager.Line.GetMoveStr();
if (TrayManager.TrayErrorMsg.Equals("").Equals(false))
{
warnMsg += TrayManager.TrayErrorMsg + "\r\n";
......@@ -535,66 +535,68 @@ namespace OnlineStore.AssemblyLine
}
}
}
lblWarnMsg.Text = warnMsg;
int i = 0;
int item_debug_index = 1;
int item_alarm_index = 2;
int item_runStr_index = 3;
int item_cid_index = 4;
int item_SAlarmType_index = 6;
int item_LastMsgTime_index = 5;
int item_BoxStr_index = 7;
foreach (MoveEquip move in lineBean.MoveEquipMap.Values)
if (listView1.Visible)
{
ListViewItem lvi = new ListViewItem();
lvi.Text = move.Name;
SetItemText(i, item_debug_index, move.Config.IsDebug.Equals(1) ? "✘" : "✔");
SetItemText(i, item_alarm_index, move.alarmType.ToString());
SetItemText(i, item_runStr_index, move.GetRunStr());
BoxInfo box = LineServer.GetBoxInfo(move.DeviceID);
if (box != null)
lblWarnMsg.Text = warnMsg;
int i = 0;
int item_debug_index = 1;
int item_alarm_index = 2;
int item_runStr_index = 3;
int item_cid_index = 4;
int item_SAlarmType_index = 6;
int item_LastMsgTime_index = 5;
int item_BoxStr_index = 7;
foreach (MoveEquip move in lineBean.MoveEquipMap.Values)
{
SetItemText(i, item_cid_index, box.CId.ToString());
string online = "✘";
if ((DateTime.Now - box.LastMsgTime).TotalSeconds < LineServer.ClientKeepSecond)
ListViewItem lvi = new ListViewItem();
lvi.Text = move.Name;
SetItemText(i, item_debug_index, move.Config.IsDebug.Equals(1) ? "✘" : "✔");
SetItemText(i, item_alarm_index, move.alarmType.ToString());
SetItemText(i, item_runStr_index, move.GetRunStr());
BoxInfo box = LineServer.GetBoxInfo(move.DeviceID);
if (box != null)
{
online = "✔";
SetItemText(i, item_cid_index, box.CId.ToString());
string online = "✘";
if ((DateTime.Now - box.LastMsgTime).TotalSeconds < LineServer.ClientKeepSecond)
{
online = "✔";
}
SetItemText(i, item_LastMsgTime_index, online);
SetItemText(i, item_SAlarmType_index, box.SAlarmType.ToString());
SetItemText(i, item_BoxStr_index, box.ToShowStr());
}
else
{
SetItemText(i, item_cid_index, "");
SetItemText(i, item_LastMsgTime_index, "");
SetItemText(i, item_SAlarmType_index, "");
SetItemText(i, item_BoxStr_index, "");
}
SetItemText(i, item_LastMsgTime_index, online);
SetItemText(i, item_SAlarmType_index, box.SAlarmType.ToString());
SetItemText(i, item_BoxStr_index, box.ToShowStr());
SetItemColor(i, move.GetShowColor());
i++;
}
else
i++;
foreach (FeedingEquip equip in lineBean.FeedingEquipMap.Values)
{
SetItemText(i, item_cid_index, "");
SetItemText(i, item_LastMsgTime_index, "");
SetItemText(i, item_SAlarmType_index, "");
SetItemText(i, item_BoxStr_index, "");
SetItemText(i, item_debug_index, equip.Config.IsDebug.Equals(1) ? "✘" : "✔");
SetItemText(i, item_alarm_index, equip.alarmType.ToString());
SetItemText(i, item_runStr_index, equip.GetRunStr());
SetItemColor(i, equip.GetShowColor());
i++;
}
SetItemColor(i, move.GetShowColor());
i++;
}
i++;
foreach (FeedingEquip equip in lineBean.FeedingEquipMap.Values)
{
SetItemText(i, item_debug_index, equip.Config.IsDebug.Equals(1) ? "✘" : "✔");
SetItemText(i, item_alarm_index, equip.alarmType.ToString());
SetItemText(i, item_runStr_index, equip.GetRunStr());
SetItemColor(i, equip.GetShowColor());
i++;
}
i++;
foreach (HYEquipBase equip in lineBean.HYEquipMap.Values)
{
SetItemText(i, item_debug_index, equip.IsDebug.Equals(1) ? "✘" : "✔");
SetItemText(i, item_alarm_index, equip.alarmType.ToString());
SetItemText(i, item_runStr_index, equip.GetRunStr());
SetItemColor(i, equip.GetShowColor());
foreach (HYEquipBase equip in lineBean.HYEquipMap.Values)
{
SetItemText(i, item_debug_index, equip.IsDebug.Equals(1) ? "✘" : "✔");
SetItemText(i, item_alarm_index, equip.alarmType.ToString());
SetItemText(i, item_runStr_index, equip.GetRunStr());
SetItemColor(i, equip.GetShowColor());
i++;
}
i++;
}
i++;
if (lineBean.runStatus > LineRunStatus.Wait)
{
......
source/AssemblyLineClient/FrmMoveEquip.Designer.cs
......@@ -42,9 +42,9 @@
this.StopDown2 = new System.Windows.Forms.Button();
this.StopDown1 = new System.Windows.Forms.Button();
this.ClampCylinder_Relax = new System.Windows.Forms.Button();
this.UpDownCylinder_Up = new System.Windows.Forms.Button();
this.BeforeAfterCylinder_Before = new System.Windows.Forms.Button();
this.TopCylinder_Up = new System.Windows.Forms.Button();
this.UpDownCylinder_Up = new System.Windows.Forms.Button();
this.chbDebug = new System.Windows.Forms.CheckBox();
this.lblThisSta = new System.Windows.Forms.Label();
this.lblStoreStatus = new System.Windows.Forms.Label();
......@@ -367,7 +367,7 @@
this.UpDownCylinder_Down.Name = "UpDownCylinder_Down";
this.UpDownCylinder_Down.Size = new System.Drawing.Size(120, 34);
this.UpDownCylinder_Down.TabIndex = 260;
this.UpDownCylinder_Down.Text = "↓ 升降下降";
this.UpDownCylinder_Down.Text = "升降下降 ↓ ";
this.UpDownCylinder_Down.UseVisualStyleBackColor = false;
this.UpDownCylinder_Down.Click += new System.EventHandler(this.button4_Click);
//
......@@ -380,7 +380,7 @@
this.TopCylinder_Down.Name = "TopCylinder_Down";
this.TopCylinder_Down.Size = new System.Drawing.Size(120, 34);
this.TopCylinder_Down.TabIndex = 259;
this.TopCylinder_Down.Text = "↓ 顶升下降";
this.TopCylinder_Down.Text = "顶升下降 ↓ ";
this.TopCylinder_Down.UseVisualStyleBackColor = false;
this.TopCylinder_Down.Click += new System.EventHandler(this.TopCylinder_Down_Click);
//
......@@ -423,19 +423,6 @@
this.ClampCylinder_Relax.UseVisualStyleBackColor = false;
this.ClampCylinder_Relax.Click += new System.EventHandler(this.btnClampSlack_Click);
//
// UpDownCylinder_Up
//
this.UpDownCylinder_Up.BackColor = System.Drawing.Color.White;
this.UpDownCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.UpDownCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.UpDownCylinder_Up.Location = new System.Drawing.Point(524, 30);
this.UpDownCylinder_Up.Name = "UpDownCylinder_Up";
this.UpDownCylinder_Up.Size = new System.Drawing.Size(120, 34);
this.UpDownCylinder_Up.TabIndex = 252;
this.UpDownCylinder_Up.Text = "↑ 升降上升";
this.UpDownCylinder_Up.UseVisualStyleBackColor = false;
this.UpDownCylinder_Up.Click += new System.EventHandler(this.btnUpDownUp_Click);
//
// BeforeAfterCylinder_Before
//
this.BeforeAfterCylinder_Before.BackColor = System.Drawing.Color.White;
......@@ -458,10 +445,23 @@
this.TopCylinder_Up.Name = "TopCylinder_Up";
this.TopCylinder_Up.Size = new System.Drawing.Size(120, 34);
this.TopCylinder_Up.TabIndex = 246;
this.TopCylinder_Up.Text = "↑ 顶升上升";
this.TopCylinder_Up.Text = "顶升上升 ↑ ";
this.TopCylinder_Up.UseVisualStyleBackColor = false;
this.TopCylinder_Up.Click += new System.EventHandler(this.btnTopUp_Click);
//
// UpDownCylinder_Up
//
this.UpDownCylinder_Up.BackColor = System.Drawing.Color.White;
this.UpDownCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.UpDownCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.UpDownCylinder_Up.Location = new System.Drawing.Point(524, 30);
this.UpDownCylinder_Up.Name = "UpDownCylinder_Up";
this.UpDownCylinder_Up.Size = new System.Drawing.Size(120, 34);
this.UpDownCylinder_Up.TabIndex = 252;
this.UpDownCylinder_Up.Text = "升降上升 ↑ ";
this.UpDownCylinder_Up.UseVisualStyleBackColor = false;
this.UpDownCylinder_Up.Click += new System.EventHandler(this.btnUpDownUp_Click);
//
// chbDebug
//
this.chbDebug.AutoSize = true;
......@@ -481,7 +481,7 @@
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(147, 58);
this.lblThisSta.Location = new System.Drawing.Point(147, 68);
this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(511, 62);
this.lblThisSta.TabIndex = 246;
......@@ -602,9 +602,9 @@
this.lblInoutInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblInoutInfo.ForeColor = System.Drawing.Color.Green;
this.lblInoutInfo.Location = new System.Drawing.Point(16, 16);
this.lblInoutInfo.Location = new System.Drawing.Point(16, 19);
this.lblInoutInfo.Name = "lblInoutInfo";
this.lblInoutInfo.Size = new System.Drawing.Size(642, 40);
this.lblInoutInfo.Size = new System.Drawing.Size(637, 40);
this.lblInoutInfo.TabIndex = 281;
this.lblInoutInfo.Text = "当前出入库：";
//
......@@ -613,7 +613,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(14, 58);
this.lblMoveInfo.Location = new System.Drawing.Point(14, 63);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(68, 17);
this.lblMoveInfo.TabIndex = 280;
......@@ -626,9 +626,9 @@
this.lblInstoreList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblInstoreList.ForeColor = System.Drawing.Color.Green;
this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblInstoreList.Location = new System.Drawing.Point(149, 123);
this.lblInstoreList.Location = new System.Drawing.Point(149, 139);
this.lblInstoreList.Name = "lblInstoreList";
this.lblInstoreList.Size = new System.Drawing.Size(507, 139);
this.lblInstoreList.Size = new System.Drawing.Size(507, 119);
this.lblInstoreList.TabIndex = 277;
this.lblInstoreList.Click += new System.EventHandler(this.lblInstoreList_Click);
//
......@@ -794,7 +794,7 @@
this.btnP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnP3.Size = new System.Drawing.Size(154, 34);
this.btnP3.TabIndex = 312;
this.btnP3.Text = "料仓门口位置P3";
this.btnP3.Text = "仓门取放点P3";
this.btnP3.UseVisualStyleBackColor = true;
this.btnP3.Click += new System.EventHandler(this.btnBoxP_Click);
//
......@@ -850,7 +850,7 @@
this.btnMoveToP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMoveToP1.Size = new System.Drawing.Size(154, 34);
this.btnMoveToP1.TabIndex = 307;
this.btnMoveToP1.Text = "移栽升降轴待机位置P1：";
this.btnMoveToP1.Text = "升降轴待机点P1：";
this.btnMoveToP1.UseVisualStyleBackColor = true;
this.btnMoveToP1.Click += new System.EventHandler(this.button3_Click);
//
......@@ -889,7 +889,7 @@
this.btnP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnP2.Size = new System.Drawing.Size(154, 34);
this.btnP2.TabIndex = 306;
this.btnP2.Text = "移栽位置P2";
this.btnP2.Text = "托盘移栽点P2";
this.btnP2.UseVisualStyleBackColor = true;
this.btnP2.Click += new System.EventHandler(this.btnMoveto_Click);
//
......
source/AssemblyLineClient/FrmMoveEquip.cs
......@@ -402,8 +402,8 @@ namespace OnlineStore.AssemblyLine
try { size = Convert.ToInt32(cmbSizeList.Text); } catch (Exception ex) { }
txtP2.Text = equipBean.Config.GetUpdownP2(size).ToString();
txtP3.Text = equipBean.Config.GetUpdownP3(size).ToString();
btnP2.Text = size + "mm盘移栽位置 :";
btnP3.Text = size + "mm盘料仓门口位置 :";
btnP2.Text = size + "mm盘托盘移栽点P2 :";
btnP3.Text = size + "mm盘仓门取放点P3 :";
// btnMoveto.Text = "尺mm" + size + "对应位置：";
}
......
source/DeviceLibrary/LineConfig/Config_Line.csv
类型,分类编号,说明,名称,属性值,设备名称,电器定义
类型,分类编号,说明,名称,属性值,设备名称,电器定义
PRO,0,当多久没操作时流水线休眠（秒）,Sleep_MSeconds,600,,
PRO,0,气压检测信号关闭需要持续的时间,AirCheckSeconds,600,,
PRO,0,IO信号超时时间（秒）,IOSingle_TimerOut,15,,
......
source/DeviceLibrary/LineConfig/HY/Config_HYEquip.csv
......@@ -4,9 +4,9 @@ PRO,0,是否使用伺服,UpDownUseAxis,0,,
,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,100,HC,,250,1000,1000,60,80,50,10,100,0,0
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,-11000,,
PRO,0,移栽上下轴托盘取料位置P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,,
PRO,0,移栽上下轴接驳台放料位置P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,,
PRO,0,移栽上下轴托盘取料详细位置P2,UpDownP2DetialList,0X0=8000;,,
PRO,0,移栽上下轴托盘取料点P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,,
PRO,0,移栽上下轴接驳台放料点P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,,
PRO,0,移栽上下轴托盘取料详细点P2,UpDownP2DetialList,0X0=8000;,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
......
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_10.csv
......@@ -4,9 +4,9 @@ PRO,0,是否使用伺服,UpDownUseAxis,1,,
,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,100,HC,,250,1000,1000,60,80,50,10,100,0,0
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,-11000,,
PRO,0,移栽上下轴托盘取料位置P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,,
PRO,0,移栽上下轴接驳台放料位置P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,,
PRO,0,移栽上下轴托盘取料详细位置P2,UpDownP2DetialList,0X0=8000;,,
PRO,0,移栽上下轴托盘取料点P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,,
PRO,0,移栽上下轴接驳台放料点P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,,
PRO,0,移栽上下轴托盘取料详细点P2,UpDownP2DetialList,0X0=8000;,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_12.csv
......@@ -4,9 +4,10 @@ PRO,0,是否使用伺服,UpDownUseAxis,1,,
,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,100,HC,,250,1000,1000,60,80,50,10,100,0,0
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,-11000,,
PRO,0,移栽上下轴托盘取料位置P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,,
PRO,0,移栽上下轴接驳台放料位置P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,,
PRO,0,移栽上下轴托盘取料详细位置P2,UpDownP2DetialList,0X0=8000;,,
PRO,0,移栽上下轴托盘取料点P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,,
PRO,0,移栽上下轴接驳台放料点P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,,
PRO,0,移栽上下轴托盘取料详细点P2,UpDownP2DetialList,0X0=8000;,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_17.csv
......@@ -4,9 +4,9 @@ PRO,0,是否使用伺服,UpDownUseAxis,1,,
,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,100,HC,,250,1000,1000,60,80,50,10,100,0,0
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,-11000,,
PRO,0,移栽上下轴托盘取料位置P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,,
PRO,0,移栽上下轴接驳台放料位置P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,,
PRO,0,移栽上下轴托盘取料详细位置P2,UpDownP2DetialList,0X0=8000;,,
PRO,0,移栽上下轴托盘取料点P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,,
PRO,0,移栽上下轴接驳台放料点P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,,
PRO,0,移栽上下轴托盘取料详细点P2,UpDownP2DetialList,0X0=8000;,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/LoadCVSLibrary/FileEncoding.cs
......@@ -8,7 +8,20 @@ namespace OnlineStore.LoadCSVLibrary
{
public class FileEncoding
{
public static string[] GetFileLines(string filePath)
{
if (!File.Exists(filePath))
{
return new string[] { };
}
Encoding encoding = Encoding.UTF8;
if (!FileEncoding.GetType(filePath).Equals(Encoding.UTF8))
{
encoding = Encoding.GetEncoding("gb2312");
}
string[] lines = File.ReadAllLines(filePath, encoding);
return lines;
}
/// <summary>
/// 给定文件的路径，读取文件的二进制数据，判断文件的编码类型
/// </summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!