Skip to content

李娜 / SO664-AssemblyLine

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

hy修改

1 个父辈 cbe75bfe
内嵌 并排
正在显示 11 个修改的文件 包含 278 行增加 和 214 行删除
source/AssemblyLineClient/FrmLineIO.Designer.cs
...@@ -44,7 +44,13 @@ ...@@ -44,7 +44,13 @@
this.btnTopDown = new System.Windows.Forms.Button(); this.btnTopDown = new System.Windows.Forms.Button();
this.lblTrayNum = new System.Windows.Forms.Label(); this.lblTrayNum = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.groupBox6 = new System.Windows.Forms.GroupBox(); this.chbTray = new System.Windows.Forms.CheckBox();
this.groupTray = new System.Windows.Forms.GroupBox();
this.txtTrayLoc = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.chbSmall = new System.Windows.Forms.CheckBox();
this.rdbCutreel = new System.Windows.Forms.RadioButton();
this.rdbUrg = new System.Windows.Forms.RadioButton();
this.lblSelTrayNum = new System.Windows.Forms.Label(); this.lblSelTrayNum = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label();
this.cmbHeight = new System.Windows.Forms.ComboBox(); this.cmbHeight = new System.Windows.Forms.ComboBox();
...@@ -61,18 +67,13 @@ ...@@ -61,18 +67,13 @@
this.cmbTray = new System.Windows.Forms.ComboBox(); this.cmbTray = new System.Windows.Forms.ComboBox();
this.btnUpdateTray = new System.Windows.Forms.Button(); this.btnUpdateTray = new System.Windows.Forms.Button();
this.lblMoveInfo = new System.Windows.Forms.Label(); this.lblMoveInfo = new System.Windows.Forms.Label();
this.rdbUrg = new System.Windows.Forms.RadioButton();
this.rdbCutreel = new System.Windows.Forms.RadioButton();
this.chbSmall = new System.Windows.Forms.CheckBox();
this.label3 = new System.Windows.Forms.Label();
this.txtTrayLoc = new System.Windows.Forms.TextBox();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout(); this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
this.groupBox5.SuspendLayout(); this.groupBox5.SuspendLayout();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.groupBox6.SuspendLayout(); this.groupTray.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// timer1 // timer1
...@@ -226,7 +227,7 @@ ...@@ -226,7 +227,7 @@
this.groupBox4.Controls.Add(this.tableLayoutPanel2); this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(289, 3); this.groupBox4.Location = new System.Drawing.Point(289, 3);
this.groupBox4.Name = "groupBox4"; this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(276, 560); this.groupBox4.Size = new System.Drawing.Size(276, 600);
this.groupBox4.TabIndex = 104; this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false; this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表"; this.groupBox4.Text = "DO列表";
...@@ -244,7 +245,7 @@ ...@@ -244,7 +245,7 @@
this.tableLayoutPanel2.RowCount = 2; this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(265, 540); this.tableLayoutPanel2.Size = new System.Drawing.Size(265, 580);
this.tableLayoutPanel2.TabIndex = 103; this.tableLayoutPanel2.TabIndex = 103;
// //
// groupBox3 // groupBox3
...@@ -254,7 +255,7 @@ ...@@ -254,7 +255,7 @@
this.groupBox3.Controls.Add(this.tableLayoutPanel1); this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(6, 3); this.groupBox3.Location = new System.Drawing.Point(6, 3);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(276, 560); this.groupBox3.Size = new System.Drawing.Size(276, 600);
this.groupBox3.TabIndex = 103; this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表"; this.groupBox3.Text = "DI列表";
...@@ -272,7 +273,7 @@ ...@@ -272,7 +273,7 @@
this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(265, 540); this.tableLayoutPanel1.Size = new System.Drawing.Size(265, 580);
this.tableLayoutPanel1.TabIndex = 102; this.tableLayoutPanel1.TabIndex = 102;
// //
// groupBox2 // groupBox2
...@@ -282,7 +283,7 @@ ...@@ -282,7 +283,7 @@
this.groupBox2.Controls.Add(this.tableLayoutPanel3); this.groupBox2.Controls.Add(this.tableLayoutPanel3);
this.groupBox2.Location = new System.Drawing.Point(235, 129); this.groupBox2.Location = new System.Drawing.Point(235, 129);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(225, 434); this.groupBox2.Size = new System.Drawing.Size(225, 474);
this.groupBox2.TabIndex = 245; this.groupBox2.TabIndex = 245;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "DI列表"; this.groupBox2.Text = "DI列表";
...@@ -300,20 +301,18 @@ ...@@ -300,20 +301,18 @@
this.tableLayoutPanel3.RowCount = 2; this.tableLayoutPanel3.RowCount = 2;
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel3.Size = new System.Drawing.Size(214, 414); this.tableLayoutPanel3.Size = new System.Drawing.Size(214, 454);
this.tableLayoutPanel3.TabIndex = 102; this.tableLayoutPanel3.TabIndex = 102;
// //
// groupBox5 // groupBox5
// //
this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox5.Controls.Add(this.btnLineStop); this.groupBox5.Controls.Add(this.btnLineStop);
this.groupBox5.Controls.Add(this.button2); this.groupBox5.Controls.Add(this.button2);
this.groupBox5.Controls.Add(this.btnDriveMotor_Run); this.groupBox5.Controls.Add(this.btnDriveMotor_Run);
this.groupBox5.Controls.Add(this.btnFrontStopDown); this.groupBox5.Controls.Add(this.btnFrontStopDown);
this.groupBox5.Controls.Add(this.btnStopDown); this.groupBox5.Controls.Add(this.btnStopDown);
this.groupBox5.Controls.Add(this.btnTopDown); this.groupBox5.Controls.Add(this.btnTopDown);
this.groupBox5.Location = new System.Drawing.Point(573, 136); this.groupBox5.Location = new System.Drawing.Point(573, 134);
this.groupBox5.Name = "groupBox5"; this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(475, 130); this.groupBox5.Size = new System.Drawing.Size(475, 130);
this.groupBox5.TabIndex = 246; this.groupBox5.TabIndex = 246;
...@@ -397,7 +396,7 @@ ...@@ -397,7 +396,7 @@
this.lblTrayNum.AutoSize = true; this.lblTrayNum.AutoSize = true;
this.lblTrayNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblTrayNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTrayNum.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblTrayNum.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblTrayNum.Location = new System.Drawing.Point(872, 478); this.lblTrayNum.Location = new System.Drawing.Point(827, 478);
this.lblTrayNum.Name = "lblTrayNum"; this.lblTrayNum.Name = "lblTrayNum";
this.lblTrayNum.Size = new System.Drawing.Size(68, 17); this.lblTrayNum.Size = new System.Drawing.Size(68, 17);
this.lblTrayNum.TabIndex = 275; this.lblTrayNum.TabIndex = 275;
...@@ -408,7 +407,8 @@ ...@@ -408,7 +407,8 @@
// panel1 // panel1
// //
this.panel1.AutoScroll = true; this.panel1.AutoScroll = true;
this.panel1.Controls.Add(this.groupBox6); this.panel1.Controls.Add(this.chbTray);
this.panel1.Controls.Add(this.groupTray);
this.panel1.Controls.Add(this.lblMoveInfo); this.panel1.Controls.Add(this.lblMoveInfo);
this.panel1.Controls.Add(this.lblTrayNum); this.panel1.Controls.Add(this.lblTrayNum);
this.panel1.Controls.Add(this.groupBox4); this.panel1.Controls.Add(this.groupBox4);
...@@ -419,38 +419,98 @@ ...@@ -419,38 +419,98 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1060, 571); this.panel1.Size = new System.Drawing.Size(1060, 611);
this.panel1.TabIndex = 248; this.panel1.TabIndex = 248;
// //
// groupBox6 // chbTray
// //
this.groupBox6.Controls.Add(this.txtTrayLoc); this.chbTray.AutoSize = true;
this.groupBox6.Controls.Add(this.label3); this.chbTray.Location = new System.Drawing.Point(941, 479);
this.groupBox6.Controls.Add(this.chbSmall); this.chbTray.Name = "chbTray";
this.groupBox6.Controls.Add(this.rdbCutreel); this.chbTray.Size = new System.Drawing.Size(99, 21);
this.groupBox6.Controls.Add(this.rdbUrg); this.chbTray.TabIndex = 278;
this.groupBox6.Controls.Add(this.lblSelTrayNum); this.chbTray.Text = "托盘信息编辑";
this.groupBox6.Controls.Add(this.label9); this.chbTray.UseVisualStyleBackColor = true;
this.groupBox6.Controls.Add(this.cmbHeight); this.chbTray.CheckedChanged += new System.EventHandler(this.chbTray_CheckedChanged);
this.groupBox6.Controls.Add(this.cmbWidth); //
this.groupBox6.Controls.Add(this.label8); // groupTray
this.groupBox6.Controls.Add(this.label7); //
this.groupBox6.Controls.Add(this.txtTrayCode); this.groupTray.Controls.Add(this.txtTrayLoc);
this.groupBox6.Controls.Add(this.label6); this.groupTray.Controls.Add(this.label3);
this.groupBox6.Controls.Add(this.label1); this.groupTray.Controls.Add(this.chbSmall);
this.groupBox6.Controls.Add(this.chbInStoNG); this.groupTray.Controls.Add(this.rdbCutreel);
this.groupBox6.Controls.Add(this.cmbTrayType); this.groupTray.Controls.Add(this.rdbUrg);
this.groupBox6.Controls.Add(this.label2); this.groupTray.Controls.Add(this.lblSelTrayNum);
this.groupBox6.Controls.Add(this.txtTrayPosid); this.groupTray.Controls.Add(this.label9);
this.groupBox6.Controls.Add(this.cmbTray); this.groupTray.Controls.Add(this.cmbHeight);
this.groupBox6.Controls.Add(this.btnUpdateTray); this.groupTray.Controls.Add(this.cmbWidth);
this.groupBox6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupTray.Controls.Add(this.label8);
this.groupBox6.Location = new System.Drawing.Point(573, 272); this.groupTray.Controls.Add(this.label7);
this.groupBox6.Name = "groupBox6"; this.groupTray.Controls.Add(this.txtTrayCode);
this.groupBox6.Size = new System.Drawing.Size(475, 203); this.groupTray.Controls.Add(this.label6);
this.groupBox6.TabIndex = 277; this.groupTray.Controls.Add(this.label1);
this.groupBox6.TabStop = false; this.groupTray.Controls.Add(this.chbInStoNG);
this.groupBox6.Text = "托盘信息编辑"; this.groupTray.Controls.Add(this.cmbTrayType);
this.groupTray.Controls.Add(this.label2);
this.groupTray.Controls.Add(this.txtTrayPosid);
this.groupTray.Controls.Add(this.cmbTray);
this.groupTray.Controls.Add(this.btnUpdateTray);
this.groupTray.Enabled = false;
this.groupTray.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupTray.Location = new System.Drawing.Point(573, 268);
this.groupTray.Name = "groupTray";
this.groupTray.Size = new System.Drawing.Size(475, 203);
this.groupTray.TabIndex = 277;
this.groupTray.TabStop = false;
this.groupTray.Text = "托盘信息编辑";
//
// txtTrayLoc
//
this.txtTrayLoc.Location = new System.Drawing.Point(241, 97);
this.txtTrayLoc.Name = "txtTrayLoc";
this.txtTrayLoc.Size = new System.Drawing.Size(59, 23);
this.txtTrayLoc.TabIndex = 281;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(190, 100);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(47, 17);
this.label3.TabIndex = 280;
this.label3.Text = "料架号:";
//
// chbSmall
//
this.chbSmall.AutoSize = true;
this.chbSmall.Location = new System.Drawing.Point(316, 58);
this.chbSmall.Name = "chbSmall";
this.chbSmall.Size = new System.Drawing.Size(63, 21);
this.chbSmall.TabIndex = 279;
this.chbSmall.Text = "小料盘";
this.chbSmall.UseVisualStyleBackColor = true;
//
// rdbCutreel
//
this.rdbCutreel.AutoSize = true;
this.rdbCutreel.Location = new System.Drawing.Point(395, 25);
this.rdbCutreel.Name = "rdbCutreel";
this.rdbCutreel.Size = new System.Drawing.Size(62, 21);
this.rdbCutreel.TabIndex = 278;
this.rdbCutreel.TabStop = true;
this.rdbCutreel.Text = "分盘料";
this.rdbCutreel.UseVisualStyleBackColor = true;
//
// rdbUrg
//
this.rdbUrg.AutoSize = true;
this.rdbUrg.Location = new System.Drawing.Point(317, 25);
this.rdbUrg.Name = "rdbUrg";
this.rdbUrg.Size = new System.Drawing.Size(62, 21);
this.rdbUrg.TabIndex = 277;
this.rdbUrg.TabStop = true;
this.rdbUrg.Text = "紧急料";
this.rdbUrg.UseVisualStyleBackColor = true;
// //
// lblSelTrayNum // lblSelTrayNum
// //
...@@ -604,59 +664,11 @@ ...@@ -604,59 +664,11 @@
this.lblMoveInfo.TabIndex = 276; this.lblMoveInfo.TabIndex = 276;
this.lblMoveInfo.Text = "CID"; this.lblMoveInfo.Text = "CID";
// //
// rdbUrg
//
this.rdbUrg.AutoSize = true;
this.rdbUrg.Location = new System.Drawing.Point(317, 25);
this.rdbUrg.Name = "rdbUrg";
this.rdbUrg.Size = new System.Drawing.Size(62, 21);
this.rdbUrg.TabIndex = 277;
this.rdbUrg.TabStop = true;
this.rdbUrg.Text = "紧急料";
this.rdbUrg.UseVisualStyleBackColor = true;
//
// rdbCutreel
//
this.rdbCutreel.AutoSize = true;
this.rdbCutreel.Location = new System.Drawing.Point(395, 25);
this.rdbCutreel.Name = "rdbCutreel";
this.rdbCutreel.Size = new System.Drawing.Size(62, 21);
this.rdbCutreel.TabIndex = 278;
this.rdbCutreel.TabStop = true;
this.rdbCutreel.Text = "分盘料";
this.rdbCutreel.UseVisualStyleBackColor = true;
//
// chbSmall
//
this.chbSmall.AutoSize = true;
this.chbSmall.Location = new System.Drawing.Point(316, 58);
this.chbSmall.Name = "chbSmall";
this.chbSmall.Size = new System.Drawing.Size(63, 21);
this.chbSmall.TabIndex = 279;
this.chbSmall.Text = "小料盘";
this.chbSmall.UseVisualStyleBackColor = true;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(190, 100);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(47, 17);
this.label3.TabIndex = 280;
this.label3.Text = "料架号:";
//
// txtTrayLoc
//
this.txtTrayLoc.Location = new System.Drawing.Point(241, 97);
this.txtTrayLoc.Name = "txtTrayLoc";
this.txtTrayLoc.Size = new System.Drawing.Size(59, 23);
this.txtTrayLoc.TabIndex = 281;
//
// FrmLineIO // FrmLineIO
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1060, 571); this.ClientSize = new System.Drawing.Size(1060, 611);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false; this.MaximizeBox = false;
...@@ -674,8 +686,8 @@ ...@@ -674,8 +686,8 @@
this.groupBox5.ResumeLayout(false); this.groupBox5.ResumeLayout(false);
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
this.panel1.PerformLayout(); this.panel1.PerformLayout();
this.groupBox6.ResumeLayout(false); this.groupTray.ResumeLayout(false);
this.groupBox6.PerformLayout(); this.groupTray.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
} }
...@@ -710,7 +722,7 @@ ...@@ -710,7 +722,7 @@
private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button btnLineStop; private System.Windows.Forms.Button btnLineStop;
private System.Windows.Forms.Label lblMoveInfo; private System.Windows.Forms.Label lblMoveInfo;
private System.Windows.Forms.GroupBox groupBox6; private System.Windows.Forms.GroupBox groupTray;
private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.CheckBox chbInStoNG; private System.Windows.Forms.CheckBox chbInStoNG;
...@@ -731,6 +743,7 @@ ...@@ -731,6 +743,7 @@
private System.Windows.Forms.CheckBox chbSmall; private System.Windows.Forms.CheckBox chbSmall;
private System.Windows.Forms.RadioButton rdbCutreel; private System.Windows.Forms.RadioButton rdbCutreel;
private System.Windows.Forms.RadioButton rdbUrg; private System.Windows.Forms.RadioButton rdbUrg;
private System.Windows.Forms.CheckBox chbTray;
} }
} }
source/AssemblyLineClient/FrmLineIO.cs
...@@ -411,5 +411,14 @@ namespace OnlineStore.AssemblyLine ...@@ -411,5 +411,14 @@ namespace OnlineStore.AssemblyLine
} }
} }
} }
private void chbTray_CheckedChanged(object sender, EventArgs e)
{
if (!groupTray.Enabled.Equals(chbTray.Checked))
{
groupTray.Enabled = chbTray.Checked;
LogUtil.error("勾选 " + chbTray.Text + "=" + groupTray.Enabled);
}
}
} }
} }
source/AssemblyLineClient/FrmLineStore.cs
...@@ -305,13 +305,11 @@ namespace OnlineStore.AssemblyLine ...@@ -305,13 +305,11 @@ namespace OnlineStore.AssemblyLine
Clipboard.SetDataObject(logBox.Text); Clipboard.SetDataObject(logBox.Text);
MessageBox.Show("已复制日志到粘贴板！"); MessageBox.Show("已复制日志到粘贴板！");
} }
#region 内存回收 #region 内存回收
[DllImport("kernel32.dll", EntryPoint = "SetProcessWorkingSetSize")] [DllImport("kernel32.dll", EntryPoint = "SetProcessWorkingSetSize")]
public static extern int SetProcessWorkingSetSize(IntPtr process, int minSize, int maxSize); public static extern int SetProcessWorkingSetSize(IntPtr process, int minSize, int maxSize);
/// <summary>
/// 释放内存
/// </summary>
public static void ClearMemory() public static void ClearMemory()
{ {
try try
......
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -173,18 +173,9 @@ ...@@ -173,18 +173,9 @@
<Content Include="LineConfig\MoveEquip\Config_MoveEquip.csv"> <Content Include="LineConfig\MoveEquip\Config_MoveEquip.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<None Include="LineConfig\MoveEquip\back\Config_MoveEquip_01.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Content Include="LineConfig\MoveEquip\Config_MoveEquip_10.csv"> <Content Include="LineConfig\MoveEquip\Config_MoveEquip_10.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<None Include="LineConfig\MoveEquip\back\Config_MoveEquip_11.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\MoveEquip\back\Config_MoveEquip_12.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Content Include="LineConfig\MoveEquip\Config_MoveEquip_13.csv"> <Content Include="LineConfig\MoveEquip\Config_MoveEquip_13.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
...@@ -197,48 +188,12 @@ ...@@ -197,48 +188,12 @@
<Content Include="LineConfig\MoveEquip\Config_MoveEquip_16.csv"> <Content Include="LineConfig\MoveEquip\Config_MoveEquip_16.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<None Include="LineConfig\MoveEquip\back\Config_MoveEquip_17.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Content Include="LineConfig\MoveEquip\Config_MoveEquip_18.csv"> <Content Include="LineConfig\MoveEquip\Config_MoveEquip_18.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<None Include="LineConfig\MoveEquip\back\Config_MoveEquip_02.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\MoveEquip\back\Config_MoveEquip_03.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\MoveEquip\back\Config_MoveEquip_04.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\MoveEquip\back\Config_MoveEquip_05.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\MoveEquip\back\Config_MoveEquip_06.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\MoveEquip\back\Config_MoveEquip_07.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\MoveEquip\back\Config_MoveEquip_08.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Content Include="LineConfig\MoveEquip\Config_MoveEquip_09.csv"> <Content Include="LineConfig\MoveEquip\Config_MoveEquip_09.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<None Include="LineConfig\MoveEquip\back\Config_MoveEquip_19.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\MoveEquip\back\Config_MoveEquip_20.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\MoveEquip\back\Config_MoveEquip_21.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="LineConfig\MoveEquip\back\Config_MoveEquip_22.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Content Include="LineConfig\MoveEquip\Config_MoveEquip_23.csv"> <Content Include="LineConfig\MoveEquip\Config_MoveEquip_23.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
......
source/DeviceLibrary/assemblyLine/EquipBase.cs
...@@ -563,7 +563,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -563,7 +563,7 @@ namespace OnlineStore.DeviceLibrary
} }
protected void InLog(string msg) protected void InLog(string msg)
{ {
string posId = MoveInfo.MoveParam != null ? "[" + MoveInfo.MoveParam.PosId + "][" + MoveInfo.MoveParam.WareCode + "]" : ""; string posId = MoveInfo.MoveParam != null ? "[" + currTrayNum + "][" + MoveInfo.MoveParam.PosId + "][" + MoveInfo.MoveParam.WareCode + "]" : "";
//baseConfig.DType.Equals(DeviceType.HYEquip) //baseConfig.DType.Equals(DeviceType.HYEquip)
if (baseConfig.DType.Equals(DeviceType.MoveEquip)) if (baseConfig.DType.Equals(DeviceType.MoveEquip))
{ {
...@@ -576,7 +576,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -576,7 +576,7 @@ namespace OnlineStore.DeviceLibrary
} }
protected void OutLog(string msg) protected void OutLog(string msg)
{ {
string posId = MoveInfo.MoveParam != null ? "[" + MoveInfo.MoveParam.PosId + "][" + MoveInfo.MoveParam.WareCode + "]" : ""; string posId = MoveInfo.MoveParam != null ? "["+currTrayNum+"][" + MoveInfo.MoveParam.PosId + "][" + MoveInfo.MoveParam.WareCode + "]" : "";
//baseConfig.DType.Equals(DeviceType.HYEquip) //baseConfig.DType.Equals(DeviceType.HYEquip)
if (baseConfig.DType.Equals(DeviceType.MoveEquip)) if (baseConfig.DType.Equals(DeviceType.MoveEquip))
{ {
......
source/DeviceLibrary/assemblyLine/HY/HYEquipBase.cs
...@@ -124,24 +124,24 @@ namespace OnlineStore.DeviceLibrary ...@@ -124,24 +124,24 @@ namespace OnlineStore.DeviceLibrary
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
buf.Append(" 所在流水线：" + Config.LineName+"\r\n"); buf.Append(" 所在流水线：" + Config.LineName+"\r\n");
string dName = "暂无"; string dName = "暂无";
if (Config.WorkDevice>0&&LineManager.Line.AllEquipMap.ContainsKey(Config.WorkDevice)) if (Config.WorkDeviceId>0&&LineManager.Line.AllEquipMap.ContainsKey(Config.WorkDeviceId))
{ {
dName = LineManager.Line.AllEquipMap[Config.WorkDevice].Name; dName = LineManager.Line.AllEquipMap[Config.WorkDeviceId].Name;
} }
buf.Append(" 取放料设备：" + dName + "\r\n"); buf.Append(" 取放料设备：" + dName + "\r\n");
if (Config.IsSideWayIn.Equals(1)) if (Config.IsSideWayIn)
{ {
buf.Append("C1线横移入口：✔" + "\r\n"); buf.Append("C1线横移入口：✔" + "\r\n");
} }
if (Config.IsSideWayOut.Equals(1)) if (Config.IsSideWayOut)
{ {
buf.Append("C1线横移出口：✔" + "\r\n"); buf.Append("C1线横移出口：✔" + "\r\n");
} }
if (Config.IsOutLineIn.Equals(1)) if (Config.IsOutLineIn)
{ {
buf.Append(" 出料托盘入口：✔" + "\r\n"); buf.Append(" 出料托盘入口：✔" + "\r\n");
} }
if (Config.IsOutLineOut.Equals(1)) if (Config.IsOutLineOut)
{ {
buf.Append(" 出料托盘出口：✔" + "\r\n"); buf.Append(" 出料托盘出口：✔" + "\r\n");
} }
......
source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs
...@@ -223,7 +223,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -223,7 +223,7 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.HY_OL_StopDown, IO_VALUE.LOW); IOMove(IO_Type.HY_OL_StopDown, IO_VALUE.LOW);
} }
} }
else if (Config.IsOutLineOut.Equals(1) && IOValue(IO_Type.HY_OL_Tray_Check).Equals(IO_VALUE.HIGH)) else if (Config.IsOutLineOut && IOValue(IO_Type.HY_OL_Tray_Check).Equals(IO_VALUE.HIGH))
{ {
bool check2IsOk = CheckStopWatch(trayCheck2LowWait, TrayWaitTime, false); bool check2IsOk = CheckStopWatch(trayCheck2LowWait, TrayWaitTime, false);
if (CheckStopWatch(trayCheckWait, TrayWaitTime, false) && check2IsOk) if (CheckStopWatch(trayCheckWait, TrayWaitTime, false) && check2IsOk)
...@@ -294,25 +294,25 @@ namespace OnlineStore.DeviceLibrary ...@@ -294,25 +294,25 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(LineMoveStep.HY05_TrayCheck); MoveInfo.NextMoveStep(LineMoveStep.HY05_TrayCheck);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
if (TrayNeedHY(currTrayNum))
//先判断是否需要到出料线，在判断是否需要横移
if (TrayNeedToOutLine(currTrayNum))
{ {
HY11_TopUpToHY(); HY31_IOL_TopUp();
} }
else if (TrayNeedToOutLine(currTrayNum)) else if (TrayNeedHY(currTrayNum))
{ {
HY31_IOL_TopUp(); HY11_TopUpToHY();
} }
else else
{ {
//直接放盘通过 //直接放盘通过
MoveInfo.NextMoveStep(LineMoveStep.HY91_TrayCanGo); MoveInfo.NextMoveStep(LineMoveStep.HY91_TrayCanGo);
CheckLog("托盘阻挡" + MoveInfo.SLog + " 无需处理，放托盘离开"); CheckLog("托盘阻挡" + MoveInfo.SLog + " 无需处理，放托盘离开");
} }
}
}
#endregion #endregion
#region C1线->出料线横移处理 31 #region C1线->出料线横移处理 31
...@@ -356,7 +356,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -356,7 +356,7 @@ namespace OnlineStore.DeviceLibrary
int lineId = DeviceID % 100; int lineId = DeviceID % 100;
LogInfo("C1线->出料线 【" + MoveInfo.MoveParam.ToShortStr() + "】" + MoveInfo.SLog + " 更新料盘位置【" + MoveInfo.MoveParam.WareCode + "】【INBELT】【" + lineId + "】"); LogInfo("C1线->出料线 【" + MoveInfo.MoveParam.ToShortStr() + "】" + MoveInfo.SLog + " 更新料盘位置【" + MoveInfo.MoveParam.WareCode + "】【INBELT】【" + lineId + "】");
//更新料盘位置 //更新料盘位置
SServerManager.UpdateTrayLoc(Name, MoveInfo.MoveParam.WareCode, LocStatus.INBELT, lineId.ToString()); SServerManager.UpdateTrayLoc(Name, MoveInfo.MoveParam.WareCode, LocStatus.INBELT, Config.LineName);
} }
else if (MoveInfo.IsStep(LineMoveStep.HY35_IOL_TopDown)) else if (MoveInfo.IsStep(LineMoveStep.HY35_IOL_TopDown))
{ {
...@@ -383,11 +383,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -383,11 +383,11 @@ namespace OnlineStore.DeviceLibrary
CheckLog("托盘横移" + MoveInfo.SLog + " ，等待" + hyout.Name + " 准备完成(顶升上升，定位下降) "); CheckLog("托盘横移" + MoveInfo.SLog + " ，等待" + hyout.Name + " 准备完成(顶升上升，定位下降) ");
GetHyOutEquip().MoveInfo.NewMove(LineMoveType.CheckFixture); GetHyOutEquip().MoveInfo.NewMove(LineMoveType.CheckFixture);
GetHyOutEquip().MoveInfo.NextMoveStep(LineMoveStep.HY51_WaitFree); GetHyOutEquip().MoveInfo.NextMoveStep(LineMoveStep.HY51_WaitFree);
ClearTimeoutAlarm("等待"+ hyout .Name+ "可以横移超时"); ClearTimeoutAlarm("等待" + hyout.Name + "可以横移超时");
} }
else if (MoveInfo.IsTimeOut()) else if (MoveInfo.IsTimeOut())
{ {
MoveTimeOut(MoveInfo, "等待" + hyout.Name + "可以横移超时"); MoveTimeOut(MoveInfo, "等待" + hyout.Name + "可以横移超时");
} }
} }
else if (MoveInfo.IsStep(LineMoveStep.HY13_WaitHY2Ready)) else if (MoveInfo.IsStep(LineMoveStep.HY13_WaitHY2Ready))
...@@ -401,7 +401,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -401,7 +401,7 @@ namespace OnlineStore.DeviceLibrary
LineRun(MoveInfo); LineRun(MoveInfo);
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
ClearTimeoutAlarm("等待"+ hyout .Name+ "顶升上升完成超时"); ClearTimeoutAlarm("等待" + hyout.Name + "顶升上升完成超时");
} }
else if (MoveInfo.IsTimeOut()) else if (MoveInfo.IsTimeOut())
{ {
...@@ -423,11 +423,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -423,11 +423,11 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY16_WatOutFixture2); MoveInfo.NextMoveStep(LineMoveStep.HY16_WatOutFixture2);
CheckLog("托盘横移" + MoveInfo.SLog + " ，等待托盘到达" + hyout.Name + "持续一段时间 "); CheckLog("托盘横移" + MoveInfo.SLog + " ，等待托盘到达" + hyout.Name + "持续一段时间 ");
ClearTimeoutAlarm("等待托盘到达"+ hyout .Name+ "超时"); ClearTimeoutAlarm("等待托盘到达" + hyout.Name + "超时");
} }
else if (MoveInfo.IsTimeOut()) else if (MoveInfo.IsTimeOut())
{ {
MoveTimeOut(MoveInfo, "等待托盘到达" + hyout.Name + "超时"); MoveTimeOut(MoveInfo, "等待托盘到达" + hyout.Name + "超时");
} }
} }
else if (MoveInfo.IsStep(LineMoveStep.HY16_WatOutFixture2)) else if (MoveInfo.IsStep(LineMoveStep.HY16_WatOutFixture2))
...@@ -442,7 +442,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -442,7 +442,7 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down); CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
HY_StopCylinderUp(MoveInfo); HY_StopCylinderUp(MoveInfo);
OL_StopCylinderUp(MoveInfo); OL_StopCylinderUp(MoveInfo);
ClearTimeoutAlarm("等待托盘到达"+ hyout .Name+ ""); ClearTimeoutAlarm("等待托盘到达" + hyout.Name + "");
} }
else if (MoveInfo.IsTimeOut()) else if (MoveInfo.IsTimeOut())
{ {
...@@ -587,11 +587,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -587,11 +587,11 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(LineMoveStep.HY91_TrayCanGo); MoveInfo.NextMoveStep(LineMoveStep.HY91_TrayCanGo);
CheckLog("托盘阻挡" + MoveInfo.SLog + " 无需处理，放托盘离开"); CheckLog("托盘阻挡" + MoveInfo.SLog + " 无需处理，放托盘离开");
} }
} }
#endregion #endregion
#region 分流横移放盘离开 91 #region 分流横移放盘离开 91
...@@ -659,9 +659,87 @@ namespace OnlineStore.DeviceLibrary ...@@ -659,9 +659,87 @@ namespace OnlineStore.DeviceLibrary
{ {
try try
{ {
if (Config.IsSideWayIn.Equals(1) && trayNum > 0) if (Config.IsSideWayIn && trayNum > 0)
{ {
TrayInfo tray = TrayManager.GetTrayInfo(currTrayNum);
//TODO //TODO
if (DeviceID.Equals(204))
{
//HY4,满料托盘需要横移
//空托盘且T1,T2都不在上料时需要 横移
if (tray.IsFull)
{
return true;
}
else
{
FeedingEquip feed1 = LineManager.Line.FeedingEquipMap[101];
FeedingEquip feed2 = LineManager.Line.FeedingEquipMap[102];
if ((!feed1.MoveInfo.MoveType.Equals(LineMoveType.InStore)) || (!feed2.MoveInfo.MoveType.Equals(LineMoveType.InStore)))
{
return true;
}
}
}
else if (DeviceID.Equals(209))
{
//非 1,2,3,4,5,13,14,15,16的入库料需要横移
if (tray.IsFull)
{
if (tray.InOrOutStore.Equals(1))
{
int storeId = tray.InoutPar.GetStoreId();
List<int> instoreId = new List<int> { 1, 2, 3, 4, 5, 13, 14, 15, 16 };
if (!instoreId.Contains(storeId))
{
return true;
}
}
}
}
else if (DeviceID.Equals(215))
{
//非分盘料的出库需要横移
//非11,12,23,24的入库料需要横移
if (tray.IsFull)
{
if (tray.InOrOutStore.Equals(2) && (!tray.InoutPar.cutReel))
{
return true;
}
else if (tray.InOrOutStore.Equals(1))
{
int storeId = tray.InoutPar.GetStoreId();
List<int> instoreId = new List<int> { 11, 12, 23, 24 };
if (!instoreId.Contains(storeId))
{
return true;
}
}
}
}
else if (DeviceID.Equals(218))
{
//HY4,满料托盘，如果不是分盘出料的需要横移，
//空托盘,T5都不在上料时需要横移
if (tray.IsFull)
{
//如果是分盘料盘，不需要横移
if (tray.InOrOutStore.Equals(2) && tray.InoutPar.cutReel)
{
return false;
}
return true;
}
else
{
FeedingEquip feed5 = LineManager.Line.FeedingEquipMap[102];
if (!feed5.MoveInfo.MoveType.Equals(LineMoveType.InStore))
{
return true;
}
}
}
} }
} }
catch (Exception ex) catch (Exception ex)
...@@ -679,7 +757,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -679,7 +757,7 @@ namespace OnlineStore.DeviceLibrary
{ {
try try
{ {
if (Config.IsOutLineIn.Equals(1) && trayNum > 0) if (Config.IsOutLineIn && trayNum > 0)
{ {
//测线满时不需要横移 //测线满时不需要横移
if (!Config.DIList.ContainsKey(IO_Type.HY_OL_Full_Check) || IOValue(IO_Type.HY_OL_Full_Check).Equals(IO_VALUE.LOW)) if (!Config.DIList.ContainsKey(IO_Type.HY_OL_Full_Check) || IOValue(IO_Type.HY_OL_Full_Check).Equals(IO_VALUE.LOW))
......
source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs
...@@ -191,7 +191,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -191,7 +191,7 @@ namespace OnlineStore.DeviceLibrary
if (CheckStopWatch(trayCheckWait, TrayWaitTime, true)) if (CheckStopWatch(trayCheckWait, TrayWaitTime, true))
{ {
MoveInfo.NewMove(LineMoveType.CheckFixture); MoveInfo.NewMove(LineMoveType.CheckFixture);
if (Config.IsSideWayIn.Equals(1)) if (Config.IsSideWayIn)
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY03_FrontStopUp); MoveInfo.NextMoveStep(LineMoveStep.HY03_FrontStopUp);
...@@ -311,7 +311,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -311,7 +311,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (TrayNeedSL(currTrayNum)) if (TrayNeedSL(currTrayNum))
{ {
FeedingEquip feed = LineManager.Line.FeedingEquipMap[Config.WorkDevice]; FeedingEquip feed = LineManager.Line.FeedingEquipMap[Config.WorkDeviceId];
if (feed.Config.IsCanOut.Equals(1)) if (feed.Config.IsCanOut.Equals(1))
{ {
//紧急出料 //紧急出料
...@@ -545,7 +545,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -545,7 +545,7 @@ namespace OnlineStore.DeviceLibrary
{ {
try try
{ {
if (Config.WorkDevice > 0) if (Config.WorkDeviceId > 0)
{ {
TrayInfo trayInfo = TrayManager.GetTrayInfo(trayNum); TrayInfo trayInfo = TrayManager.GetTrayInfo(trayNum);
if (trayInfo.IsFull) if (trayInfo.IsFull)
...@@ -553,7 +553,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -553,7 +553,7 @@ namespace OnlineStore.DeviceLibrary
return false; return false;
} }
//判断上料T是否在入库等待托盘 //判断上料T是否在入库等待托盘
FeedingEquip feedT = LineManager.Line.FeedingEquipMap[Config.WorkDevice]; FeedingEquip feedT = LineManager.Line.FeedingEquipMap[Config.WorkDeviceId];
if (feedT.CurrTrayIsNeed(currTrayNum, false)) if (feedT.CurrTrayIsNeed(currTrayNum, false))
{ {
LogInfo(" " + feedT.Name + "拦截托盘【" + currTrayNum + "】"); LogInfo(" " + feedT.Name + "拦截托盘【" + currTrayNum + "】");
...@@ -570,7 +570,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -570,7 +570,7 @@ namespace OnlineStore.DeviceLibrary
internal override bool TrayIsReady() internal override bool TrayIsReady()
{ {
if (Config.IsSideWayIn.Equals(1)) if (Config.IsSideWayIn)
{ {
if (MoveInfo.MoveType.Equals(LineMoveType.CheckFixture) && MoveInfo.IsStep(LineMoveStep.HY08_SL_WaitProcessReel)) if (MoveInfo.MoveType.Equals(LineMoveType.CheckFixture) && MoveInfo.IsStep(LineMoveStep.HY08_SL_WaitProcessReel))
{ {
...@@ -591,7 +591,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -591,7 +591,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (TrayIsReady()) if (TrayIsReady())
{ {
if (Config.IsSideWayIn.Equals(1)) if (Config.IsSideWayIn)
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY09_SL_ReelProEnd); MoveInfo.NextMoveStep(LineMoveStep.HY09_SL_ReelProEnd);
CheckLog("托盘阻挡" + MoveInfo.SLog + " 料盘处理完成，开始横移或放行"); CheckLog("托盘阻挡" + MoveInfo.SLog + " 料盘处理完成，开始横移或放行");
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
...@@ -381,7 +381,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -381,7 +381,7 @@ namespace OnlineStore.DeviceLibrary
{ {
foreach(HYEquipBase hy in HYEquipMap.Values) foreach(HYEquipBase hy in HYEquipMap.Values)
{ {
if (hy.Config.WorkDevice.Equals(deviceID)) if (hy.Config.WorkDeviceId.Equals(deviceID))
{ {
if(hy.TrayIsReady()) if(hy.TrayIsReady())
{ {
...@@ -407,7 +407,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -407,7 +407,7 @@ namespace OnlineStore.DeviceLibrary
{ {
foreach (HYEquipBase hy in HYEquipMap.Values) foreach (HYEquipBase hy in HYEquipMap.Values)
{ {
if (hy.Config.WorkDevice.Equals(deviceID)) if (hy.Config.WorkDeviceId.Equals(deviceID))
{ {
hy.TrayCanLeave(); hy.TrayCanLeave();
break; break;
......
source/LoadCVSLibrary/storeConfig/config/DeviceConfig.cs
...@@ -280,13 +280,24 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -280,13 +280,24 @@ namespace OnlineStore.LoadCSVLibrary
} }
else else
{ {
if (prop.PropertyType.Equals(typeof(int))) try
{ {
prop.SetValue(this, Convert.ChangeType(0, prop.PropertyType), null);//赋值****在这里需要考虑类型问题 if (prop.PropertyType.Equals(typeof(int))||prop.PropertyType.Equals(typeof(Int32)))
} {
else prop.SetValue(this, Convert.ChangeType(0, prop.PropertyType), null);//赋值****在这里需要考虑类型问题
}
else if (prop.PropertyType.Equals(typeof(bool)))
{
prop.SetValue(this, Convert.ChangeType(false , prop.PropertyType), null);//赋值****在这里需要考虑类型问题
}
else
{
prop.SetValue(this, Convert.ChangeType("", prop.PropertyType), null);//赋值****在这里需要考虑类型问题
}
}catch(Exception ex)
{ {
prop.SetValue(this, Convert.ChangeType("", prop.PropertyType), null);//赋值****在这里需要考虑类型问题 LogUtil.error("LoadConfig赋值出错：" + this.ToString() + "的属性" + str + "必须配置值！" + ex.ToString());
throw ex;
} }
} }
} }
......
source/LoadCVSLibrary/storeConfig/config/HYEquip_Config.cs
...@@ -18,34 +18,34 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -18,34 +18,34 @@ namespace OnlineStore.LoadCSVLibrary
public HYEquip_Config(int id, string cid, string type, string filepath) public HYEquip_Config(int id, string cid, string type, string filepath)
: base(id, cid, LoadCSVLibrary.DeviceType.HYEquip, filepath) : base(id, cid, LoadCSVLibrary.DeviceType.HYEquip, filepath)
{ {
IsOutLineOut = 0; IsOutLineOut = false ;
IsOutLineIn = 0; IsOutLineIn = false;
IsSideWayIn = 0; IsSideWayIn = false;
IsOutLineOut = 0; IsOutLineOut = false;
UpDownUseAxis = 0; UpDownUseAxis = 0;
IsDebug = 0; IsDebug = 0;
} }
public void LoadParam() public void LoadParam()
{ {
IsOutLineOut = 0; IsOutLineOut = false;
IsOutLineIn = 0; IsOutLineIn = false;
IsSideWayIn = 0; IsSideWayIn = false;
IsOutLineOut = 0; IsOutLineOut = false;
if (Id.Equals(202)) if (Id.Equals(202))
{ {
WorkDevice = 102; WorkDeviceId = 102;
} }
else if (Id.Equals(201)) else if (Id.Equals(201))
{ {
WorkDevice = 101; WorkDeviceId = 101;
} }
else if (Id.Equals(220)) else if (Id.Equals(220))
{ {
WorkDevice = 104; WorkDeviceId = 104;
} }
else if (Id.Equals(221)) else if (Id.Equals(221))
{ {
WorkDevice = 105; WorkDeviceId = 105;
} }
int[] sideIns = new int[] { 202, 204, 209, 215, 218, 220 }; int[] sideIns = new int[] { 202, 204, 209, 215, 218, 220 };
...@@ -54,19 +54,19 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -54,19 +54,19 @@ namespace OnlineStore.LoadCSVLibrary
int[] outOuts = new int[] { 209, 211 }; int[] outOuts = new int[] { 209, 211 };
if (sideIns.Contains(Id)) if (sideIns.Contains(Id))
{ {
IsSideWayIn = 1; IsSideWayIn = true ;
} }
else if (sideOuts.Contains(Id)) else if (sideOuts.Contains(Id))
{ {
IsSideWayOut = 1; IsSideWayOut = true ;
} }
if (outIns.Contains(Id)) if (outIns.Contains(Id))
{ {
IsOutLineIn = 1; IsOutLineIn = true ;
} }
else if (outOuts.Contains(Id)) else if (outOuts.Contains(Id))
{ {
IsOutLineOut = 1; IsOutLineOut = true ;
} }
LineName = "C1"; LineName = "C1";
if (Id.Equals(205)) if (Id.Equals(205))
...@@ -110,28 +110,28 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -110,28 +110,28 @@ namespace OnlineStore.LoadCSVLibrary
/// <summary> /// <summary>
/// PRO,0,HY工位对应的取放料设备,WorkDevice,105,, /// PRO,0,HY工位对应的取放料设备,WorkDevice,105,,
/// </summary> /// </summary>
[ConfigProAttribute("WorkDevice", false)] [ConfigProAttribute("WorkDeviceId", false)]
public int WorkDevice { get; set; } public int WorkDeviceId { get; set; }
/// <summary> /// <summary>
/// PRO,0,HY是否是托盘横移入口,IsSideWayIn,0,, /// PRO,0,HY是否是托盘横移入口,IsSideWayIn,0,,
/// </summary> /// </summary>
[ConfigProAttribute("IsSideWayIn", false)] [ConfigProAttribute("IsSideWayIn", false)]
public int IsSideWayIn { get; set; } public bool IsSideWayIn { get; set; }
/// <summary> /// <summary>
/// PRO,0,HY是否是托盘横移出口,IsSideWayOut,1,, /// PRO,0,HY是否是托盘横移出口,IsSideWayOut,1,,
/// </summary> /// </summary>
[ConfigProAttribute("IsSideWayOut", false)] [ConfigProAttribute("IsSideWayOut", false)]
public int IsSideWayOut { get; set; } public bool IsSideWayOut { get; set; }
/// <summary> /// <summary>
/// PRO,0,HY是否是托盘进入出料线入口,IsOutLineIn,0,, /// PRO,0,HY是否是托盘进入出料线入口,IsOutLineIn,0,,
/// </summary> /// </summary>
[ConfigProAttribute("IsOutLineIn", false)] [ConfigProAttribute("IsOutLineIn", false)]
public int IsOutLineIn { get; set; } public bool IsOutLineIn { get; set; }
/// <summary> /// <summary>
/// PRO,0,HY是否是托盘离开出料线出口,IsOutLineOut,0,, /// PRO,0,HY是否是托盘离开出料线出口,IsOutLineOut,0,,
/// </summary> /// </summary>
[ConfigProAttribute("IsOutLineOut", false)] [ConfigProAttribute("IsOutLineOut", false)]
public int IsOutLineOut { get; set; } public bool IsOutLineOut { get; set; }
/// <summary> /// <summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!