Skip to content

孙克 / RC1250-AssemblyLine

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

增加单个料仓暂停入库功能

1 个父辈 7e742208
内嵌 并排
正在显示 4 个修改的文件 包含 33 行增加 和 2 行删除
source/AssemblyLineClient/FrmMoveEquip.Designer.cs
...@@ -92,6 +92,7 @@ ...@@ -92,6 +92,7 @@
this.txtP2 = new System.Windows.Forms.TextBox(); this.txtP2 = new System.Windows.Forms.TextBox();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.lblName = new System.Windows.Forms.Label(); this.lblName = new System.Windows.Forms.Label();
this.chbStopInstore = new System.Windows.Forms.CheckBox();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout(); this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
...@@ -422,7 +423,7 @@ ...@@ -422,7 +423,7 @@
// //
this.chbDebug.AutoSize = true; this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(795, 14); this.chbDebug.Location = new System.Drawing.Point(756, 14);
this.chbDebug.Name = "chbDebug"; this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24); this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 247; this.chbDebug.TabIndex = 247;
...@@ -450,7 +451,7 @@ ...@@ -450,7 +451,7 @@
this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblStoreStatus.ForeColor = System.Drawing.Color.Green; this.lblStoreStatus.ForeColor = System.Drawing.Color.Green;
this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblStoreStatus.Location = new System.Drawing.Point(917, 16); this.lblStoreStatus.Location = new System.Drawing.Point(957, 16);
this.lblStoreStatus.Name = "lblStoreStatus"; this.lblStoreStatus.Name = "lblStoreStatus";
this.lblStoreStatus.Size = new System.Drawing.Size(65, 20); this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
this.lblStoreStatus.TabIndex = 245; this.lblStoreStatus.TabIndex = 245;
...@@ -1046,6 +1047,7 @@ ...@@ -1046,6 +1047,7 @@
// //
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.panel1.Controls.Add(this.chbStopInstore);
this.panel1.Controls.Add(this.lblName); this.panel1.Controls.Add(this.lblName);
this.panel1.Controls.Add(this.chbDebug); this.panel1.Controls.Add(this.chbDebug);
this.panel1.Controls.Add(this.lblStoreStatus); this.panel1.Controls.Add(this.lblStoreStatus);
...@@ -1071,6 +1073,18 @@ ...@@ -1071,6 +1073,18 @@
this.lblName.Text = "出料流水线"; this.lblName.Text = "出料流水线";
this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// chbStopInstore
//
this.chbStopInstore.AutoSize = true;
this.chbStopInstore.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbStopInstore.Location = new System.Drawing.Point(846, 14);
this.chbStopInstore.Name = "chbStopInstore";
this.chbStopInstore.Size = new System.Drawing.Size(84, 24);
this.chbStopInstore.TabIndex = 251;
this.chbStopInstore.Text = "暂停入库";
this.chbStopInstore.UseVisualStyleBackColor = true;
this.chbStopInstore.CheckedChanged += new System.EventHandler(this.chbStopInstore_CheckedChanged);
//
// FrmMoveEquip // FrmMoveEquip
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
...@@ -1188,6 +1202,7 @@ ...@@ -1188,6 +1202,7 @@
private System.Windows.Forms.Label label7; private System.Windows.Forms.Label label7;
private System.Windows.Forms.TextBox txtPosId; private System.Windows.Forms.TextBox txtPosId;
private System.Windows.Forms.Button btnClear; private System.Windows.Forms.Button btnClear;
private System.Windows.Forms.CheckBox chbStopInstore;
} }
} }
source/AssemblyLineClient/FrmMoveEquip.cs
...@@ -713,6 +713,16 @@ namespace OnlineStore.AssemblyLine ...@@ -713,6 +713,16 @@ namespace OnlineStore.AssemblyLine
txtPosId.Clear(); txtPosId.Clear();
} }
} }
private void chbStopInstore_CheckedChanged(object sender, EventArgs e)
{
if (!IsLoad)
{
return;
}
equipBean.StopInstore = chbStopInstore.Checked;
LogUtil.info(equipBean.Name + "用户切换暂停入库： " + equipBean.StopInstore);
}
} }
} }
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
...@@ -1204,6 +1204,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -1204,6 +1204,10 @@ namespace OnlineStore.DeviceLibrary
{ {
return false; return false;
} }
if (move.StopInstore)
{
return false;
}
if (runStatus > LineRunStatus.Wait && move.runStatus > LineRunStatus.Wait) if (runStatus > LineRunStatus.Wait && move.runStatus > LineRunStatus.Wait)
{ {
return true; return true;
......
source/DeviceLibrary/assemblyLine/MoveEquip.cs
...@@ -15,6 +15,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -15,6 +15,8 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
public partial class MoveEquip : EquipBase public partial class MoveEquip : EquipBase
{ {
public bool StopInstore = false;
public MoveEquip_Config Config; public MoveEquip_Config Config;
private bool ClampNeedCheck=false; private bool ClampNeedCheck=false;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!