Skip to content

孙克 / RC1250-AssemblyLine

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

1

1 个父辈 1454cbb8
全部展开
内嵌 并排
正在显示 9 个修改的文件 包含 85 行增加 和 30 行删除
source/AssemblyLineClient/App.config
......@@ -28,7 +28,7 @@
<!--二维码类型列表配置，用#分割，一维码=Barcode 二维码： QR Code#Data Matrix ECC 200#Micro QR Code-->
<add key="CodeType" value="QR Code" />
<!--<add key="CodeType" value="Data Matrix ECC 200"/>-->
<add key="ACBaudRate" value="115200" />
<add key="ACBaudRate" value="19200" />
<!--二维码参数文件所在路径，文件名与二维码类型名一样-->
<add key="CodeParamPath" value="\CodeParam\" />
<add key="Config_Pwd" value="123456" />
......
source/AssemblyLineClient/FrmFeedingEquip.cs
......@@ -221,7 +221,7 @@ namespace OnlineStore.AssemblyLine
cmbSizeList.SelectedIndex = 0;
lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.lineStatus, equipBean.runStatus);
lblThisSta.Text = equipBean.WarnMsg;
txtP1.Text = equipBean.Config.BatchAxisP1.ToString();
txtP1.Text = equipBean.Config.UpDownAxisP1.ToString();
if (equipBean.Config.SidesWayNum > 0)
{
......
source/AssemblyLineClient/FrmIOStatus.Designer.cs
......@@ -53,12 +53,15 @@
this.btnSW4Run = new System.Windows.Forms.Button();
this.btnDriveMotor_Run = new System.Windows.Forms.Button();
this.panel1 = new System.Windows.Forms.Panel();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox5.SuspendLayout();
this.panel1.SuspendLayout();
this.groupBox6.SuspendLayout();
this.SuspendLayout();
//
// timer1
......@@ -78,7 +81,7 @@
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.cmbWriteIO);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(738, 5);
this.groupBox1.Location = new System.Drawing.Point(984, 5);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(343, 154);
this.groupBox1.TabIndex = 105;
......@@ -198,7 +201,7 @@
this.chbAutoRead.Checked = true;
this.chbAutoRead.CheckState = System.Windows.Forms.CheckState.Checked;
this.chbAutoRead.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRead.Location = new System.Drawing.Point(22, 681);
this.chbAutoRead.Location = new System.Drawing.Point(22, 457);
this.chbAutoRead.Name = "chbAutoRead";
this.chbAutoRead.Size = new System.Drawing.Size(75, 21);
this.chbAutoRead.TabIndex = 244;
......@@ -211,9 +214,9 @@
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(490, 5);
this.groupBox4.Location = new System.Drawing.Point(492, 5);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(240, 868);
this.groupBox4.Size = new System.Drawing.Size(240, 644);
this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表";
......@@ -231,7 +234,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, 848);
this.tableLayoutPanel2.Size = new System.Drawing.Size(229, 624);
this.tableLayoutPanel2.TabIndex = 103;
//
// groupBox3
......@@ -241,7 +244,7 @@
this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(6, 5);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(240, 868);
this.groupBox3.Size = new System.Drawing.Size(240, 644);
this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表";
......@@ -259,7 +262,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, 848);
this.tableLayoutPanel1.Size = new System.Drawing.Size(229, 624);
this.tableLayoutPanel1.TabIndex = 102;
//
// groupBox2
......@@ -267,9 +270,9 @@
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox2.Controls.Add(this.tableLayoutPanel3);
this.groupBox2.Location = new System.Drawing.Point(248, 5);
this.groupBox2.Location = new System.Drawing.Point(249, 5);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(240, 868);
this.groupBox2.Size = new System.Drawing.Size(240, 644);
this.groupBox2.TabIndex = 245;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "DI列表";
......@@ -286,7 +289,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, 848);
this.tableLayoutPanel3.Size = new System.Drawing.Size(229, 624);
this.tableLayoutPanel3.TabIndex = 102;
//
// groupBox5
......@@ -310,9 +313,9 @@
this.groupBox5.Controls.Add(this.btnNGCylinder);
this.groupBox5.Controls.Add(this.btnSW4Run);
this.groupBox5.Controls.Add(this.btnDriveMotor_Run);
this.groupBox5.Location = new System.Drawing.Point(738, 165);
this.groupBox5.Location = new System.Drawing.Point(984, 165);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(343, 708);
this.groupBox5.Size = new System.Drawing.Size(343, 484);
this.groupBox5.TabIndex = 246;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "IO操作测试";
......@@ -514,6 +517,7 @@
// panel1
//
this.panel1.AutoScroll = true;
this.panel1.Controls.Add(this.groupBox6);
this.panel1.Controls.Add(this.groupBox4);
this.panel1.Controls.Add(this.groupBox3);
this.panel1.Controls.Add(this.groupBox5);
......@@ -522,14 +526,42 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1384, 881);
this.panel1.Size = new System.Drawing.Size(1342, 657);
this.panel1.TabIndex = 248;
//
// groupBox6
//
this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox6.Controls.Add(this.tableLayoutPanel4);
this.groupBox6.Location = new System.Drawing.Point(735, 5);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(240, 644);
this.groupBox6.TabIndex = 105;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "DO列表";
//
// tableLayoutPanel4
//
this.tableLayoutPanel4.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.tableLayoutPanel4.AutoScroll = true;
this.tableLayoutPanel4.ColumnCount = 1;
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel4.Location = new System.Drawing.Point(5, 14);
this.tableLayoutPanel4.Name = "tableLayoutPanel4";
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, 624);
this.tableLayoutPanel4.TabIndex = 103;
//
// FrmIOStatus
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1384, 881);
this.ClientSize = new System.Drawing.Size(1342, 657);
this.Controls.Add(this.panel1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
......@@ -547,6 +579,7 @@
this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout();
this.panel1.ResumeLayout(false);
this.groupBox6.ResumeLayout(false);
this.ResumeLayout(false);
}
......@@ -589,6 +622,8 @@
private System.Windows.Forms.Button btnSw1Location;
private System.Windows.Forms.Button btnSw1Top;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.GroupBox groupBox6;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
}
}
source/AssemblyLineClient/FrmIOStatus.cs
......@@ -33,7 +33,7 @@ namespace OnlineStore.AssemblyLine
Dictionary<string, IOTextControl> DOControlList = new Dictionary<string, IOTextControl>();
private void LoadIOList()
{
int count = 30;
int count = 16;
int roleindex = 0;
this.tableLayoutPanel1.RowStyles.Clear();
this.tableLayoutPanel1.RowCount = count;
......@@ -65,14 +65,23 @@ namespace OnlineStore.AssemblyLine
}
tableLayoutPanel2.RowStyles.Clear();
this.tableLayoutPanel2.RowCount = LineManager.Config.DOList.Count;
this.tableLayoutPanel2.RowCount = count;
this.tableLayoutPanel4.RowStyles.Clear();
this.tableLayoutPanel4.RowCount = count;
roleindex = 0;
foreach (ConfigIO ioValue in LineManager.Config.DOList.Values)
{
this.tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain,ioValue.ProName);
if (roleindex >= count)
{
this.tableLayoutPanel4.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
this.tableLayoutPanel4.Controls.Add(control, 0, roleindex - count);
}
else
{
this.tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
this.tableLayoutPanel2.Controls.Add(control, 0, roleindex);
}
roleindex++;
DOControlList.Add(ioValue.ProName, control);
}
......
source/DeviceLibrary/assemblyLine/LineBean.cs
......@@ -735,6 +735,8 @@ namespace OnlineStore.DeviceLibrary
SideWayTimerProcess();
CodeProcess();
}
}
catch (Exception ex)
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
......@@ -58,15 +58,16 @@ namespace OnlineStore.DeviceLibrary
return true;
}
}
}return false;
}
internal bool DLineStopOut(int dlineId,int LineNum)
return false;
}
internal bool DLineStopOut(int dlineId, int LineNum)
{
foreach (DischargeLine line in DisLineMap.Values)
{
if ((line.DeviceID % 100).Equals(dlineId))
{
if (LineNum.Equals(1)&&line.MoveInfo.MoveType.Equals(LineMoveType.OutStore))
if (LineNum.Equals(1) && line.MoveInfo.MoveType.Equals(LineMoveType.OutStore))
{
line.MoveInfo.EndMove();
}
......@@ -146,7 +147,7 @@ namespace OnlineStore.DeviceLibrary
{
LogUtil.info(Name + "清理信号超时报警【" + WarnMsg + "】 ");
alarmType = LineAlarmType.None;
SetWarnMsg( "");
SetWarnMsg("");
}
}
}
......@@ -182,7 +183,7 @@ namespace OnlineStore.DeviceLibrary
continue;
}
NotOkMsg = wait.ToStr();
if (wait.WaitType .Equals(WaitEnum.W002_IOValue))
if (wait.WaitType.Equals(WaitEnum.W002_IOValue))
{
NotOkMsg = " (" + Config.GetDisplayName(wait.IoType) + "=" + wait.IoValue + ") ";
wait.IsEnd = IOValue(wait.IoType).Equals(wait.IoValue);
......@@ -196,7 +197,7 @@ namespace OnlineStore.DeviceLibrary
ConfigIO io = Config.getWaitIO(wait.IoType);
WarnMsg = Name + " 等待" + NotOkMsg + "超时";
Alarm(LineAlarmType.IoSingleTimeOut );
Alarm(LineAlarmType.IoSingleTimeOut);
LogUtil.error(checkWaitInfo.Name + "：" + checkWaitInfo.MoveStep + "等待" + NotOkMsg + "超时", 14);
isOk = false;
......@@ -249,7 +250,7 @@ namespace OnlineStore.DeviceLibrary
{
WarnMsg = checkWaitInfo.Name + "[" + checkWaitInfo.MoveStep + "][" + NotOkMsg + "]已等待[" + Math.Round(span.TotalSeconds, 1) + "]秒";
LogUtil.error(WarnMsg, 100);
Alarm(LineAlarmType.IoSingleTimeOut );
Alarm(LineAlarmType.IoSingleTimeOut);
}
}
catch (Exception ex)
......@@ -259,7 +260,13 @@ namespace OnlineStore.DeviceLibrary
}
#endregion
#region 扫码处理
private void CodeProcess()
{
}
#endregion
#region 出库
......@@ -432,8 +439,8 @@ namespace OnlineStore.DeviceLibrary
{
if (IOValue(IO_Type.SW4_TrayCheck).Equals(IO_VALUE.HIGH) && IOValue(IO_Type.SW1_TrayCheck).Equals(IO_VALUE.LOW)&&
TrayManager.CanMoveSidesWay(4)&&TrayManager.CanMoveSidesWay(1))
if (IOValue(IO_Type.SW4_TrayCheck).Equals(IO_VALUE.HIGH) && IOValue(IO_Type.SW1_TrayCheck).Equals(IO_VALUE.LOW) &&
TrayManager.CanMoveSidesWay(4) && TrayManager.CanMoveSidesWay(1))
{
TimeSpan span12 = DateTime.Now - SideWay41Ntime;
if (SideWay41IsWait && span12.TotalSeconds > 1)
......
source/DeviceLibrary/deviceLibrary/PanasonicServo/ACServerManager_Partial.cs
......@@ -215,9 +215,11 @@ namespace OnlineStore.DeviceLibrary
else
{
int ret = bean.SendCommand(data, ref returnData, outTime, reviceLength);
if (!ret.Equals(reviceLength))
{
LogUtil.error("串口" + portName + " 写入数据：" + strSend + "，预计返回字节数【" + reviceLength + "】实际返回【" + ret + "】");
string datastr = AcSerialBean.ByteToString(returnData);
LogUtil.error("串口" + portName + " 写入数据：" + strSend + "，预计返回字节数【" + reviceLength + "】实际返回【" + ret + "】:"+ datastr);
}
else
{
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!