Skip to content

李娜 / SO664-AssemblyLine

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

界面调整

1 个父辈 fd0b3169
全部展开
内嵌 并排
正在显示 65 个修改的文件 包含 1320 行增加 和 425 行删除
source/AssemblyLineClient/App.config
......@@ -13,13 +13,13 @@
<!--storeType-->
<add key="Line_moveEquip_count" value="24" />
<add key="Line_feedingEquip_count" value="5" />
<add key="Line_providingEquip_count" value="4" />
<add key="Line_dischargeLine_count" value="2" />
<add key="Line_HYEquip_count" value="21" />
<!--<add key="Line_dischargeLine_count" value="2" />-->
<!--start one store config-->
<add key="ConfigPath_Line" value="\LineConfig\Config_Line.csv" />
<add key="ConfigPath_MoveEquip" value="\LineConfig\MoveEquip\Config_MoveEquip.csv" />
<add key="ConfigPath_FeedingEquip" value="\LineConfig\Config_FeedingEquip.csv" />
<add key="ConfigPath_ProvidingEquip" value="\LineConfig\Config_ProvidingEquip.csv" />
<add key="ConfigPath_HYEquip" value="\LineConfig\HY\Config_HYEquip.csv" />
<add key="ConfigPath_DischargeLine" value="\LineConfig\Config_DischargeLine.csv" />
<add key="Line_Type" value="Line" />
<add key="Line_CID" value="rc1250" />
......
source/AssemblyLineClient/AssemblyLineClient.csproj
......@@ -104,6 +104,12 @@
<Compile Include="FrmIOStatus.Designer.cs">
<DependentUpon>FrmIOStatus.cs</DependentUpon>
</Compile>
<Compile Include="FrmHYEquip.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmHYEquip.Designer.cs">
<DependentUpon>FrmHYEquip.cs</DependentUpon>
</Compile>
<Compile Include="FrmRFIPEdit.cs">
<SubType>Form</SubType>
</Compile>
......@@ -122,24 +128,12 @@
<Compile Include="FrmBase.Designer.cs">
<DependentUpon>FrmBase.cs</DependentUpon>
</Compile>
<Compile Include="FrmDischargeLine.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmDischargeLine.Designer.cs">
<DependentUpon>FrmDischargeLine.cs</DependentUpon>
</Compile>
<Compile Include="FrmEquipBase.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmEquipBase.Designer.cs">
<DependentUpon>FrmEquipBase.cs</DependentUpon>
</Compile>
<Compile Include="FrmProvidingEquip.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmProvidingEquip.Designer.cs">
<DependentUpon>FrmProvidingEquip.cs</DependentUpon>
</Compile>
<Compile Include="FrmFeedingEquip.cs">
<SubType>Form</SubType>
</Compile>
......@@ -179,6 +173,12 @@
<Compile Include="ManagerUtil.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="useControl\EquipControl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="useControl\EquipControl.Designer.cs">
<DependentUpon>EquipControl.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="agvtest\FrmAgvTest.resx">
<DependentUpon>FrmAgvTest.cs</DependentUpon>
</EmbeddedResource>
......@@ -188,6 +188,9 @@
<EmbeddedResource Include="FrmIOStatus.resx">
<DependentUpon>FrmIOStatus.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmHYEquip.resx">
<DependentUpon>FrmHYEquip.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmRFIPEdit.resx">
<DependentUpon>FrmRFIPEdit.cs</DependentUpon>
</EmbeddedResource>
......@@ -197,15 +200,9 @@
<EmbeddedResource Include="FrmBase.resx">
<DependentUpon>FrmBase.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmDischargeLine.resx">
<DependentUpon>FrmDischargeLine.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmEquipBase.resx">
<DependentUpon>FrmEquipBase.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmProvidingEquip.resx">
<DependentUpon>FrmProvidingEquip.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmFeedingEquip.resx">
<DependentUpon>FrmFeedingEquip.cs</DependentUpon>
</EmbeddedResource>
......@@ -234,6 +231,9 @@
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="useControl\EquipControl.resx">
<DependentUpon>EquipControl.cs</DependentUpon>
</EmbeddedResource>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
......
source/AssemblyLineClient/FrmFeedingEquip.cs
......@@ -35,7 +35,7 @@ namespace OnlineStore.AssemblyLine
private void LoadIOList()
{
int maxCount = 16;
int maxCount = 20;
int roleindex = 0;
this.tableLayoutPanel1.RowStyles.Clear();
this.tableLayoutPanel1.RowCount = maxCount;
......@@ -288,7 +288,8 @@ namespace OnlineStore.AssemblyLine
txtBp1.Text = equipBean.Config.BatchAxisP1.ToString();
txtBP2.Text = equipBean.Config.BatchAxisP2.ToString();
txtBP3.Text = equipBean.Config.BatchAxisP3.ToString();
lblName.Text = equipBean.Name;
lblName.Text = equipBean.Name;
this.Text = equipBean.Name;
chbBoxSendShelf.Visible = equipBean.Config.IsCanOut.Equals(1);
chbBoxSendShelf.Checked = equipBean.OutEndSendShelfOut;
IsLoad = true;
......@@ -749,6 +750,11 @@ namespace OnlineStore.AssemblyLine
}
}
private void btnClose_Click(object sender, EventArgs e)
{
this.Close();
}
}
}
......
source/AssemblyLineClient/FrmProvidingEquip.Designer.cs → source/AssemblyLineClient/FrmHYEquip.Designer.cs
namespace OnlineStore.AssemblyLine
{
partial class FrmProvidingEquip
partial class FrmHYEquip
{
/// <summary>
/// 必需的设计器变量。
......@@ -16,7 +16,7 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmProvidingEquip));
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmHYEquip));
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.txtDOIndex = new System.Windows.Forms.TextBox();
......@@ -502,7 +502,7 @@
this.tabControl1.Location = new System.Drawing.Point(5, 62);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1307, 466);
this.tabControl1.Size = new System.Drawing.Size(1173, 545);
this.tabControl1.TabIndex = 257;
//
// tabPage1
......@@ -577,7 +577,7 @@
this.tabPage2.Controls.Add(this.axisMoveControl1);
this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(1299, 436);
this.tabPage2.Size = new System.Drawing.Size(1165, 515);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "伺服调试";
this.tabPage2.UseVisualStyleBackColor = true;
......@@ -592,7 +592,7 @@
this.groupDetial.Controls.Add(this.label2);
this.groupDetial.Controls.Add(this.cmbDSize);
this.groupDetial.Controls.Add(this.label1);
this.groupDetial.Location = new System.Drawing.Point(753, 179);
this.groupDetial.Location = new System.Drawing.Point(577, 180);
this.groupDetial.Name = "groupDetial";
this.groupDetial.Size = new System.Drawing.Size(537, 205);
this.groupDetial.TabIndex = 318;
......@@ -705,7 +705,7 @@
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.btnP2);
this.groupBox2.Controls.Add(this.txtP2);
this.groupBox2.Location = new System.Drawing.Point(753, 5);
this.groupBox2.Location = new System.Drawing.Point(577, 6);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(538, 168);
this.groupBox2.TabIndex = 219;
......@@ -840,10 +840,10 @@
//
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(6, 5);
this.axisMoveControl1.Location = new System.Drawing.Point(5, 3);
this.axisMoveControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(744, 349);
this.axisMoveControl1.Size = new System.Drawing.Size(566, 427);
this.axisMoveControl1.TabIndex = 0;
//
// panel1
......@@ -859,7 +859,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(1306, 58);
this.panel1.Size = new System.Drawing.Size(1172, 58);
this.panel1.TabIndex = 258;
//
// lblName
......@@ -871,20 +871,20 @@
this.lblName.Name = "lblName";
this.lblName.Size = new System.Drawing.Size(180, 40);
this.lblName.TabIndex = 259;
this.lblName.Text = "出料流水线";
this.lblName.Text = "HY";
this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// FrmProvidingEquip
// FrmHYEquip
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1318, 532);
this.ClientSize = new System.Drawing.Size(1184, 611);
this.Controls.Add(this.panel1);
this.Controls.Add(this.tabControl1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "FrmProvidingEquip";
this.Name = "FrmHYEquip";
this.Text = "出料移栽——";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmTest_FormClosing);
this.Load += new System.EventHandler(this.FrmStoreIOStatus_Load);
......
source/AssemblyLineClient/FrmProvidingEquip.cs → source/AssemblyLineClient/FrmHYEquip.cs
......@@ -20,11 +20,11 @@ using OnlineStore.Common;
namespace OnlineStore.AssemblyLine
{
internal partial class FrmProvidingEquip : FrmEquipBase
internal partial class FrmHYEquip : FrmEquipBase
{
private bool IsLoad = false;
private ProvidingEquip equipBean;
internal FrmProvidingEquip(ProvidingEquip moveEquip)
private HYEquipBase equipBean;
internal FrmHYEquip(HYEquipBase moveEquip)
{
equipBase = moveEquip;
this.equipBean = moveEquip;
......@@ -61,6 +61,7 @@ namespace OnlineStore.AssemblyLine
lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.lineStatus, equipBean.runStatus);
lblThisSta.Text = equipBean.WarnMsg;
lblName.Text = equipBean.Name;
this.Text = equipBean.Name;
txtP1.Text = equipBean.Config.UpDownAxisP1.ToString();
IsLoad = true;
}
......@@ -299,7 +300,7 @@ namespace OnlineStore.AssemblyLine
{
equipBean.IsDebug = true;
equipBean.Config.IsDebug = 1;
LineManager.SaveProvidingEquipConfig(equipBean.Config);
LineManager.SaveHYEquipConfig(equipBean.Config);
equipBean.ChangeDebug(true);
LogUtil.info(equipBean.Name+ "用户切换到调试状态 ");
}
......@@ -314,7 +315,7 @@ namespace OnlineStore.AssemblyLine
{
equipBean.IsDebug = false;
equipBean.Config.IsDebug = 0;
LineManager.SaveProvidingEquipConfig(equipBean.Config);
LineManager.SaveHYEquipConfig(equipBean.Config);
equipBean.ChangeDebug(false);
LogUtil.info(equipBean.Name + "用户切换到正常工作状态 ");
}
......@@ -337,11 +338,11 @@ namespace OnlineStore.AssemblyLine
private void btnStop1Up_Click(object sender, EventArgs e)
{
BtnMove(btnStop1Up, "阻挡1下降", "阻挡1上升", IO_Type.StopCylinder_Down1);
BtnMove(btnStop1Up, "阻挡1下降", "阻挡1上升", IO_Type.StopDown1);
}
private void btnStop2Up_Click(object sender, EventArgs e)
{
BtnMove(btnStop2Up, "阻挡2下降", "阻挡2上升", IO_Type.StopCylinder_Down2);
BtnMove(btnStop2Up, "阻挡2下降", "阻挡2上升", IO_Type.StopDown2);
}
private void btnTopUp_Click(object sender, EventArgs e)
......@@ -351,14 +352,14 @@ namespace OnlineStore.AssemblyLine
private void btnBeforeAfterBefore_Click(object sender, EventArgs e)
{
if (equipBean.CanBeforeAfter())
{
BtnMove(btnBeforeAfterBefore, "横移前进", "横移后退", IO_Type.BeforeAfterCylinder_After, IO_Type.BeforeAfterCylinder_Before);
}
else
{
MessageBox.Show("升降气缸不在上升端 或 升降轴不在待机点P1", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
//if (equipBean.CanBeforeAfter())
//{
// BtnMove(btnBeforeAfterBefore, "横移前进", "横移后退", IO_Type.BeforeAfterCylinder_After, IO_Type.BeforeAfterCylinder_Before);
//}
//else
//{
// MessageBox.Show("升降气缸不在上升端 或 升降轴不在待机点P1", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
//}
}
private void btnUpDownUp_Click(object sender, EventArgs e)
......@@ -367,7 +368,7 @@ namespace OnlineStore.AssemblyLine
}
private void btnClampSlack_Click(object sender, EventArgs e)
{
BtnMove(btnClampSlack, "夹料夹紧", "夹料放松", IO_Type.ClampCylinder_Tighten, IO_Type.ClampCylinder_Slack);
BtnMove(btnClampSlack, "夹料夹紧", "夹料放松", IO_Type.ClampCylinder_Relax, IO_Type.ClampCylinder_Work);
}
private void btnCloseAll_Click(object sender, EventArgs e)
{
......@@ -440,7 +441,7 @@ namespace OnlineStore.AssemblyLine
int sizeBoxP = FormUtil.GetIntValue(txtP3);
equipBean.Config.UpdateUpdownP2(size, sizePosition);
equipBean.Config.UpdateUpdownP3(size, sizeBoxP);
LineManager.SaveProvidingEquipConfig(equipBean.Config);
LineManager.SaveHYEquipConfig(equipBean.Config);
MessageBox.Show("保存成功！");
}
......@@ -478,7 +479,7 @@ namespace OnlineStore.AssemblyLine
if (result.Equals(DialogResult.OK))
{
equipBean.Config.UpdateUpdownP2Detial(size, height, position);
LineManager.SaveProvidingEquipConfig(equipBean.Config);
LineManager.SaveHYEquipConfig(equipBean.Config);
LogUtil.info(equipBean.Name + "用户操作：尺寸：" + size + "，高度：" + height + "，P2值：" + position + "，保存成功");
MessageBox.Show("保存成功！");
......
source/AssemblyLineClient/FrmIOTest.Designer.cs
......@@ -52,9 +52,9 @@
this.groupBox2.Controls.Add(this.label3);
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.comboBox2);
this.groupBox2.Location = new System.Drawing.Point(589, 4);
this.groupBox2.Location = new System.Drawing.Point(617, 4);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(657, 564);
this.groupBox2.Size = new System.Drawing.Size(684, 564);
this.groupBox2.TabIndex = 291;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "设备IO列表对比";
......@@ -63,7 +63,7 @@
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.Location = new System.Drawing.Point(282, 48);
this.label3.Location = new System.Drawing.Point(313, 47);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(31, 17);
this.label3.TabIndex = 293;
......@@ -73,7 +73,7 @@
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.Location = new System.Drawing.Point(23, 48);
this.label4.Location = new System.Drawing.Point(23, 47);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(31, 17);
this.label4.TabIndex = 292;
......@@ -98,7 +98,7 @@
this.groupBox1.Controls.Add(this.comboBox1);
this.groupBox1.Location = new System.Drawing.Point(4, 4);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(579, 564);
this.groupBox1.Size = new System.Drawing.Size(606, 564);
this.groupBox1.TabIndex = 290;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "设备IO列表";
......@@ -107,7 +107,7 @@
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(282, 47);
this.label2.Location = new System.Drawing.Point(313, 47);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(31, 17);
this.label2.TabIndex = 291;
......
source/AssemblyLineClient/FrmIOTest.cs
......@@ -40,13 +40,13 @@ namespace OnlineStore.AssemblyLine
label2.Text = "";
foreach (ConfigIO ioValue in DIList)
{
label1.Text+= ioValue.ElectricalDefinition + "_" + ioValue.Explain +"\r\n";
label1.Text+= ioValue.ElectricalDefinition + "_" + ioValue.Explain +"_"+ioValue.ProName+"\r\n";
}
foreach (ConfigIO ioValue in DOList)
{
label2.Text += ioValue.ElectricalDefinition + "_" + ioValue.Explain + "\r\n";
label2.Text += ioValue.ElectricalDefinition + "_" + ioValue.Explain + "_" + ioValue.ProName + "\r\n";
}
this.SuspendLayout(); //此处为不闪屏，一定要有的！
}
......@@ -62,13 +62,13 @@ namespace OnlineStore.AssemblyLine
label4.Text = "";
foreach (ConfigIO ioValue in DIList)
{
label4.Text += ioValue.ElectricalDefinition + "_" + ioValue.Explain + "\r\n";
label4.Text += ioValue.ElectricalDefinition + "_" + ioValue.Explain + "_" + ioValue.ProName + "\r\n";
}
foreach (ConfigIO ioValue in DOList)
{
label3.Text += ioValue.ElectricalDefinition + "_" + ioValue.Explain + "\r\n";
label3.Text += ioValue.ElectricalDefinition + "_" + ioValue.Explain + "_" + ioValue.ProName + "\r\n";
}
this.SuspendLayout(); //此处为不闪屏，一定要有的！
}
......
source/AssemblyLineClient/FrmMoveEquip.cs
......@@ -57,6 +57,7 @@ namespace OnlineStore.AssemblyLine
lblThisSta.Text = equipBean.WarnMsg;
txtP1.Text = equipBean.Config.UpDownAxisP1.ToString();
lblName.Text = equipBean.Name;
this.Text = equipBean.Name;
LoadDP2();
IsLoad = true;
}
......@@ -372,11 +373,11 @@ namespace OnlineStore.AssemblyLine
private void btnStop1Up_Click(object sender, EventArgs e)
{
BtnMove(btnStop1Up, "阻挡1下降", "阻挡1上升", IO_Type.StopCylinder_Down1);
BtnMove(btnStop1Up, "阻挡1下降", "阻挡1上升", IO_Type.StopDown1);
}
private void btnStop2Up_Click(object sender, EventArgs e)
{
BtnMove(btnStop2Up, "阻挡2下降", "阻挡2上升", IO_Type.StopCylinder_Down2);
BtnMove(btnStop2Up, "阻挡2下降", "阻挡2上升", IO_Type.StopDown2);
}
private void btnTopUp_Click(object sender, EventArgs e)
......@@ -402,7 +403,7 @@ namespace OnlineStore.AssemblyLine
}
private void btnClampSlack_Click(object sender, EventArgs e)
{
BtnMove(btnClampSlack, "夹料夹紧", "夹料放松", IO_Type.ClampCylinder_Tighten, IO_Type.ClampCylinder_Slack);
BtnMove(btnClampSlack, "夹料夹紧", "夹料放松", IO_Type.ClampCylinder_Relax, IO_Type.ClampCylinder_Work);
}
private void cmbSizeList_SelectedIndexChanged(object sender, EventArgs e)
......@@ -591,6 +592,11 @@ namespace OnlineStore.AssemblyLine
}
}
private void btnClose_Click(object sender, EventArgs e)
{
this.Close();
}
}
}
......
source/AssemblyLineClient/FrmRFIPEdit.cs
......@@ -28,8 +28,7 @@ namespace OnlineStore.AssemblyLine
{
comboxType.Items.Clear();
foreach (EquipBase b in LineManager.Line.AllEquipMap.Values)
{
if (b.baseConfig.DType.Equals(DeviceType.DischargeLine)) { continue; }
{
string key = b.Name + "-托盘RF";
string value = RFIDManager.GetRFIP(b.DeviceID);
rfMap.Add(key, value);
......
source/AssemblyLineClient/useControl/EquipControl.Designer.cs 0 → 100644
namespace OnlineStore.AssemblyLine
{
partial class EquipControl
{
/// <summary>
/// 必需的设计器变量。
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// 清理所有正在使用的资源。
/// </summary>
/// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region 组件设计器生成的代码
/// <summary>
/// 设计器支持所需的方法 - 不要修改
/// 使用代码编辑器修改此方法的内容。
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.lblTrayNum = new System.Windows.Forms.Label();
this.lblName = new System.Windows.Forms.Label();
this.lblStatus = new System.Windows.Forms.Label();
this.lblMoveInfo = new System.Windows.Forms.Label();
this.lblDebug = new System.Windows.Forms.Label();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.lblBox = new System.Windows.Forms.Label();
this.panName = new System.Windows.Forms.Panel();
this.panName.SuspendLayout();
this.SuspendLayout();
//
// lblTrayNum
//
this.lblTrayNum.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.lblTrayNum.AutoSize = true;
this.lblTrayNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTrayNum.ForeColor = System.Drawing.Color.Black;
this.lblTrayNum.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblTrayNum.Location = new System.Drawing.Point(185, 35);
this.lblTrayNum.Name = "lblTrayNum";
this.lblTrayNum.Size = new System.Drawing.Size(56, 17);
this.lblTrayNum.TabIndex = 0;
this.lblTrayNum.Text = "托盘号：";
this.lblTrayNum.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// lblName
//
this.lblName.BackColor = System.Drawing.Color.Transparent;
this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblName.ForeColor = System.Drawing.Color.Black;
this.lblName.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblName.Location = new System.Drawing.Point(3, 2);
this.lblName.Name = "lblName";
this.lblName.Size = new System.Drawing.Size(182, 22);
this.lblName.TabIndex = 1;
this.lblName.Text = "移栽D1-1_1";
this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// lblStatus
//
this.lblStatus.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblStatus.AutoSize = true;
this.lblStatus.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblStatus.ForeColor = System.Drawing.Color.Black;
this.lblStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblStatus.Location = new System.Drawing.Point(3, 29);
this.lblStatus.Name = "lblStatus";
this.lblStatus.Size = new System.Drawing.Size(56, 17);
this.lblStatus.TabIndex = 2;
this.lblStatus.Text = "暂未启动";
this.lblStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// lblMoveInfo
//
this.lblMoveInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.ForeColor = System.Drawing.Color.Black;
this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblMoveInfo.Location = new System.Drawing.Point(3, 50);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(68, 17);
this.lblMoveInfo.TabIndex = 3;
this.lblMoveInfo.Text = "暂无出入库";
this.lblMoveInfo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// lblDebug
//
this.lblDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.lblDebug.AutoSize = true;
this.lblDebug.BackColor = System.Drawing.Color.Transparent;
this.lblDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblDebug.Location = new System.Drawing.Point(183, 4);
this.lblDebug.Name = "lblDebug";
this.lblDebug.Size = new System.Drawing.Size(51, 20);
this.lblDebug.TabIndex = 5;
this.lblDebug.Text = "启用：";
//
// lblBox
//
this.lblBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblBox.BackColor = System.Drawing.Color.LightGray;
this.lblBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblBox.ForeColor = System.Drawing.Color.Black;
this.lblBox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblBox.Location = new System.Drawing.Point(2, 75);
this.lblBox.Name = "lblBox";
this.lblBox.Size = new System.Drawing.Size(247, 24);
this.lblBox.TabIndex = 6;
this.lblBox.Text = "BOX状态：";
this.lblBox.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// panName
//
this.panName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panName.BackColor = System.Drawing.Color.Lime;
this.panName.Controls.Add(this.lblDebug);
this.panName.Controls.Add(this.lblName);
this.panName.Location = new System.Drawing.Point(1, 1);
this.panName.Name = "panName";
this.panName.Size = new System.Drawing.Size(248, 28);
this.panName.TabIndex = 7;
//
// EquipControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.Color.LightGreen;
this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.Controls.Add(this.panName);
this.Controls.Add(this.lblBox);
this.Controls.Add(this.lblMoveInfo);
this.Controls.Add(this.lblStatus);
this.Controls.Add(this.lblTrayNum);
this.Name = "EquipControl";
this.Size = new System.Drawing.Size(250, 100);
this.Load += new System.EventHandler(this.EquipControl_Load);
this.panName.ResumeLayout(false);
this.panName.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Label lblTrayNum;
private System.Windows.Forms.Label lblName;
private System.Windows.Forms.Label lblStatus;
private System.Windows.Forms.Label lblMoveInfo;
private System.Windows.Forms.Label lblDebug;
private System.Windows.Forms.ToolTip toolTip1;
private System.Windows.Forms.Label lblBox;
private System.Windows.Forms.Panel panName;
}
}
source/AssemblyLineClient/useControl/EquipControl.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using OnlineStore.DeviceLibrary;
namespace OnlineStore.AssemblyLine
{
public partial class EquipControl : UserControl
{
public string TrayNum
{
get { return lblTrayNum.Text; }
set { lblTrayNum.Text = value; }
}
public string EquipName
{
get { return lblName.Text; }
set { lblName.Text = value; }
}
public string WorkStatus
{
get { return lblStatus.Text; }
set { lblStatus.Text = value; }
}
public string MoveInfo
{
get { return lblMoveInfo.Text; }
set { lblMoveInfo.Text = value; }
}
public Color ColorStatus
{
get { return this.BackColor; }
set
{
this.BackColor = value;
}
}
public void InitData(EquipBase equip)
{
if (equip is MoveEquip)
{
panName.BackColor = Color.DeepSkyBlue;
lblBox.Visible = true;
lblBox.Text = "";
}
else if (equip is FeedingEquip)
{
panName.BackColor = Color.Lime;
lblBox.Visible = false ;
lblBox.Text = "";
}
else
{
panName.BackColor = Color.Aqua;
lblBox.Visible = false ;
lblBox.Text = "";
}
DeviceId = equip.DeviceID;
lblName.Text = equip.Name;
}
public int DeviceId = 0;
public void ShowData(EquipBase equip)
{
lblTrayNum.Text ="托盘："+equip.currTrayNum;
lblStatus.Text = equip.GetRunStr();
toolTip1.ToolTipTitle = ""+equip.Name+"：双击进入";
lblDebug.Text = "启用：" + (equip.IsDebug ? "✘" : "✔");
if (equip.DeviceID < 200)
{
if (equip.MoveInfo.MoveType.Equals(LineMoveType.InStore))
{
lblMoveInfo.Text = "入库中：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode;
}
else if (equip.MoveInfo.MoveType.Equals(LineMoveType.OutStore))
{
lblMoveInfo.Text = "出库中：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode;
}
else
{
lblMoveInfo.Text = "暂无出入库";
}
if (equip.DeviceID < 100)
{
BoxInfo box = LineServer.GetBoxInfo(equip.DeviceID);
string online = "✘";
if (box != null)
{
//lvi.SubItems.Add(box.CId.ToString());
//lvi.SubItems.Add(online);
//lvi.SubItems.Add(box.SAlarmType.ToString());
//lvi.SubItems.Add(box.ToShowStr());
if ((DateTime.Now - box.LastMsgTime).TotalSeconds < LineServer.ClientKeepSecond)
{
online = "✔";
}
if (box.SAlarmType.Equals(LineAlarm.None))
{
lblBox.Text = "BOX[" + box.CId.ToString() + "]：" + online +" "+ box.ToShowStr();
lblBox.BackColor = Color.Green;
}
else
{
lblBox.Text = "BOX[" + box.CId.ToString() + "]：" + online + " " + box.ToShowStr();
lblBox.BackColor = Color.Red;
}
}
else
{
lblBox.Text = "BOX状态：" + online;
lblBox.BackColor = Color.Gray;
}
}
}
else
{
lblMoveInfo.Text = "暂无托盘横移";
}
SetItemColor(equip.runStatus, equip.alarmType);
}
public EquipControl()
{
InitializeComponent();
}
private void SetItemColor( LineRunStatus runStatus, LineAlarmType alarmType)
{
if (runStatus.Equals(LineRunStatus.Wait))
{
this.BackColor= Color.White ;
}
else if (alarmType.Equals(LineAlarmType.IoSingleTimeOut))
{
this.BackColor = Color.LightCoral;
}
else if (alarmType.Equals(LineAlarmType.None).Equals(false))
{
this.BackColor = Color.Red;
}
else if (runStatus.Equals(LineRunStatus.HomeMoving) || runStatus.Equals(LineRunStatus.Reset))
{
this.BackColor = Color.Orange;
}
else if (runStatus.Equals(LineRunStatus.Busy))
{
this.BackColor = Color.LimeGreen;
}
else if (runStatus.Equals(LineRunStatus.Runing))
{
this.BackColor = Color.LightBlue;
}
}
private void EquipControl_Load(object sender, EventArgs e)
{
//lblName.Text = "";
//lblTrayNum.Text = "";
//lblStatus.Text = "";
//lblMoveInfo.Text = "";
}
public static EquipControl NewControl(EquipBase equip)
{
EquipControl control = new EquipControl();
control.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)));
control.BackColor = System.Drawing.SystemColors.Control;
control.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
control.ColorStatus = System.Drawing.SystemColors.Control;
control.EquipName = "";
control.Location = new System.Drawing.Point(3, 3);
control.MoveInfo = "";
control.Name = "EquipControl" + equip.DeviceID;
control.Size = new System.Drawing.Size(270, 91);
control.TabIndex = 0;
control.TrayNum = "";
control.WorkStatus = "";
control.EquipName = equip.Name;
control.DeviceId = equip.DeviceID;
control.InitData(equip);
control.ShowData(equip);
return control;
}
}
}
source/AssemblyLineClient/useControl/EquipControl.resx 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>
\ No newline at end of file
source/Common/Setting_Init.cs
......@@ -28,14 +28,14 @@ namespace OnlineStore.Common
public static string Line_moveEquip_count = "Line_moveEquip_count";
public static string Line_feedingEquip_count = "Line_feedingEquip_count";
public static string Line_providingEquip_count = "Line_providingEquip_count";
public static string Line_HYEquip_count = "Line_HYEquip_count";
public static string Line_Type = "Line_Type";
public static string ConfigPath_Line = "ConfigPath_Line";
public static string ConfigPath_MoveEquip = "ConfigPath_MoveEquip";
public static string ConfigPath_FeedingEquip = "ConfigPath_FeedingEquip";
public static string ConfigPath_ProvidingEquip = "ConfigPath_ProvidingEquip";
public static string ConfigPath_HYEquip = "ConfigPath_HYEquip";
/// <summary>
/// 摄像机名称，多个中间使用#分割
/// </summary>
......
source/DeviceLibrary/DeviceLibrary.csproj
......@@ -66,15 +66,13 @@
<ItemGroup>
<Compile Include="agvClient\AgvClient.cs" />
<Compile Include="assemblyLine\FeedingEquip_OutStore.cs" />
<Compile Include="assemblyLine\HY\HYEquipBase.cs" />
<Compile Include="assemblyLine\HY\HY_OutLine.cs" />
<Compile Include="assemblyLine\HY\HY_C1Line.cs" />
<Compile Include="assemblyLine\LineBean_Shunt2.cs" />
<Compile Include="assemblyLine\LineBean_Shunt.cs" />
<Compile Include="assemblyLine\OutTrayLineBean.cs" />
<Compile Include="assemblymanager\ALineManager.cs" />
<Compile Include="assemblyLine\DischargeLine.cs" />
<Compile Include="assemblyLine\DischargeLine_Partial.cs" />
<Compile Include="assemblyLine\ProvidingEquip_Partial.cs" />
<Compile Include="assemblyLine\FeedingEquip_InStore.cs" />
<Compile Include="assemblyLine\ProvidingEquip.cs" />
<Compile Include="assemblyLine\FeedingEquip.cs" />
<Compile Include="assemblymanager\RFIDManagercs.cs" />
<Compile Include="assemblymanager\SServerManager.cs" />
......@@ -98,6 +96,7 @@
<Compile Include="deviceLibrary\AXIS\PanasonicServo\ACServerManager.cs" />
<Compile Include="deviceLibrary\AXIS\PanasonicServo\ACServerManager_Partial.cs" />
<Compile Include="assemblyLine\EquipBase.cs" />
<Compile Include="assemblyLine\HY\HY_Coveryor.cs" />
<Compile Include="model\LineAlarm.cs">
<SubType>Code</SubType>
</Compile>
......@@ -161,19 +160,70 @@
<None Include="LineConfig\Config_DischargeLine_1.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\Config_ProvidingEquip_1.csv">
<None Include="LineConfig\HY\Config_HYEquip_01.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\Config_DischargeLine_2.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\Config_ProvidingEquip_2.csv">
<None Include="LineConfig\HY\Config_HYEquip_02.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\Config_ProvidingEquip_3.csv">
<None Include="LineConfig\HY\Config_HYEquip_03.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\Config_ProvidingEquip_4.csv">
<None Include="LineConfig\HY\Config_HYEquip_05.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\HY\Config_HYEquip_06.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\HY\Config_HYEquip_07.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\HY\Config_HYEquip_08.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\HY\Config_HYEquip_09.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\HY\Config_HYEquip_10.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\HY\Config_HYEquip_11.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\HY\Config_HYEquip_12.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\HY\Config_HYEquip_13.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\HY\Config_HYEquip_14.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\HY\Config_HYEquip_15.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\HY\Config_HYEquip_16.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\HY\Config_HYEquip_17.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\HY\Config_HYEquip_18.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\HY\Config_HYEquip_19.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\HY\Config_HYEquip_20.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\HY\Config_HYEquip_21.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\HY\Config_HYEquip_04.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\MoveEquip\Config_MoveEquip_01.csv">
......
source/DeviceLibrary/LineConfig/Config_ProvidingEquip_1.csv deleted 100644 → 0
类型,分类编号,说明,名称,属性值,设备名称,电器定义
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,对应的横移模块,SidesWayNum,0,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,1,,
,,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,
AXIS,0,移栽上下轴,UpDown_Axis,15,COM3,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=120000;8=203600;12=155000;16=153000;24=153000;32=129000;44=107000;56=95000,,
PRO,0,移栽上下轴在出料线下降的位置,UpDownP3List,0=150000;8=150000;12=150000;16=150000;24=150000;32=140000;44=120000;56=100000,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,2000,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,1600,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,
PRO,0,移栽上下轴减速度,UpdownAxis_DelSpeed,400,,
PRO,0,移栽上下轴原点低速度,UpdownAxis_HomeLowSpeed,100,,
PRO,0,移栽上下轴原点高速,UpdownAxis_HomeHighSpeed,200,,
PRO,0,移栽上下轴原点加速度,UpdownAxis_HomeAddSpeed,200,,
PRO,0,移栽上下轴走到待机点P1速度,UpdownAxis_P1Speed,1500,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,1501,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,1200,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,7X8=180000;7X16=175000;7X24=165000,,
source/DeviceLibrary/LineConfig/Config_ProvidingEquip_2.csv deleted 100644 → 0
类型,分类编号,说明,名称,属性值,设备名称,电器定义
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,对应的横移模块,SidesWayNum,0,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,2,,
,,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,
AXIS,0,移栽上下轴,UpDown_Axis,16,COM3,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=120000;8=189200;12=172000;16=168000;24=155000;32=133000;44=115000;56=90000,,
PRO,0,移栽上下轴在出料线下降的位置,UpDownP3List,0=150000;8=150000;12=150000;16=150000;24=150000;32=140000;44=115000;56=80000,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,2000,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,1600,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,
PRO,0,移栽上下轴减速度,UpdownAxis_DelSpeed,400,,
PRO,0,移栽上下轴原点低速度,UpdownAxis_HomeLowSpeed,100,,
PRO,0,移栽上下轴原点高速,UpdownAxis_HomeHighSpeed,200,,
PRO,0,移栽上下轴原点加速度,UpdownAxis_HomeAddSpeed,200,,
PRO,0,移栽上下轴走到待机点P1速度,UpdownAxis_P1Speed,1500,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,1501,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,1200,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=8000;,,
source/DeviceLibrary/LineConfig/Config_ProvidingEquip_3.csv deleted 100644 → 0
类型,分类编号,说明,名称,属性值,设备名称,电器定义
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,对应的横移模块,SidesWayNum,0,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,2,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,1,,
,,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,
AXIS,0,移栽上下轴,UpDown_Axis,9,COM3,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=120000;8=185000;12=185000;16=185000;24=176000;32=154000;44=134000;56=112000,,
PRO,0,移栽上下轴在出料线下降的位置,UpDownP3List,0=150000;8=150000;12=150000;16=150000;24=150000;32=150000;44=115000;56=78000,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,2000,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,1600,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,
PRO,0,移栽上下轴减速度,UpdownAxis_DelSpeed,400,,
PRO,0,移栽上下轴原点低速度,UpdownAxis_HomeLowSpeed,100,,
PRO,0,移栽上下轴原点高速,UpdownAxis_HomeHighSpeed,200,,
PRO,0,移栽上下轴原点加速度,UpdownAxis_HomeAddSpeed,200,,
PRO,0,移栽上下轴走到待机点P1速度,UpdownAxis_P1Speed,1500,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,1501,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,1200,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,13X16=184000;15X16=183000;11X16=184500;7X16=185000,,
source/DeviceLibrary/LineConfig/Config_ProvidingEquip_4.csv deleted 100644 → 0
类型,分类编号,说明,名称,属性值,设备名称,电器定义
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,对应的横移模块,SidesWayNum,4,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,2,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,2,,
,,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,
AXIS,0,移栽上下轴,UpDown_Axis,10,COM3,
PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=80000;8=228000;12=228000;16=224000;24=206000;32=185000;44=160000;56=140000,,
PRO,0,移栽上下轴在出料线下降的位置,UpDownP3List,0=90000;8=160000;12=160000;16=160000;24=160000;32=160000;44=140000;56=110000,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,2000,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,1600,,
PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,
PRO,0,移栽上下轴减速度,UpdownAxis_DelSpeed,400,,
PRO,0,移栽上下轴原点低速度,UpdownAxis_HomeLowSpeed,100,,
PRO,0,移栽上下轴原点高速,UpdownAxis_HomeHighSpeed,200,,
PRO,0,移栽上下轴原点加速度,UpdownAxis_HomeAddSpeed,200,,
PRO,0,移栽上下轴走到待机点P1速度,UpdownAxis_P1Speed,1500,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,1501,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,1200,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,7X8=228000;7X12=228000;7X16=224000;15X8=200000;15X12=200000;15X16=200000;15X24=170000;15X32=150000;15X44=140000;15X56=120000;13X12=220000;13X16=210000;13X24=200000;13X32=180000;13X44=150000;13X56=130000,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_01.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,0,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,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,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_02.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,0,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,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,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_03.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,0,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,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,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_04.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,0,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,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,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_05.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,0,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,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,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_06.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,0,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,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,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_07.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,0,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,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,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_08.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,0,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,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,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_09.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,0,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,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,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_10.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,1,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,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,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_11.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,0,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,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,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_12.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,1,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,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,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_13.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,0,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,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,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_14.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,0,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,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,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_15.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,0,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,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,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_16.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,0,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,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,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_17.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,1,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,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,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_18.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,0,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,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,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_19.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,0,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,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,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_20.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,0,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,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,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_21.csv 0 → 100644
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,
PRO,0,是否使用伺服,UpDownUseAxis,0,,
PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,
PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,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,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/assemblyLine/EquipBase.cs
......@@ -30,7 +30,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 当前正在通过的托盘号
/// </summary>
internal int currTrayNum = 0;
public int currTrayNum = 0;
/// <summary>
/// 升降轴
/// </summary>
......@@ -210,23 +210,23 @@ namespace OnlineStore.DeviceLibrary
}
public void ChangeDebug(bool isDebug)
{
if (baseConfig.DType.Equals(DeviceType.MoveEquip) || baseConfig.DType.Equals(DeviceType.ProvidingEquip))
if (baseConfig.DType.Equals(DeviceType.MoveEquip) || baseConfig.DType.Equals(DeviceType.HYEquip))
{
if (isDebug)
{
IsDebug = true;
//两个阻挡气缸下降
lineStatus = LineStatus.Debugging;
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.HIGH);
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH);
IOMove(IO_Type.StopDown1, IO_VALUE.HIGH);
IOMove(IO_Type.StopDown2, IO_VALUE.HIGH);
LogInfo("从正常状态切换到调试状态！");
}
else if (lineStatus.Equals(LineStatus.Debugging))
{
IsDebug = false;
lineStatus = LineStatus.StoreOnline;
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.HIGH);
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
IOMove(IO_Type.StopDown1, IO_VALUE.HIGH);
IOMove(IO_Type.StopDown2, IO_VALUE.LOW);
LogInfo("从调试状态切换到正常状态！");
}
}
......@@ -238,11 +238,11 @@ namespace OnlineStore.DeviceLibrary
internal virtual void OpenStopCylinder()
{
preRWTime = DateTime.Now;
if (baseConfig.DType.Equals(DeviceType.MoveEquip) || baseConfig.DType.Equals(DeviceType.ProvidingEquip))
if (baseConfig.DType.Equals(DeviceType.MoveEquip) || baseConfig.DType.Equals(DeviceType.HYEquip))
{
LogInfo("OpenStopCylinder: 下降阻挡气缸，上下气缸上升，顶升气缸下降");
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.HIGH);
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH);
IOMove(IO_Type.StopDown1, IO_VALUE.HIGH);
IOMove(IO_Type.StopDown2, IO_VALUE.HIGH);
//上下气缸上升
if (!UseAxis)
{
......@@ -256,24 +256,21 @@ namespace OnlineStore.DeviceLibrary
internal virtual bool OpenStopCylinderOk(TimeSpan span)
{
TimeSpan rwSpan = DateTime.Now - preRWTime;
if (baseConfig.DType.Equals(DeviceType.MoveEquip) || baseConfig.DType.Equals(DeviceType.ProvidingEquip))
if (baseConfig.DType.Equals(DeviceType.MoveEquip) || baseConfig.DType.Equals(DeviceType.HYEquip))
{
if (IOValue(IO_Type.StopCylinder_Down1).Equals(IO_VALUE.HIGH) &&
IOValue(IO_Type.StopCylinder_Down2).Equals(IO_VALUE.HIGH))
if (IOValue(IO_Type.StopDown1).Equals(IO_VALUE.HIGH) &&
IOValue(IO_Type.StopDown2).Equals(IO_VALUE.HIGH))
{
return true;
}
else if (rwSpan.TotalSeconds > 5 && span.TotalSeconds > 6 && span.TotalSeconds < LineManager.Config.IOSingle_TimerOut * 2)
{
preRWTime = DateTime.Now;
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.HIGH);
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH);
IOMove(IO_Type.StopDown1, IO_VALUE.HIGH);
IOMove(IO_Type.StopDown2, IO_VALUE.HIGH);
}
}
else if (baseConfig.DType.Equals(DeviceType.DischargeLine))
{
return true;
}
else if (baseConfig.DType.Equals(DeviceType.FeedingEquip))
{
if (DeviceID.Equals(102))
......@@ -298,12 +295,12 @@ namespace OnlineStore.DeviceLibrary
}
internal virtual void CloseCylinderStop()
{
if (baseConfig.DType.Equals(DeviceType.MoveEquip) || baseConfig.DType.Equals(DeviceType.ProvidingEquip))
if (baseConfig.DType.Equals(DeviceType.MoveEquip) || baseConfig.DType.Equals(DeviceType.HYEquip))
{
LogInfo("CloseCylinderStop: 上升阻挡气缸，关闭上下气缸，顶升气缸IO");
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
IOMove(IO_Type.StopDown1, IO_VALUE.LOW);
IOMove(IO_Type.StopDown2, IO_VALUE.LOW);
//上下气缸上升
if (!UseAxis)
{
......@@ -612,7 +609,7 @@ namespace OnlineStore.DeviceLibrary
protected void OutLog(string msg)
{
string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosId : "";
if (baseConfig.DType.Equals(DeviceType.ProvidingEquip) || baseConfig.DType.Equals(DeviceType.MoveEquip))
if (baseConfig.DType.Equals(DeviceType.HYEquip) || baseConfig.DType.Equals(DeviceType.MoveEquip))
{
if (String.IsNullOrEmpty(posId))
{
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
......@@ -28,7 +28,7 @@ namespace OnlineStore.DeviceLibrary
baseConfig = config;
this.Config = config;
IsDebug = config.IsDebug.Equals(1);
Name = (" " + "_入料_" + DeviceID % 100 + " ").ToUpper();
Name = (" " + "_入料_T" + DeviceID % 100 + " ").ToUpper();
Init();
UseAxis = true;
......
source/DeviceLibrary/assemblyLine/HY/HYEquipBase.cs 0 → 100644
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary
{
public class HYEquipBase : EquipBase
{
public HYEquip_Config Config;
public static HYEquipBase GetHY(string cid, HYEquip_Config config)
{
int hynum = (config.Id % 100);
List<int> jNumList = new List<int>() { 10,12,17};
List<int> oNumList = new List<int>() { 5, 7, 14 };
//List<int> cNumList = new List<int>() { 10, 12, 17 };
if (jNumList.Contains(hynum))
{
return new HY_Coveryor(cid, config);
}else if (oNumList.Contains(hynum))
{
return new HY_OutLine(cid, config);
}
else
{
return new HY_C1Line(cid, config);
}
}
public HYEquipBase(string cid, HYEquip_Config config)
{
this.DeviceID = config.Id;
this.Config = config;
baseConfig = config;
IsDebug = config.IsDebug.Equals(1);
Name = ( "_HY" + (DeviceID%100).ToString().PadLeft(2, '0') + "_").ToUpper();
Init();
MoveInfo = new LineMoveInfo(DeviceID, "[" + Name.Trim() + "-Move]");
SecondMoveInfo = new LineMoveInfo(DeviceID, "[" + Name.Trim() + "-SMove]");
UseAxis = config.UpDownUseAxis.Equals(1);
if (UseAxis)
{
Config.UpDown_Axis.ServerOnDO = IO_Type.UpDownAxis_ServoOn;
Config.UpDown_Axis.BreakOnDO = IO_Type.UpDownAxis_BreakOn;
}
UpdownAxis = new AxisBean(config.UpDown_Axis, Name);
}
public override bool Reset()
{
return false;
}
public override bool StartInStoreMove(InOutParam param)
{
return false;
}
public override bool StartOutStoreMove(InOutParam param)
{
return false;
}
public override bool StartRun(bool isDebug = false)
{
return false;
}
public override void StopRun()
{
}
protected override void BaseTimerProcess()
{
}
protected override void CheckFixtureProcess()
{
}
protected override void InStoreProcess()
{
}
protected override void OutStoreProcess()
{
}
protected override void ResetProcess()
{
}
internal override void StopMove()
{
}
}
}
source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs 0 → 100644
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary
{
public class HY_C1Line:HYEquipBase
{
public HY_C1Line(string cid, HYEquip_Config config) : base(cid, config)
{
Name = ("_C1线HY" + (DeviceID % 100).ToString().PadLeft(2, '0') + "_").ToUpper();
}
}
}
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor.cs 0 → 100644
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary
{
public class HY_Coveryor:HYEquipBase
{
public HY_Coveryor(string cid, HYEquip_Config config) : base(cid, config)
{
Name = ("_接驳台HY" + (DeviceID % 100).ToString().PadLeft(2, '0') + "_").ToUpper();
}
}
}
source/DeviceLibrary/assemblyLine/HY/HY_OutLine.cs 0 → 100644
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary
{
public class HY_OutLine : HYEquipBase
{
public HY_OutLine(string cid, HYEquip_Config config) : base(cid, config)
{
Name = ("_出料线HY" + (DeviceID % 100).ToString().PadLeft(2, '0') + "_").ToUpper();
}
}
}
source/DeviceLibrary/assemblyLine/LineBean.cs
......@@ -38,8 +38,8 @@ namespace OnlineStore.DeviceLibrary
public Dictionary<int, MoveEquip> MoveEquipMap { get; set; }
public Dictionary<int, FeedingEquip> FeedingEquipMap { get; set; }
public Dictionary<int, ProvidingEquip> ProvidingEquipMap { get; set; }
public Dictionary<int, DischargeLine> DisLineMap { get; set; }
public Dictionary<int, HYEquipBase> HYEquipMap { get; set; }
//public Dictionary<int, DischargeLine> DisLineMap { get; set; }
public Dictionary<int, EquipBase> AllEquipMap { get; set; }
/// <summary>
......@@ -53,7 +53,7 @@ namespace OnlineStore.DeviceLibrary
private bool canStart = false;
public LineBean(Line_Config lineConfig, Dictionary<int, MoveEquip_Config> configList, Dictionary<int, FeedingEquip_Config> feedMap,
Dictionary<int, ProvidingEquip_Config> providMap, Dictionary<int, DischargeLine_Config> disLineMap)
Dictionary<int, HYEquip_Config> hyConfigMap)
{
if (lineConfig.IOSingle_TimerOut <= 0)
{
......@@ -76,8 +76,7 @@ namespace OnlineStore.DeviceLibrary
AllEquipMap = new Dictionary<int, EquipBase>();
MoveEquipMap = new Dictionary<int, MoveEquip>();
FeedingEquipMap = new Dictionary<int, FeedingEquip>();
ProvidingEquipMap = new Dictionary<int, ProvidingEquip>();
DisLineMap = new Dictionary<int, DischargeLine>();
HYEquipMap = new Dictionary<int, HYEquipBase>();
List<string> ioList = new List<string>();
ioList = new List<string>(DeviceConfig.ProIOIpMap.Values);
AddDeviceName(ioList, Config.IOIPList);
......@@ -102,23 +101,23 @@ namespace OnlineStore.DeviceLibrary
MoveEquipMap.Add(config.Id, equip);
AllEquipMap.Add(config.Id, equip);
}
foreach (ProvidingEquip_Config config in providMap.Values)
foreach (HYEquip_Config config in hyConfigMap.Values)
{
ProvidingEquip equip = new ProvidingEquip(lineConfig.CID, config);
HYEquipBase equip =HYEquipBase.GetHY( lineConfig.CID, config);
AddDeviceName(ioList, config.IOIPList);
ProvidingEquipMap.Add(config.Id, equip);
AllEquipMap.Add(config.Id, equip);
equip.TrayPEndEvent += Equip_TrayPEndEvent;
}
foreach (DischargeLine_Config config in disLineMap.Values)
{
DischargeLine equip = new DischargeLine(lineConfig.CID, config);
AddDeviceName(ioList, config.IOIPList);
DisLineMap.Add(config.Id, equip);
HYEquipMap.Add(config.Id, equip);
AllEquipMap.Add(config.Id, equip);
//equip.TrayPEndEvent += Equip_TrayPEndEvent;
}
//foreach (DischargeLine_Config config in disLineMap.Values)
//{
// DischargeLine equip = new DischargeLine(lineConfig.CID, config);
// AddDeviceName(ioList, config.IOIPList);
// DisLineMap.Add(config.Id, equip);
// AllEquipMap.Add(config.Id, equip);
//}
//先初始化设备
IOManager.Init();
AxisManager.Init();
......@@ -144,16 +143,16 @@ namespace OnlineStore.DeviceLibrary
FeedingEquip feed = FeedingEquipMap[id];
cioList.AddRange(feed.Config.IOIPList);
}
else if (ProvidingEquipMap.ContainsKey(id))
{
ProvidingEquip feed = ProvidingEquipMap[id];
cioList.AddRange(feed.Config.IOIPList);
}
else if (DisLineMap.ContainsKey(id))
else if (HYEquipMap.ContainsKey(id))
{
DischargeLine feed = DisLineMap[id];
HYEquipBase feed = HYEquipMap[id];
cioList.AddRange(feed.Config.IOIPList);
}
//else if (DisLineMap.ContainsKey(id))
//{
// DischargeLine feed = DisLineMap[id];
// cioList.AddRange(feed.Config.IOIPList);
//}
else if (MoveEquipMap.ContainsKey(id))
{
MoveEquip equip = MoveEquipMap[id];
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
......@@ -459,7 +459,7 @@ namespace OnlineStore.DeviceLibrary
Equip_TrayPEndEvent(4, SW41WaitTrayNum);
}
if (SW41_MoveInfo.MoveType.Equals(LineMoveType.None) && ProvidingEquipMap[204].runStatus <= LineRunStatus.Wait)
if (SW41_MoveInfo.MoveType.Equals(LineMoveType.None) && HYEquipMap[204].runStatus <= LineRunStatus.Wait)
{
if (IOValue(IO_Type.SW4_TrayCheck).Equals(IO_VALUE.HIGH) && IOValue(IO_Type.SW1_TrayCheck).Equals(IO_VALUE.LOW) &&
......@@ -556,9 +556,9 @@ namespace OnlineStore.DeviceLibrary
private void UpateSw41TrayNum()
{
Sw41TrayNum = 0;
if (ProvidingEquipMap.ContainsKey(204))
if (HYEquipMap.ContainsKey(204))
{
ProvidingEquip eq = ProvidingEquipMap[204];
HYEquipBase eq = HYEquipMap[204];
if (eq.runStatus >= LineRunStatus.HomeMoving)
{
Sw41TrayNum = eq.currTrayNum;
......@@ -1216,9 +1216,9 @@ namespace OnlineStore.DeviceLibrary
foreach (int lineNum in lineList)
{
int deviceN = 200 + lineNum;
if (ProvidingEquipMap.ContainsKey(deviceN))
if (HYEquipMap.ContainsKey(deviceN))
{
ProvidingEquip pro = ProvidingEquipMap[deviceN];
HYEquipBase pro = HYEquipMap[deviceN];
if (pro.runStatus >= LineRunStatus.HomeMoving && pro.isInSuddenDown.Equals(false) && pro.isNoAirCheck.Equals(false))
{
return true;
......@@ -1233,16 +1233,16 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
internal bool DLineStartOut(int dlineId, int LineNum)
{
foreach (DischargeLine line in DisLineMap.Values)
{
if ((line.DeviceID % 100).Equals(dlineId))
{
if (line.CanStartOut(LineNum))
{
return true;
}
}
}
//foreach (DischargeLine line in DisLineMap.Values)
//{
// if ((line.DeviceID % 100).Equals(dlineId))
// {
// if (line.CanStartOut(LineNum))
// {
// return true;
// }
// }
//}
return false;
}
#endregion
......
source/DeviceLibrary/assemblyLine/MoveEquip.cs
......@@ -23,7 +23,7 @@ namespace OnlineStore.DeviceLibrary
this.Config = config;
baseConfig = config;
IsDebug = config.IsDebug.Equals(1);
Name = (" " + "_进仓_" + DeviceID.ToString().PadLeft(2, '0') + " ").ToUpper();
Name = (" " + "_"+ GetNByID() + "_进仓" + DeviceID.ToString().PadLeft(2, '0') + "_" ).ToUpper();
Init();
......@@ -40,7 +40,30 @@ namespace OnlineStore.DeviceLibrary
}
UpdownAxis = new AxisBean(config.UpDown_Axis, Name);
}
private string GetNByID()
{
string name = "";
int index = DeviceID;
if (index >= 0)
{
int num =( index+1) / 2;
int subNum = index % 2;
if (subNum.Equals(0))
{
subNum = 2;
}
if (num <= 6)
{
}
else
{
subNum = 3 - subNum;
}
name = "D" + num + "-" + subNum;
}
return name;
}
public override bool StartRun(bool isDebug = false)
{
if (CanStartRun().Equals(false))
......@@ -93,13 +116,13 @@ namespace OnlineStore.DeviceLibrary
// CylinderMove(MoveInfo, IO_Type.UpDownCylinder_Down, IO_Type.UpDownCylinder_Up);
if (IsDebug)
{
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.HIGH);
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH);
IOMove(IO_Type.StopDown1, IO_VALUE.HIGH);
IOMove(IO_Type.StopDown2, IO_VALUE.HIGH);
}
else
{
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
IOMove(IO_Type.StopDown1, IO_VALUE.LOW);
IOMove(IO_Type.StopDown2, IO_VALUE.LOW);
}
isInPro = false;
}
......@@ -135,7 +158,7 @@ namespace OnlineStore.DeviceLibrary
DebugInfo(MoveInfo.MoveType + " : 上升气缸到位，顶升气缸下降，前后气缸后退，夹紧气缸放松");
CylinderMove(MoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
CylinderMove(MoveInfo, IO_Type.BeforeAfterCylinder_Before, IO_Type.BeforeAfterCylinder_After);
CylinderMove(MoveInfo, IO_Type.ClampCylinder_Slack, IO_Type.ClampCylinder_Tighten);
CylinderMove(MoveInfo, IO_Type.ClampCylinder_Work, IO_Type.ClampCylinder_Relax);
break;
case LineMoveStep.MH_OtherCylinderBack:
......@@ -180,8 +203,8 @@ namespace OnlineStore.DeviceLibrary
UpdownUpMove();
CylinderMove(MoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
IOMove(IO_Type.StopDown1, IO_VALUE.LOW);
IOMove(IO_Type.StopDown2, IO_VALUE.LOW);
}
......@@ -193,8 +216,8 @@ namespace OnlineStore.DeviceLibrary
}
StopMove();
//停止运行时，把所有IO 置零
CheckAndMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
CheckAndMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
CheckAndMove(IO_Type.StopDown1, IO_VALUE.LOW);
CheckAndMove(IO_Type.StopDown2, IO_VALUE.LOW);
CheckAndMove(IO_Type.TopCylinder_UP, IO_VALUE.LOW);
CheckAndMove(IO_Type.TopCylinder_Down, IO_VALUE.LOW);
CheckAndMove(IO_Type.BeforeAfterCylinder_Before, IO_VALUE.LOW);
......@@ -204,8 +227,8 @@ namespace OnlineStore.DeviceLibrary
CheckAndMove(IO_Type.UpDownCylinder_Up, IO_VALUE.LOW);
CheckAndMove(IO_Type.UpDownCylinder_Down, IO_VALUE.LOW);
}
CheckAndMove(IO_Type.ClampCylinder_Slack, IO_VALUE.LOW);
CheckAndMove(IO_Type.ClampCylinder_Tighten, IO_VALUE.LOW);
CheckAndMove(IO_Type.ClampCylinder_Work, IO_VALUE.LOW);
CheckAndMove(IO_Type.ClampCylinder_Relax, IO_VALUE.LOW);
runStatus = LineRunStatus.Wait;
}
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
......@@ -101,7 +101,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(LineMoveStep.MO_54_CylinderOpen);
OutLog("出库 " + MoveInfo.SLog + ": 夹料气缸夹紧，更新料盘位置【" + MoveInfo.MoveParam.WareCode + "】【MOVING】【" + DeviceID + "】");
CylinderMove(MoveInfo, IO_Type.ClampCylinder_Tighten, IO_Type.ClampCylinder_Slack);
CylinderMove(MoveInfo, IO_Type.ClampCylinder_Relax, IO_Type.ClampCylinder_Work);
//更新料盘位置
SServerManager.UpdateTrayLoc(Name, MoveInfo.MoveParam.WareCode, LocStatus.MOVING, DeviceID.ToString());
......@@ -190,7 +190,7 @@ namespace OnlineStore.DeviceLibrary
//出库全部完成
lineStatus = LineStatus.StoreOnline;
MoveInfo.NextMoveStep(LineMoveStep.MO_59_CylinderRelax);
CylinderMove(MoveInfo, IO_Type.ClampCylinder_Slack, IO_Type.ClampCylinder_Tighten);
CylinderMove(MoveInfo, IO_Type.ClampCylinder_Work, IO_Type.ClampCylinder_Relax);
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.MO_59_CylinderRelax))
{
......@@ -299,7 +299,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(LineMoveStep.MI_08_CylinderOpen);
InLog("入库 " + MoveInfo.SLog + ": 夹料气缸夹紧");
CylinderMove(MoveInfo, IO_Type.ClampCylinder_Tighten, IO_Type.ClampCylinder_Slack);
CylinderMove(MoveInfo, IO_Type.ClampCylinder_Relax, IO_Type.ClampCylinder_Work);
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.MI_08_CylinderOpen))
{
......@@ -354,7 +354,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(LineMoveStep.MI_12_CylinderRelax);
InLog("入库 " + MoveInfo.SLog + "，夹料气缸放松");
CylinderMove(MoveInfo, IO_Type.ClampCylinder_Slack, IO_Type.ClampCylinder_Tighten);
CylinderMove(MoveInfo, IO_Type.ClampCylinder_Work, IO_Type.ClampCylinder_Relax);
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.MI_12_CylinderRelax))
{
......@@ -580,7 +580,7 @@ namespace OnlineStore.DeviceLibrary
{
if (SecondMoveInfo.MoveType.Equals(LineMoveType.None).Equals(false))
{
if (IOValue(IO_Type.StopCylinder_Check2).Equals(IO_VALUE.HIGH))
if (IOValue(IO_Type.StopCheck2).Equals(IO_VALUE.HIGH))
{
trayCheck2LowWait.Stop();
}
......@@ -594,7 +594,7 @@ namespace OnlineStore.DeviceLibrary
if (SecondMoveInfo.MoveType.Equals(LineMoveType.None))
{
bool canpro = LineManager.Line.Move5CanProcessTray(DeviceID);
if (IOValue(IO_Type.StopCylinder_Check2).Equals(IO_VALUE.HIGH))
if (IOValue(IO_Type.StopCheck2).Equals(IO_VALUE.HIGH))
{
trayCheck2LowWait.Stop();
if (canpro && TrayManager.checkWatch(trayCheckWait, TrayManager.SwTrayWaitTime, true))
......@@ -603,14 +603,14 @@ namespace OnlineStore.DeviceLibrary
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_03_Stop2Down);
CheckLog("托盘阻挡" + SecondMoveInfo.SLog + " 阻挡气缸1-1上升）");
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down1, IO_VALUE.LOW));
IOMove(IO_Type.StopDown1, IO_VALUE.LOW);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopDown1, IO_VALUE.LOW));
}
}
else
{
bool check2IsOk = TrayManager.checkWatch(trayCheck2LowWait, TrayManager.SwTrayWaitTime, false);
if (IOValue(IO_Type.StopCylinder_Check1).Equals(IO_VALUE.HIGH))
if (IOValue(IO_Type.StopCheck1).Equals(IO_VALUE.HIGH))
{
if (TrayManager.checkWatch(trayCheckWait, TrayManager.SwTrayWaitTime, false) && check2IsOk && canpro)
{
......@@ -621,10 +621,10 @@ namespace OnlineStore.DeviceLibrary
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_00_Stop1Down);
CheckLog(" 托盘检测：料盘检测StopCylinder_Check1 " + SecondMoveInfo.SLog + "阻挡气缸1-1下降 ， 等待 StopCylinder_Check1=0，清理托盘RFID");
ClearTrayRFID();
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.HIGH, 1200);
IOMove(IO_Type.StopDown1, IO_VALUE.HIGH, 1200);
SecondMoveInfo.OneWaitCanEndStep = true;
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check1, IO_VALUE.LOW));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.HIGH));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCheck1, IO_VALUE.LOW));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCheck2, IO_VALUE.HIGH));
}
}
else
......@@ -673,22 +673,22 @@ namespace OnlineStore.DeviceLibrary
{
SecondMoveInfo.TimeOutSeconds = 20;
}
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.HIGH));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCheck2, IO_VALUE.HIGH));
}
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_01_FixtureCheck))
{
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_03_Stop2Down);
CheckLog("托盘阻挡" + SecondMoveInfo.SLog + " 再次等待托盘信号");
// IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.HIGH));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCheck2, IO_VALUE.HIGH));
}
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_03_Stop2Down))
{
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_04_Wait);
CheckLog("托盘阻挡" + SecondMoveInfo.SLog + " ,等待编码信号稳定StopCylinder_Check2=1");
CheckAndMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
CheckAndMove(IO_Type.StopDown1, IO_VALUE.LOW);
//SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.HIGH));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCheck2, IO_VALUE.HIGH));
}
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_04_Wait))
{
......@@ -835,7 +835,7 @@ namespace OnlineStore.DeviceLibrary
{
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_17_Stop2Check);
CheckLog("托盘放行" + SecondMoveInfo.SLog + " ， 等待StopCylinder_Check2=0");
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.LOW));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCheck2, IO_VALUE.LOW));
}
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_17_Stop2Check))
{
......@@ -847,9 +847,9 @@ namespace OnlineStore.DeviceLibrary
{
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_19_StopCylinder_Back);
CheckLog("托盘放行" + SecondMoveInfo.SLog + " ， 阻挡气缸1-2上升 ）");
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
IOMove(IO_Type.StopDown2, IO_VALUE.LOW);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.LOW));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopDown2, IO_VALUE.LOW));
}
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_19_StopCylinder_Back))
{
......@@ -865,8 +865,8 @@ namespace OnlineStore.DeviceLibrary
{
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_16_Stop2Down);
CheckLog("托盘放行" + SecondMoveInfo.SLog + " ，阻挡气缸1-2下降 ");
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH));
IOMove(IO_Type.StopDown2, IO_VALUE.HIGH);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopDown2, IO_VALUE.HIGH));
}
else if (SecondMoveInfo.IsTimeOut(120))
......
source/DeviceLibrary/assemblyLine/ProvidingEquip.cs
......@@ -94,13 +94,13 @@ namespace OnlineStore.DeviceLibrary
UpdownHomeMove();
if (IsDebug)
{
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.HIGH);
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH);
IOMove(IO_Type.StopDown1, IO_VALUE.HIGH);
IOMove(IO_Type.StopDown2, IO_VALUE.HIGH);
}
else
{
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
IOMove(IO_Type.StopDown1, IO_VALUE.LOW);
IOMove(IO_Type.StopDown2, IO_VALUE.LOW);
}
isInPro = false;
}
......@@ -130,7 +130,7 @@ namespace OnlineStore.DeviceLibrary
LogInfo(MoveInfo.MoveType + " ：上升气缸到位，顶升气缸下降，前后气缸后退，夹紧气缸放松 ");
CylinderMove(MoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
CylinderMove(MoveInfo, IO_Type.BeforeAfterCylinder_Before, IO_Type.BeforeAfterCylinder_After);
CylinderMove(MoveInfo, IO_Type.ClampCylinder_Slack, IO_Type.ClampCylinder_Tighten);
CylinderMove(MoveInfo, IO_Type.ClampCylinder_Work, IO_Type.ClampCylinder_Relax);
break;
case LineMoveStep.MH_OtherCylinderBack:
MoveInfo.EndMove();
......@@ -167,8 +167,8 @@ namespace OnlineStore.DeviceLibrary
UpdownAxis.SuddenStop();
}
CylinderMove(MoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
IOMove(IO_Type.StopDown1, IO_VALUE.LOW);
IOMove(IO_Type.StopDown2, IO_VALUE.LOW);
}
public override void StopRun()
{
......@@ -179,8 +179,8 @@ namespace OnlineStore.DeviceLibrary
StopMove();
CloseAxis(UpdownAxis);
//停止运行时，把所有IO 置零
CheckAndMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
CheckAndMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
CheckAndMove(IO_Type.StopDown1, IO_VALUE.LOW);
CheckAndMove(IO_Type.StopDown2, IO_VALUE.LOW);
CheckAndMove(IO_Type.TopCylinder_UP, IO_VALUE.LOW);
CheckAndMove(IO_Type.TopCylinder_Down, IO_VALUE.LOW);
CheckAndMove(IO_Type.BeforeAfterCylinder_Before, IO_VALUE.LOW);
......@@ -190,8 +190,8 @@ namespace OnlineStore.DeviceLibrary
CheckAndMove(IO_Type.UpDownCylinder_Up, IO_VALUE.LOW);
CheckAndMove(IO_Type.UpDownCylinder_Down, IO_VALUE.LOW);
}
CheckAndMove(IO_Type.ClampCylinder_Slack, IO_VALUE.LOW);
CheckAndMove(IO_Type.ClampCylinder_Tighten, IO_VALUE.LOW);
CheckAndMove(IO_Type.ClampCylinder_Work, IO_VALUE.LOW);
CheckAndMove(IO_Type.ClampCylinder_Relax, IO_VALUE.LOW);
runStatus = LineRunStatus.Wait;
}
......
source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs
......@@ -47,7 +47,7 @@ namespace OnlineStore.DeviceLibrary
return;
}
//int num = TrayManager.GetTrayNum(DeviceID);
if (IOValue(IO_Type.StopCylinder_Check2).Equals(IO_VALUE.HIGH))
if (IOValue(IO_Type.StopCheck2).Equals(IO_VALUE.HIGH))
{
bool canProcess = (LineManager.Line.SwNoProcess(Config.SidesWayNum));
trayCheck2LowWait.Stop();
......@@ -57,14 +57,14 @@ namespace OnlineStore.DeviceLibrary
SecondMoveInfo.NewMove(LineMoveType.CheckFixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_03_Stop2Down);
LogUtil.info(Name + " [" + trayCount + "] 托盘阻挡" + SecondMoveInfo.SLog + "阻挡气缸1-1上升）");
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down1, IO_VALUE.LOW));
IOMove(IO_Type.StopDown1, IO_VALUE.LOW);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopDown1, IO_VALUE.LOW));
}
}
else
{
bool check2Ok = TrayManager.checkWatch(trayCheck2LowWait, TrayManager.SwTrayWaitTime, false);
if (IOValue(IO_Type.StopCylinder_Check1).Equals(IO_VALUE.HIGH) )
if (IOValue(IO_Type.StopCheck1).Equals(IO_VALUE.HIGH) )
{
bool canProcess = (LineManager.Line.SwNoProcess(Config.SidesWayNum));
if (TrayManager.checkWatch(trayCheckWait, TrayManager.SwTrayWaitTime, false) && (DateTime.Now - lastStopDown).TotalSeconds > 3 && check2Ok && canProcess)
......@@ -77,10 +77,10 @@ namespace OnlineStore.DeviceLibrary
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_00_Stop1Down);
LogUtil.debug(Name + " [" + trayCount + "] 托盘检测：" + SecondMoveInfo.SLog + "阻挡气缸1-1下降 ，等待 StopCylinder_Check1=0，清理托盘RFID");
ClearTrayRFID();
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.HIGH, 1200);
IOMove(IO_Type.StopDown1, IO_VALUE.HIGH, 1200);
SecondMoveInfo.OneWaitCanEndStep = true;
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check1, IO_VALUE.LOW));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.HIGH));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCheck1, IO_VALUE.LOW));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCheck2, IO_VALUE.HIGH));
}
}
else
......@@ -118,8 +118,8 @@ namespace OnlineStore.DeviceLibrary
{
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_16_Stop2Down);
CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ，阻挡2下降");
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH));
IOMove(IO_Type.StopDown2, IO_VALUE.HIGH);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopDown2, IO_VALUE.HIGH));
}
}
else
......@@ -302,7 +302,7 @@ namespace OnlineStore.DeviceLibrary
TimeSpan span = DateTime.Now - SecondMoveInfo.LastSetpTime;
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_04_Wait);
LogUtil.debug(Name + "托盘阻挡" + SecondMoveInfo.SLog + " 阻挡气缸上升，下降耗时（" + FormUtil.GetSpanStr(span) + "），等待 阻挡2托盘检测=1）");
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.HIGH));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCheck2, IO_VALUE.HIGH));
}
// else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_01_FixtureCheck))
// {
......@@ -320,7 +320,7 @@ namespace OnlineStore.DeviceLibrary
{
CheckLog("托盘阻挡" + SecondMoveInfo.SLog + " ,等待编码信号稳定StopCylinder_Check2=1");
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_04_Wait);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.HIGH));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCheck2, IO_VALUE.HIGH));
}
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_04_Wait))
{
......@@ -438,8 +438,8 @@ namespace OnlineStore.DeviceLibrary
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW));
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_16_Stop2Down);
CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ，阻挡2下降");
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH));
IOMove(IO_Type.StopDown2, IO_VALUE.HIGH);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopDown2, IO_VALUE.HIGH));
}
}
......@@ -447,21 +447,21 @@ namespace OnlineStore.DeviceLibrary
{
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_16_Stop2Down);
CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ，阻挡2下降");
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.HIGH));
IOMove(IO_Type.StopDown2, IO_VALUE.HIGH);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopDown2, IO_VALUE.HIGH));
}
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_16_Stop2Down))
{
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_17_Stop2Check);
CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ， 阻挡2托盘检测=0");
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.LOW));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCheck2, IO_VALUE.LOW));
}
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_17_Stop2Check))
{
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_18_WaitTime);
CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ， 等待200ms后阻挡2上升");
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(200));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.LOW));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCheck2, IO_VALUE.LOW));
}
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_18_WaitTime))
{
......@@ -469,8 +469,8 @@ namespace OnlineStore.DeviceLibrary
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_19_StopCylinder_Back);
CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ， 阻挡气缸2上升 ");
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100));
IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.LOW));
IOMove(IO_Type.StopDown2, IO_VALUE.LOW);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopDown2, IO_VALUE.LOW));
}
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_19_StopCylinder_Back))
{
......@@ -557,7 +557,7 @@ namespace OnlineStore.DeviceLibrary
//{
int lineId = DeviceID % 100;
MoveInfo.NextMoveStep(LineMoveStep.PO_03_CylinderOpen);
CylinderMove(MoveInfo, IO_Type.ClampCylinder_Tighten, IO_Type.ClampCylinder_Slack);
CylinderMove(MoveInfo, IO_Type.ClampCylinder_Relax, IO_Type.ClampCylinder_Work);
if (MoveInfo.MoveParam.InStoreNg)
{
LogInfo("出料 【" + posId + "】" + MoveInfo.SLog + " : 夹料气缸夹紧，入料NG料，不更新料盘位置");
......@@ -615,7 +615,7 @@ namespace OnlineStore.DeviceLibrary
//UpdownDownP3Move(MoveInfo.MoveParam.PlateH);
MoveInfo.NextMoveStep(LineMoveStep.PO_08_CylinderRelax);
OutLog("出料：" + MoveInfo.SLog + "，夹料气缸放松）");
CylinderMove(MoveInfo, IO_Type.ClampCylinder_Slack, IO_Type.ClampCylinder_Tighten);
CylinderMove(MoveInfo, IO_Type.ClampCylinder_Work, IO_Type.ClampCylinder_Relax);
if (MoveInfo.MoveParam.urgentReel && this.Config.SidesWayNum.Equals(4))
{
......
source/DeviceLibrary/assemblymanager/ALineManager.cs
......@@ -50,8 +50,8 @@ namespace OnlineStore.DeviceLibrary
{
Dictionary<int, MoveEquip_Config> moveECMap = null;
Dictionary<int, FeedingEquip_Config> feedingECMap = null;
Dictionary<int, ProvidingEquip_Config> providingECMap = null;
Dictionary<int, DischargeLine_Config> disChargeLineMap = null;
Dictionary<int, HYEquip_Config> HYECMap = null;
//Dictionary<int, DischargeLine_Config> disChargeLineMap = null;
DeviceConfig.SubDIList = new Dictionary<int, Dictionary<string, ConfigIO>>();
DeviceConfig.SubDOList = new Dictionary<int, Dictionary<string, ConfigIO>>();
......@@ -60,8 +60,8 @@ namespace OnlineStore.DeviceLibrary
moveECMap = new Dictionary<int, MoveEquip_Config>();
feedingECMap = new Dictionary<int, FeedingEquip_Config>();
providingECMap = new Dictionary<int, ProvidingEquip_Config>();
disChargeLineMap = new Dictionary<int, DischargeLine_Config>();
HYECMap = new Dictionary<int, HYEquip_Config>();
//disChargeLineMap = new Dictionary<int, DischargeLine_Config>();
allConfigMap = new Dictionary<int, DeviceConfig>();
string server = ConfigAppSettings.GetValue(Setting_Init.http_server);
if (server.Equals(""))
......@@ -117,31 +117,32 @@ namespace OnlineStore.DeviceLibrary
allConfigMap.Add(subType, moveConfig);
}
int providingEquipCount = ConfigAppSettings.GetIntValue(Setting_Init.Line_providingEquip_count);
string providingEquipConfig = ConfigAppSettings.GetValue(Setting_Init.ConfigPath_ProvidingEquip);
for (int i = 1; i <= providingEquipCount; i++)
int hyEquipCount = ConfigAppSettings.GetIntValue(Setting_Init.Line_HYEquip_count);
string hyEquipConfig = ConfigAppSettings.GetValue(Setting_Init.ConfigPath_HYEquip);
for (int i = 1; i <= hyEquipCount; i++)
{
int subType = 200 + i;
string config = appPath + providingEquipConfig.Replace(".csv", "_" + i + ".csv");
ProvidingEquip_Config moveConfig = CSVConfigReader.LoadProvidingConfig(subType,DeviceType.ProvidingEquip, config);
string nameStr = i.ToString().PadLeft(2, '0');
string config = appPath + hyEquipConfig.Replace(".csv", "_" +nameStr + ".csv");
HYEquip_Config moveConfig = CSVConfigReader.LoadHYConfig(subType,DeviceType.HYEquip, config);
moveConfig.SetIO(subType);
providingECMap.Add(subType, moveConfig);
HYECMap.Add(subType, moveConfig);
allConfigMap.Add(subType, moveConfig);
}
int dislineCount = ConfigAppSettings.GetIntValue(Setting_Init.Line_dischargeLine_count);
string dischargeLineConfig = ConfigAppSettings.GetValue(Setting_Init.ConfigPath_DischargeLine);
for (int i = 1; i <= dislineCount; i++)
{
int subType = 300 + i;
string config = appPath + dischargeLineConfig.Replace(".csv", "_" + i + ".csv");
DischargeLine_Config moveConfig = CSVConfigReader.LoadDischargeLineConfig(subType,DeviceType.DischargeLine, config);
moveConfig.SetIO(subType);
disChargeLineMap.Add(subType, moveConfig);
allConfigMap.Add(subType, moveConfig);
}
//int dislineCount = ConfigAppSettings.GetIntValue(Setting_Init.Line_dischargeLine_count);
//string dischargeLineConfig = ConfigAppSettings.GetValue(Setting_Init.ConfigPath_DischargeLine);
//for (int i = 1; i <= dislineCount; i++)
//{
// int subType = 300 + i;
// string config = appPath + dischargeLineConfig.Replace(".csv", "_" + i + ".csv");
// DischargeLine_Config moveConfig = CSVConfigReader.LoadDischargeLineConfig(subType,DeviceType.DischargeLine, config);
// moveConfig.SetIO(subType);
// disChargeLineMap.Add(subType, moveConfig);
// allConfigMap.Add(subType, moveConfig);
//}
Config.SetIO(1000);
Line = new LineBean(Config, moveECMap, feedingECMap, providingECMap, disChargeLineMap);
Line = new LineBean(Config, moveECMap, feedingECMap, HYECMap);
LogUtil.info( "加载 完成！");
return true;
}
......@@ -203,17 +204,17 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error("出错：",ex);
}
}
public static void SaveProvidingEquipConfig(ProvidingEquip_Config config)
public static void SaveHYEquipConfig(HYEquip_Config config)
{
try
{
//位置配置到文件中
string appPath = Application.StartupPath;
string moveEquipConfig = ConfigAppSettings.GetValue(Setting_Init.ConfigPath_ProvidingEquip);
string moveEquipConfig = ConfigAppSettings.GetValue(Setting_Init.ConfigPath_HYEquip);
int id = config.Id - 200;
string configStr = appPath + moveEquipConfig.Replace(".csv", "_" + id + ".csv");
allConfigMap[config.Id] = config;
bool result = CSVConfigReader.SaveConfig(configStr, config,typeof(ProvidingEquip_Config));
bool result = CSVConfigReader.SaveConfig(configStr, config,typeof(HYEquip_Config));
if (!result)
{
LogUtil.error("保存配置文件失败：" + configStr);
......@@ -225,28 +226,28 @@ namespace OnlineStore.DeviceLibrary
}
}
public static void SaveDischargeLineConfig(DischargeLine_Config config)
{
try
{
//位置配置到文件中
string appPath = Application.StartupPath;
string moveEquipConfig = ConfigAppSettings.GetValue(Setting_Init.ConfigPath_DischargeLine);
int id = config.Id - 300;
string configStr = appPath + moveEquipConfig.Replace(".csv", "_" + id + ".csv");
// disChargeLineMap[config.Id] = config;
allConfigMap[config.Id] = config;
bool result = CSVConfigReader.SaveConfig(configStr, config, typeof(DischargeLine_Config));
if (!result)
{
LogUtil.error("保存配置文件失败：" + configStr);
}
}
catch (Exception ex)
{
LogUtil.error("出错：",ex);
}
}
//public static void SaveDischargeLineConfig(DischargeLine_Config config)
//{
// try
// {
// //位置配置到文件中
// string appPath = Application.StartupPath;
// string moveEquipConfig = ConfigAppSettings.GetValue(Setting_Init.ConfigPath_DischargeLine);
// int id = config.Id - 300;
// string configStr = appPath + moveEquipConfig.Replace(".csv", "_" + id + ".csv");
// // disChargeLineMap[config.Id] = config;
// allConfigMap[config.Id] = config;
// bool result = CSVConfigReader.SaveConfig(configStr, config, typeof(DischargeLine_Config));
// if (!result)
// {
// LogUtil.error("保存配置文件失败：" + configStr);
// }
// }
// catch (Exception ex)
// {
// LogUtil.error("出错：",ex);
// }
//}
private static List<int> trayHeightList = new List<int>() { 8, 12, 16, 24, 32, 44, 56 };
public static List<int> GetTrayList()
......
source/DeviceLibrary/assemblymanager/TrayManager.cs
......@@ -195,7 +195,7 @@ namespace OnlineStore.DeviceLibrary
break;
}
}
foreach (ProvidingEquip equip in LineManager.Line.ProvidingEquipMap.Values)
foreach (HYEquipBase equip in LineManager.Line.HYEquipMap.Values)
{
if (equip.Config.SidesWayNum.Equals(swNum))
{
......
source/DeviceLibrary/model/KTK_Store.cs
......@@ -481,23 +481,20 @@ namespace OnlineStore.DeviceLibrary
{
if (IoHighType.Equals(IO_Type.ClampCylinder_Slack) || IoHighType.Equals(IO_Type.ClampCylinder_Tighten) ||
IoHighType.Equals(IO_Type.UpDownCylinder_Down) || IoHighType.Equals(IO_Type.UpDownCylinder_Up)
if (IoHighType.Equals(IO_Type.ClampCylinder_Work) || IoHighType.Equals(IO_Type.ClampCylinder_Relax) ||
IoHighType.Equals(IO_Type.UpDownCylinder_Down) || IoHighType.Equals(IO_Type.UpDownCylinder_Up)||
IoHighType.Equals(IO_Type.BeforeAfterCylinder_After) || IoHighType.Equals(IO_Type.BeforeAfterCylinder_Before)
)
{
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
}
else if (IoHighType.Equals(IO_Type.BeforeAfterCylinder_After) || IoHighType.Equals(IO_Type.BeforeAfterCylinder_Before))
{
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(800));
}
}
//如果是进仓门口 夹紧
if (baseConfig.DType.Equals(DeviceType.MoveEquip) && (IoHighType.Equals(IO_Type.ClampCylinder_Slack)))
if (baseConfig.DType.Equals(DeviceType.MoveEquip) && (IoHighType.Equals(IO_Type.ClampCylinder_Work)))
{
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoLowType, IO_VALUE.LOW));
}
else if (baseConfig.DType.Equals(DeviceType.MoveEquip) && (IoHighType.Equals(IO_Type.ClampCylinder_Tighten)))
else if (baseConfig.DType.Equals(DeviceType.MoveEquip) && (IoHighType.Equals(IO_Type.ClampCylinder_Relax)))
{
//进仓门口放松
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
......@@ -547,7 +544,7 @@ namespace OnlineStore.DeviceLibrary
IO_VALUE tValue = value.Equals(IO_VALUE.HIGH) ? IO_VALUE.LOW : IO_VALUE.HIGH;
if (IOValue(IoType).Equals(tValue).Equals(false))
{
if (IoType.Equals(IO_Type.StopCylinder_Down1).Equals(false)&&IoType.Equals(IO_Type.SW_StopDown).Equals(false))
if (IoType.Equals(IO_Type.StopDown1).Equals(false)&&IoType.Equals(IO_Type.SW_StopDown).Equals(false))
{
LogUtil.info(Name + "定时回写IO: [" + IoType + "]=[" + value + "]，[" + baseConfig.Id + "]，msTime=" + msTime);
}
......
source/LoadCVSLibrary/LoadCSVLibrary.csproj
......@@ -51,8 +51,7 @@
<Compile Include="storeConfig\ConfigProAttribute.cs" />
<Compile Include="storeConfig\config\Line_Config.cs" />
<Compile Include="storeConfig\config\FeedingEquip_Config.cs" />
<Compile Include="storeConfig\config\DischargeLine_Config.cs" />
<Compile Include="storeConfig\config\ProvidingEquip_Config.cs" />
<Compile Include="storeConfig\config\HYEquip_Config.cs" />
<Compile Include="storeConfig\config\MoveEquip_Config.cs" />
<Compile Include="storeConfig\config\IO_Type.cs" />
<Compile Include="CSVAttribute.cs" />
......
source/LoadCVSLibrary/storeConfig/CSVConfigReader.cs
......@@ -141,11 +141,11 @@ namespace OnlineStore.LoadCSVLibrary
return (Line_Config)LoadConfig(config);
}
public static DischargeLine_Config LoadDischargeLineConfig(int storeId, string type, string filePath)
{
DischargeLine_Config config = new DischargeLine_Config(storeId, storeId + "_"+ type, type, filePath);
return (DischargeLine_Config)LoadConfig(config);
}
//public static DischargeLine_Config LoadDischargeLineConfig(int storeId, string type, string filePath)
//{
// DischargeLine_Config config = new DischargeLine_Config(storeId, storeId + "_"+ type, type, filePath);
// return (DischargeLine_Config)LoadConfig(config);
//}
public static MoveEquip_Config LoadMoveConfig(int storeId, string type, string filePath)
{
MoveEquip_Config config = new MoveEquip_Config(storeId, storeId + "_" + type, type, filePath);
......@@ -156,10 +156,10 @@ namespace OnlineStore.LoadCSVLibrary
FeedingEquip_Config config = new FeedingEquip_Config(storeId, storeId + "_" + type, type, filePath);
return (FeedingEquip_Config)LoadConfig(config);
}
public static ProvidingEquip_Config LoadProvidingConfig(int storeId, string type, string filePath)
public static HYEquip_Config LoadHYConfig(int storeId, string type, string filePath)
{
ProvidingEquip_Config config = new ProvidingEquip_Config(storeId, storeId + "_" + type, type, filePath);
return (ProvidingEquip_Config)LoadConfig(config);
HYEquip_Config config = new HYEquip_Config(storeId, storeId + "_" + type, type, filePath);
return (HYEquip_Config)LoadConfig(config);
}
public static DeviceConfig LoadConfig(DeviceConfig config)
{
......
source/LoadCVSLibrary/storeConfig/config/DeviceConfig.cs
......@@ -44,11 +44,7 @@ namespace OnlineStore.LoadCSVLibrary
/// 手动料仓输出Io列表，key=对应的坐标位置的positionNum
/// </summary>
public Dictionary<String, ConfigIO> DOList { get; set; }
/// <summary>
/// 料仓所有用到的IO卡名称
/// </summary>
......@@ -380,11 +376,11 @@ namespace OnlineStore.LoadCSVLibrary
/// <summary>
/// 出料模块
/// </summary>
public static string ProvidingEquip = "ProvidingEquip";
/// <summary>
/// 出料流水线
/// </summary>
public static string DischargeLine = "DischargeLine";
public static string HYEquip = "HYEquip";
///// <summary>
///// 出料流水线
///// </summary>
//public static string DischargeLine = "DischargeLine";
}
......
source/LoadCVSLibrary/storeConfig/config/ProvidingEquip_Config.cs → source/LoadCVSLibrary/storeConfig/config/HYEquip_Config.cs
......@@ -9,29 +9,24 @@ using System.Threading.Tasks;
namespace OnlineStore.LoadCSVLibrary
{
public class ProvidingEquip_Config : DeviceConfig
public class HYEquip_Config : DeviceConfig
{
public ProvidingEquip_Config()
public HYEquip_Config()
: base()
{
}
public ProvidingEquip_Config(int id, string cid, string type, string filepath)
: base(id, cid, LoadCSVLibrary.DeviceType.ProvidingEquip, filepath)
public HYEquip_Config(int id, string cid, string type, string filepath)
: base(id, cid, LoadCSVLibrary.DeviceType.HYEquip, filepath)
{
}
public int SidesWayNum = 0;
/// <summary>
/// 设备是否处于调试状态（1=调试，0=正常）
/// </summary>
[ConfigProAttribute("IsDebug")]
public int IsDebug { get; set; }
/// <summary>
/// PRO,0,对应的横移模块,SidesWayNum,3,,,,,
/// </summary>
[ConfigProAttribute("SidesWayNum", false)]
public int SidesWayNum { get; set; }
/// <summary>
/// PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,,,,
......@@ -69,39 +64,7 @@ namespace OnlineStore.LoadCSVLibrary
/// PRO 0 移栽上下轴待机点 P1 UpDownAxisP1 403000
/// </summary>
[ConfigProAttribute("UpDownAxisP1", false)]
public int UpDownAxisP1 { get; set; }
/// <summary>
/// PRO 0 移栽上下轴目标速度 UpdownAxis_TargetSpeed 150
/// </summary>
[ConfigProAttribute("UpdownAxis_TargetSpeed", false)]
public int UpdownAxis_TargetSpeed { get; set; }
/// <summary>
/// PRO 0 移栽上下轴加速度 UpdownAxis_AddSpeed 400
/// </summary>
[ConfigProAttribute("UpdownAxis_AddSpeed", false)]
public short UpdownAxis_AddSpeed { get; set; }
/// <summary>
/// PRO 0 移栽上下轴减速度 UpdownAxis_DelSpeed 400
/// </summary>
[ConfigProAttribute("UpdownAxis_DelSpeed", false)]
public short UpdownAxis_DelSpeed { get; set; }
/// <summary>
/// PRO 0 移栽上下轴原点低速度 UpdownAxis_HomeLowSpeed 100
/// </summary>
[ConfigProAttribute("UpdownAxis_HomeLowSpeed", false)]
public int UpdownAxis_HomeLowSpeed { get; set; }
/// <summary>
/// PRO 0 移栽上下轴原点高速 UpdownAxis_HomeHighSpeed 200
/// </summary>
[ConfigProAttribute("UpdownAxis_HomeHighSpeed", false)]
public int UpdownAxis_HomeHighSpeed { get; set; }
/// <summary>
/// PRO 0 移栽上下轴原点加速度 UpdownAxis_HomeAddSpeed 200
/// </summary>
[ConfigProAttribute("UpdownAxis_HomeAddSpeed", false)]
public int UpdownAxis_HomeAddSpeed { get; set; }
public int UpDownAxisP1 { get; set; }
/// <summary>
/// PRO,0,移栽上下轴走到待机点速度,UpdownAxis_P1Speed,400,,,,,
......
source/LoadCVSLibrary/storeConfig/config/IO_Type.cs
......@@ -65,18 +65,18 @@ namespace OnlineStore.LoadCSVLibrary
/// DO 0 红灯 故障状态（指示灯） Alarm_HddLed 26 故障状态（指示灯） Y03 DO-03
/// </summary>
public static string Alarm_HddLed = "Alarm_HddLed";
/// <summary>
/// DO 0 阻挡气缸0-1下降SOL StopCylinder_Down1 16 阻挡气缸0-1下降SOL Y11 DO-11
/// DO 0 阻挡气缸0-1下降SOL StopDown1 16 阻挡气缸0-1下降SOL Y11 DO-11
/// </summary>
public static string StopCylinder_Down1 = "StopCylinder_Down1";
public static string StopDown1 = "StopDown1";
/// <summary>
/// DO 0 阻挡气缸0-2下降SOL StopCylinder_Down2 17 阻挡气缸0-2下降SOL Y12 DO-12
/// DO 0 阻挡气缸0-2下降SOL StopDown2 17 阻挡气缸0-2下降SOL Y12 DO-12
/// </summary>
public static string StopCylinder_Down2 = "StopCylinder_Down2";
public static string StopDown2 = "StopDown2";
......@@ -112,14 +112,16 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary>
public static string UpDownCylinder_Down = "UpDownCylinder_Down";
/// <summary>
/// 移栽DI/DO 移载夹料气缸夹紧端 ClampCylinder_Slack 11
/// 移栽DI/DO 移载夹料气缸夹紧端 ClampCylinder_Work 11
/// </summary>
public static string ClampCylinder_Slack = "ClampCylinder_Slack";
public static string ClampCylinder_Work = "ClampCylinder_Work";
/// <summary>
/// 移栽DI/DO 移载夹料气缸放松端 ClampCylinder_Tighten 12
/// 移栽DI/DO 移载夹料气缸放松端 ClampCylinder_Relax 12
/// </summary>
public static string ClampCylinder_Tighten = "ClampCylinder_Tighten";
public static string ClampCylinder_Relax = "ClampCylinder_Relax";
......@@ -138,13 +140,13 @@ namespace OnlineStore.LoadCSVLibrary
#region 流水线新增IO
/// <summary>
/// DI 进仓01阻挡1托盘检测,StopCylinder_Check1, X261
/// DI 进仓01阻挡1托盘检测,StopCheck1, X261
/// </summary>
public static string StopCylinder_Check1 = "StopCylinder_Check1";
public static string StopCheck1 = "StopCheck1";
/// <summary>
/// DI 进仓01阻挡2托盘检测, StopCylinder_Check2, X262
/// DI 进仓01阻挡2托盘检测, StopCheck2, X262
/// </summary>
public static string StopCylinder_Check2 = "StopCylinder_Check2";
public static string StopCheck2 = "StopCheck2";
/// <summary>
///DI NG料盘推出气缸前进端,NGCylinder_Before, X005
/// </summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!