Skip to content

孙克 / ACSingleStore

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

出库是否等待仓门口信号增加配置

1 个父辈 b64dc0ba
内嵌 并排
正在显示 5 个修改的文件 包含 51 行增加 和 12 行删除
source/ACSingleStore/FrmIDConfig.Designer.cs
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
this.label4 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label();
this.cmbPosition7 = new System.Windows.Forms.ComboBox(); this.cmbPosition7 = new System.Windows.Forms.ComboBox();
this.label21 = new System.Windows.Forms.Label(); this.label21 = new System.Windows.Forms.Label();
this.chbEmptyNeedAlarm = new System.Windows.Forms.CheckBox();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
...@@ -68,7 +69,7 @@ ...@@ -68,7 +69,7 @@
this.btnNext.Anchor = System.Windows.Forms.AnchorStyles.Top; this.btnNext.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.btnNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNext.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnNext.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNext.Location = new System.Drawing.Point(317, 179); this.btnNext.Location = new System.Drawing.Point(419, 189);
this.btnNext.Name = "btnNext"; this.btnNext.Name = "btnNext";
this.btnNext.Size = new System.Drawing.Size(120, 45); this.btnNext.Size = new System.Drawing.Size(120, 45);
this.btnNext.TabIndex = 275; this.btnNext.TabIndex = 275;
...@@ -155,7 +156,7 @@ ...@@ -155,7 +156,7 @@
this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbDebug.AutoSize = true; this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(152, 190); this.chbDebug.Location = new System.Drawing.Point(29, 199);
this.chbDebug.Name = "chbDebug"; this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(93, 25); this.chbDebug.Size = new System.Drawing.Size(93, 25);
this.chbDebug.TabIndex = 282; this.chbDebug.TabIndex = 282;
...@@ -164,6 +165,7 @@ ...@@ -164,6 +165,7 @@
// //
// groupBox1 // groupBox1
// //
this.groupBox1.Controls.Add(this.chbEmptyNeedAlarm);
this.groupBox1.Controls.Add(this.chbDebug); this.groupBox1.Controls.Add(this.chbDebug);
this.groupBox1.Controls.Add(this.label1); this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Controls.Add(this.btnReset); this.groupBox1.Controls.Add(this.btnReset);
...@@ -175,7 +177,7 @@ ...@@ -175,7 +177,7 @@
this.groupBox1.Controls.Add(this.label3); this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Location = new System.Drawing.Point(12, 12); this.groupBox1.Location = new System.Drawing.Point(12, 12);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(577, 243); this.groupBox1.Size = new System.Drawing.Size(577, 262);
this.groupBox1.TabIndex = 283; this.groupBox1.TabIndex = 283;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "料仓配置"; this.groupBox1.Text = "料仓配置";
...@@ -191,7 +193,7 @@ ...@@ -191,7 +193,7 @@
this.groupBox2.Controls.Add(this.label4); this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.cmbPosition7); this.groupBox2.Controls.Add(this.cmbPosition7);
this.groupBox2.Controls.Add(this.label21); this.groupBox2.Controls.Add(this.label21);
this.groupBox2.Location = new System.Drawing.Point(12, 264); this.groupBox2.Location = new System.Drawing.Point(12, 280);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(577, 244); this.groupBox2.Size = new System.Drawing.Size(577, 244);
this.groupBox2.TabIndex = 284; this.groupBox2.TabIndex = 284;
...@@ -323,6 +325,18 @@ ...@@ -323,6 +325,18 @@
this.label21.Text = "库位号-7寸盘定位:"; this.label21.Text = "库位号-7寸盘定位:";
this.label21.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label21.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// chbEmptyNeedAlarm
//
this.chbEmptyNeedAlarm.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbEmptyNeedAlarm.AutoSize = true;
this.chbEmptyNeedAlarm.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbEmptyNeedAlarm.Location = new System.Drawing.Point(153, 199);
this.chbEmptyNeedAlarm.Name = "chbEmptyNeedAlarm";
this.chbEmptyNeedAlarm.Size = new System.Drawing.Size(237, 25);
this.chbEmptyNeedAlarm.TabIndex = 283;
this.chbEmptyNeedAlarm.Text = "出库时仓门口信号不亮时报警";
this.chbEmptyNeedAlarm.UseVisualStyleBackColor = true;
//
// FrmIdConfig // FrmIdConfig
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
...@@ -367,5 +381,6 @@ ...@@ -367,5 +381,6 @@
private System.Windows.Forms.ComboBox cmbPosition11; private System.Windows.Forms.ComboBox cmbPosition11;
public System.Windows.Forms.Label label4; public System.Windows.Forms.Label label4;
private System.Windows.Forms.Button btnSavePosID; private System.Windows.Forms.Button btnSavePosID;
private System.Windows.Forms.CheckBox chbEmptyNeedAlarm;
} }
} }
\ No newline at end of file \ No newline at end of file
source/ACSingleStore/FrmIDConfig.cs
...@@ -30,6 +30,7 @@ namespace OnlineStore.ACSingleStore ...@@ -30,6 +30,7 @@ namespace OnlineStore.ACSingleStore
this.DialogResult = DialogResult.None; this.DialogResult = DialogResult.None;
txthttpAddr.Text = ConfigAppSettings.GetValue(Setting_Init.http_server); txthttpAddr.Text = ConfigAppSettings.GetValue(Setting_Init.http_server);
txtLineAddr.Text = ConfigAppSettings.GetValue(Setting_Init.LineServerIp); txtLineAddr.Text = ConfigAppSettings.GetValue(Setting_Init.LineServerIp);
chbEmptyNeedAlarm.Checked = ConfigAppSettings.GetIntValue(Setting_Init.EmptyOutNeedAlarm).Equals(1);
cmbId.Items.Clear(); cmbId.Items.Clear();
for(int i = 1; i <= 26; i++) for(int i = 1; i <= 26; i++)
{ {
...@@ -97,6 +98,9 @@ namespace OnlineStore.ACSingleStore ...@@ -97,6 +98,9 @@ namespace OnlineStore.ACSingleStore
ConfigAppSettings.SaveValue(Setting_Init.LineServerIp, lineStr); ConfigAppSettings.SaveValue(Setting_Init.LineServerIp, lineStr);
StoreManager.Store.IsDebug = chbDebug.Checked; StoreManager.Store.IsDebug = chbDebug.Checked;
ConfigAppSettings.SaveValue(Setting_Init.IsInDebug, chbDebug.Checked ? 1 : 0); ConfigAppSettings.SaveValue(Setting_Init.IsInDebug, chbDebug.Checked ? 1 : 0);
bool emptyNeedAlarm = chbEmptyNeedAlarm.Checked;
ConfigAppSettings.SaveValue(Setting_Init.EmptyOutNeedAlarm, emptyNeedAlarm ? 1 : 0);
LogUtil.info($"cid {storeCID} ,storeId{storeId} ,debug {StoreManager.Store.IsDebug} emptyNeedAlarm {emptyNeedAlarm}");
MessageBox.Show("保存成功，请重启客户端"); MessageBox.Show("保存成功，请重启客户端");
this.DialogResult = DialogResult.OK; this.DialogResult = DialogResult.OK;
} }
......
source/Common/Setting_Init.cs
...@@ -105,6 +105,10 @@ namespace OnlineStore.Common ...@@ -105,6 +105,10 @@ namespace OnlineStore.Common
public static string Location_PosID_ = "Location_PosID_"; public static string Location_PosID_ = "Location_PosID_";
public static string VisionConfigFile = "VisionConfigFile"; public static string VisionConfigFile = "VisionConfigFile";
/// <summary>
/// 出库仓门口和料叉都空出时，报警等待仓门口信号
/// </summary>
public static string EmptyOutNeedAlarm = "EmptyOutNeedAlarm";
} }
} }
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -1548,6 +1548,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1548,6 +1548,7 @@ namespace OnlineStore.DeviceLibrary
private float StartBlowValue = (float)ConfigAppSettings.GetNumValue(Setting_Init.StartBlowValue); private float StartBlowValue = (float)ConfigAppSettings.GetNumValue(Setting_Init.StartBlowValue);
private float StopBlowValue = (float)ConfigAppSettings.GetNumValue(Setting_Init.StopBlowValue); private float StopBlowValue = (float)ConfigAppSettings.GetNumValue(Setting_Init.StopBlowValue);
private bool EmptyOutNeedAlarm = ConfigAppSettings.GetIntValue(Setting_Init.EmptyOutNeedAlarm).Equals(1);
public string currTempStr = ""; public string currTempStr = "";
private void HumidityProcess() private void HumidityProcess()
{ {
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -874,7 +874,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -874,7 +874,7 @@ namespace OnlineStore.DeviceLibrary
StoreMove.NextMoveStep(StoreMoveStep.SO_27_WaitDoorTray); StoreMove.NextMoveStep(StoreMoveStep.SO_27_WaitDoorTray);
OutStoreLog("出库：等待仓门口有料"); OutStoreLog("出库：等待仓门口有料");
StoreMove.TimeOutSeconds = 5; StoreMove.TimeOutSeconds = 5;
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.HIGH)); StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.HIGH));
} }
else else
{ {
...@@ -883,7 +883,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -883,7 +883,7 @@ namespace OnlineStore.DeviceLibrary
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(1000)); StoreMove.WaitList.Add(WaitResultInfo.WaitTime(1000));
ACAxisMove(Config.UpDown_Axis, StoreMove.MoveParam.MoveP.UpDown_P1, Config.UpDownAxis_P1_Speed); ACAxisMove(Config.UpDown_Axis, StoreMove.MoveParam.MoveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
CloseDoor(); CloseDoor();
} }
} }
else if (StoreMove.MoveStep == StoreMoveStep.SO_27_WaitDoorTray) else if (StoreMove.MoveStep == StoreMoveStep.SO_27_WaitDoorTray)
{ {
...@@ -896,10 +896,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -896,10 +896,18 @@ namespace OnlineStore.DeviceLibrary
else if (StoreMove.MoveStep == StoreMoveStep.SO_28_CloseDoor) else if (StoreMove.MoveStep == StoreMoveStep.SO_28_CloseDoor)
{ {
StoreMove.NextMoveStep(StoreMoveStep.SO_29_CheckTray); StoreMove.NextMoveStep(StoreMoveStep.SO_29_CheckTray);
OutStoreLog("出库：检测料仓门口料盘信号 ,最多1000"); if (EmptyOutNeedAlarm)
StoreMove.OneWaitCanEndStep = true; {
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(1000)); OutStoreLog("出库：检测料仓门口料盘信号 , EmptyOutAlarm=true, 需要等待 TrayCheck_Door=HIGH");
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.HIGH)); StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.HIGH));
}
else
{
OutStoreLog("出库：检测料仓门口料盘信号 ,最多1000");
StoreMove.OneWaitCanEndStep = true;
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(1000));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.HIGH));
}
} }
else if (StoreMove.MoveStep.Equals(StoreMoveStep.SO_29_CheckTray)) else if (StoreMove.MoveStep.Equals(StoreMoveStep.SO_29_CheckTray))
{ {
...@@ -916,7 +924,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -916,7 +924,14 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
if (EmptyOut) if (EmptyOutNeedAlarm)
{
StoreMove.NextMoveStep(StoreMoveStep.SO_29_CheckTray);
OutStoreLog("出库：检测料仓门口料盘信号 , EmptyOutAlarm=true, 需要一直等待");
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.HIGH));
return;
}
else if (EmptyOut)
{ {
CodeMsg = "" + posId + "_" + barcode + "_空出"; CodeMsg = "" + posId + "_" + barcode + "_空出";
LogUtil.error(CodeMsg + "，取消出库任务"); LogUtil.error(CodeMsg + "，取消出库任务");
...@@ -952,7 +967,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -952,7 +967,7 @@ namespace OnlineStore.DeviceLibrary
string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PosInfo.PosId : ""; string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PosInfo.PosId : "";
storeStatus = StoreStatus.StoreOnline; storeStatus = StoreStatus.StoreOnline;
LogUtil.info( StoreName + " 【" + posId + "】 整个出库流程结束，耗时【" + FormUtil.GetSpanStr(span) + "】！"); LogUtil.info(StoreName + " 【" + posId + "】 整个出库流程结束，耗时【" + FormUtil.GetSpanStr(span) + "】！");
StoreMove.EndMove(); StoreMove.EndMove();
storeRunStatus = StoreRunStatus.Runing; storeRunStatus = StoreRunStatus.Runing;
InOutEndProcess(StoreMoveType.OutStore); InOutEndProcess(StoreMoveType.OutStore);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!