Skip to content

李娜 / SO908-XLRStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit e969be37 由 张东亮
选项

存储机构添加开关-是否开关出库前的暂存区检查

1 个父辈 738813b5
内嵌 并排
正在显示 4 个修改的文件 包含 56 行增加 和 16 行删除
source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs
...@@ -742,25 +742,24 @@ namespace OnlineStore.DeviceLibrary ...@@ -742,25 +742,24 @@ namespace OnlineStore.DeviceLibrary
{ {
try try
{ {
//bool noInStore = true;
//if (AutoInout.CurrInOutACount >= this.Config.Box_ResetACount && noInStore)
//{
// if (storeRunStatus < StoreRunStatus.Runing || MoveInfo.MoveType == StoreMoveType.InStore || MoveInfo.MoveType == StoreMoveType.OutStore)
// {
// // LogInfo("已经累计出入库" + AutoInout.CurrInOutACount + "次，当时当前正在忙碌中暂不复位");
// }
// else
// {
// LogInfo("已经累计出入库" + AutoInout.CurrInOutACount + "次，需要复位一下");
// Reset();
// }
// return;
//}
if (InDoorSigCheck()) if (InDoorSigCheck())
{ {
return; return;
} }
if (waitAOutStoreList.Count > 0 && CheckAOutDoor())// if (waitAOutStoreList.Count > 0)//
{
if (CloseOutStoreCheck)
{
InOutParam param = null;
bool result = waitAOutStoreList.TryDequeue(out param);
if (result && param != null)
{
LogInfo("执行A面排队的出库【" + param.PosInfo.ToStr() + "】");
StartExecuctOut(param);
return;
}
}
else if(CheckAOutDoor())
{ {
InOutParam param = null; InOutParam param = null;
bool result = waitAOutStoreList.TryDequeue(out param); bool result = waitAOutStoreList.TryDequeue(out param);
...@@ -771,7 +770,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -771,7 +770,10 @@ namespace OnlineStore.DeviceLibrary
return; return;
} }
} }
if (waitBOutStoreList.Count > 0 && CheckBOutDoor())// }
if (waitBOutStoreList.Count > 0)//
{
if(CloseOutStoreCheck)
{ {
InOutParam param = null; InOutParam param = null;
bool result = waitBOutStoreList.TryDequeue(out param); bool result = waitBOutStoreList.TryDequeue(out param);
...@@ -782,6 +784,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -782,6 +784,18 @@ namespace OnlineStore.DeviceLibrary
return; return;
} }
} }
else if(CheckBOutDoor())
{
InOutParam param = null;
bool result = waitBOutStoreList.TryDequeue(out param);
if (result && param != null)
{
LogInfo("执行B面排队的出库【" + param.PosInfo.ToStr() + "】");
StartExecuctOut(param);
return;
}
}
}
} }
catch (Exception ex) catch (Exception ex)
{ {
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_Partial.cs
...@@ -1024,16 +1024,23 @@ namespace OnlineStore.DeviceLibrary ...@@ -1024,16 +1024,23 @@ namespace OnlineStore.DeviceLibrary
} }
} }
private DateTime startOutStoreTime = DateTime.Now; private DateTime startOutStoreTime = DateTime.Now;
/// <summary>
/// 关闭出库前的碗里检查
/// </summary>
public bool CloseOutStoreCheck = false;
public override bool StartOutstore(InOutParam param) public override bool StartOutstore(InOutParam param)
{ {
if (InDoorSigCheck()) if (InDoorSigCheck())
{ {
return false; return false;
} }
if(!CloseOutStoreCheck)
{
if (!OutDoorCheck(param)) if (!OutDoorCheck(param))
{ {
return false; return false;
} }
}
if (isInSuddenDown || isNoAirpressure_Check if (isInSuddenDown || isNoAirpressure_Check
|| !runStatus.Equals(RunStatus.Runing) || !runStatus.Equals(RunStatus.Runing)
|| !MoveInfo.MoveType.Equals(MoveType.None)) || !MoveInfo.MoveType.Equals(MoveType.None))
......
source/XLRStoreClient/boxForm/FrmAutoFindPos.Designer.cs
...@@ -111,6 +111,7 @@ ...@@ -111,6 +111,7 @@
this.radioButton2 = new System.Windows.Forms.RadioButton(); this.radioButton2 = new System.Windows.Forms.RadioButton();
this.radioButton1 = new System.Windows.Forms.RadioButton(); this.radioButton1 = new System.Windows.Forms.RadioButton();
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.chkCloseOutStoreCheck = new System.Windows.Forms.CheckBox();
this.tableLayoutPanel1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
...@@ -875,6 +876,7 @@ ...@@ -875,6 +876,7 @@
// //
// groupBox1 // groupBox1
// //
this.groupBox1.Controls.Add(this.chkCloseOutStoreCheck);
this.groupBox1.Controls.Add(this.lblResult); this.groupBox1.Controls.Add(this.lblResult);
this.groupBox1.Controls.Add(this.chkBoxCloseCam); this.groupBox1.Controls.Add(this.chkBoxCloseCam);
this.groupBox1.Controls.Add(this.checkBoxOpenAuto); this.groupBox1.Controls.Add(this.checkBoxOpenAuto);
...@@ -972,6 +974,17 @@ ...@@ -972,6 +974,17 @@
this.timer1.Interval = 1000; this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick); this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
// //
// chkCloseOutStoreCheck
//
this.chkCloseOutStoreCheck.AutoSize = true;
this.chkCloseOutStoreCheck.Location = new System.Drawing.Point(569, 45);
this.chkCloseOutStoreCheck.Name = "chkCloseOutStoreCheck";
this.chkCloseOutStoreCheck.Size = new System.Drawing.Size(147, 21);
this.chkCloseOutStoreCheck.TabIndex = 9;
this.chkCloseOutStoreCheck.Text = "关闭出库前的碗里检查";
this.chkCloseOutStoreCheck.UseVisualStyleBackColor = true;
this.chkCloseOutStoreCheck.CheckedChanged += new System.EventHandler(this.chkCloseOutStoreCheck_CheckedChanged);
//
// FrmAutoFindPos // FrmAutoFindPos
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
...@@ -1092,5 +1105,6 @@ ...@@ -1092,5 +1105,6 @@
private System.Windows.Forms.PictureBox pictureBox2; private System.Windows.Forms.PictureBox pictureBox2;
private System.Windows.Forms.Label lblResult; private System.Windows.Forms.Label lblResult;
private System.Windows.Forms.ListBox listBox1; private System.Windows.Forms.ListBox listBox1;
private System.Windows.Forms.CheckBox chkCloseOutStoreCheck;
} }
} }
\ No newline at end of file \ No newline at end of file
source/XLRStoreClient/boxForm/FrmAutoFindPos.cs
...@@ -440,5 +440,10 @@ namespace OnlineStore.XLRStore ...@@ -440,5 +440,10 @@ namespace OnlineStore.XLRStore
lineMoveP.UpdatePosById(head2.ToString()); lineMoveP.UpdatePosById(head2.ToString());
boxEquip.PullAxis_Updown.AbsMove(null, lineMoveP.PullAxis_Updown_P4, boxEquip.Config.PullAxis_Updown_FindPosSpeed); boxEquip.PullAxis_Updown.AbsMove(null, lineMoveP.PullAxis_Updown_P4, boxEquip.Config.PullAxis_Updown_FindPosSpeed);
} }
private void chkCloseOutStoreCheck_CheckedChanged(object sender, EventArgs e)
{
boxEquip.CloseOutStoreCheck = chkCloseOutStoreCheck.Checked;
}
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!