Commit 29df02c8 几米阳光

开门增加光栅验证。服务器通信增加是否单盘出库

1 个父辈 243d29d0
......@@ -107,6 +107,10 @@
this.label43 = new System.Windows.Forms.Label();
this.label42 = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.txtUpdownP8 = new System.Windows.Forms.TextBox();
this.btnUpdownP8 = new System.Windows.Forms.Button();
this.txtUpdownP2 = new System.Windows.Forms.TextBox();
this.btnUpdownP2 = new System.Windows.Forms.Button();
this.txtUpDownDoor = new System.Windows.Forms.TextBox();
this.btnUpDownDoor = new System.Windows.Forms.Button();
this.lblTemp = new System.Windows.Forms.Label();
......@@ -186,7 +190,6 @@
this.清理日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.lblThisSta = new System.Windows.Forms.Label();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.chbIsUseBatch = new System.Windows.Forms.CheckBox();
this.chbAuto = new System.Windows.Forms.CheckBox();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.显示ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
......@@ -238,10 +241,6 @@
this.btnGetOutTray = new System.Windows.Forms.Button();
this.lblDoorStatus = new System.Windows.Forms.Label();
this.btnBatchInStore = new System.Windows.Forms.Button();
this.txtUpdownP8 = new System.Windows.Forms.TextBox();
this.btnUpdownP8 = new System.Windows.Forms.Button();
this.txtUpdownP2 = new System.Windows.Forms.TextBox();
this.btnUpdownP2 = new System.Windows.Forms.Button();
this.groupBox5.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
......@@ -1238,6 +1237,72 @@
this.groupBox2.TabStop = false;
this.groupBox2.Text = "出入库操作";
//
// txtUpdownP8
//
this.txtUpdownP8.AcceptsReturn = true;
this.txtUpdownP8.BackColor = System.Drawing.SystemColors.Window;
this.txtUpdownP8.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP8.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP8.Location = new System.Drawing.Point(153, 194);
this.txtUpdownP8.MaxLength = 0;
this.txtUpdownP8.Name = "txtUpdownP8";
this.txtUpdownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpdownP8.Size = new System.Drawing.Size(89, 23);
this.txtUpdownP8.TabIndex = 276;
this.txtUpdownP8.Text = "1000";
//
// btnUpdownP8
//
this.btnUpdownP8.AutoSize = true;
this.btnUpdownP8.BackColor = System.Drawing.SystemColors.Control;
this.btnUpdownP8.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpdownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpdownP8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP8.Location = new System.Drawing.Point(10, 192);
this.btnUpdownP8.Name = "btnUpdownP8";
this.btnUpdownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP8.Size = new System.Drawing.Size(140, 27);
this.btnUpdownP8.TabIndex = 275;
this.btnUpdownP8.Text = "升降轴出库低点P8:";
this.btnUpdownP8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP8.UseVisualStyleBackColor = true;
this.btnUpdownP8.Click += new System.EventHandler(this.btnUpDownP8_Click);
//
// txtUpdownP2
//
this.txtUpdownP2.AcceptsReturn = true;
this.txtUpdownP2.BackColor = System.Drawing.SystemColors.Window;
this.txtUpdownP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP2.Location = new System.Drawing.Point(153, 163);
this.txtUpdownP2.MaxLength = 0;
this.txtUpdownP2.Name = "txtUpdownP2";
this.txtUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpdownP2.Size = new System.Drawing.Size(89, 23);
this.txtUpdownP2.TabIndex = 274;
this.txtUpdownP2.Text = "1000";
//
// btnUpdownP2
//
this.btnUpdownP2.AutoSize = true;
this.btnUpdownP2.BackColor = System.Drawing.SystemColors.Control;
this.btnUpdownP2.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpdownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP2.Location = new System.Drawing.Point(10, 161);
this.btnUpdownP2.Name = "btnUpdownP2";
this.btnUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP2.Size = new System.Drawing.Size(140, 27);
this.btnUpdownP2.TabIndex = 273;
this.btnUpdownP2.Text = "升降轴出库高点P2:";
this.btnUpdownP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP2.UseVisualStyleBackColor = true;
this.btnUpdownP2.Click += new System.EventHandler(this.btnUpDownP2_Click);
//
// txtUpDownDoor
//
this.txtUpDownDoor.AcceptsReturn = true;
......@@ -1317,6 +1382,7 @@
//
// btnStartAuTo
//
this.btnStartAuTo.Enabled = false;
this.btnStartAuTo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStartAuTo.Location = new System.Drawing.Point(158, 55);
this.btnStartAuTo.Name = "btnStartAuTo";
......@@ -1554,6 +1620,7 @@
//
// btnInStore
//
this.btnInStore.Enabled = false;
this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInStore.Location = new System.Drawing.Point(271, 16);
this.btnInStore.Name = "btnInStore";
......@@ -2107,7 +2174,6 @@
//
// groupBox3
//
this.groupBox3.Controls.Add(this.chbIsUseBatch);
this.groupBox3.Controls.Add(this.lblThisSta);
this.groupBox3.Controls.Add(this.chbAuto);
this.groupBox3.Controls.Add(this.lblWarnMsg);
......@@ -2118,23 +2184,10 @@
this.groupBox3.TabStop = false;
this.groupBox3.Text = "设备状态";
//
// chbIsUseBatch
//
this.chbIsUseBatch.AutoSize = true;
this.chbIsUseBatch.Checked = true;
this.chbIsUseBatch.CheckState = System.Windows.Forms.CheckState.Checked;
this.chbIsUseBatch.Location = new System.Drawing.Point(377, 14);
this.chbIsUseBatch.Name = "chbIsUseBatch";
this.chbIsUseBatch.Size = new System.Drawing.Size(112, 24);
this.chbIsUseBatch.TabIndex = 271;
this.chbIsUseBatch.Text = "启动批量上料";
this.chbIsUseBatch.UseVisualStyleBackColor = true;
this.chbIsUseBatch.CheckedChanged += new System.EventHandler(this.chbIsUseBatch_CheckedChanged);
//
// chbAuto
//
this.chbAuto.AutoSize = true;
this.chbAuto.Location = new System.Drawing.Point(265, 14);
this.chbAuto.Location = new System.Drawing.Point(378, 14);
this.chbAuto.Name = "chbAuto";
this.chbAuto.Size = new System.Drawing.Size(112, 24);
this.chbAuto.TabIndex = 270;
......@@ -2686,72 +2739,6 @@
this.btnBatchInStore.UseVisualStyleBackColor = true;
this.btnBatchInStore.Click += new System.EventHandler(this.btnBatchInStore_Click);
//
// txtUpdownP8
//
this.txtUpdownP8.AcceptsReturn = true;
this.txtUpdownP8.BackColor = System.Drawing.SystemColors.Window;
this.txtUpdownP8.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP8.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP8.Location = new System.Drawing.Point(153, 194);
this.txtUpdownP8.MaxLength = 0;
this.txtUpdownP8.Name = "txtUpdownP8";
this.txtUpdownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpdownP8.Size = new System.Drawing.Size(89, 23);
this.txtUpdownP8.TabIndex = 276;
this.txtUpdownP8.Text = "1000";
//
// btnUpdownP8
//
this.btnUpdownP8.AutoSize = true;
this.btnUpdownP8.BackColor = System.Drawing.SystemColors.Control;
this.btnUpdownP8.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpdownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpdownP8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP8.Location = new System.Drawing.Point(10, 192);
this.btnUpdownP8.Name = "btnUpdownP8";
this.btnUpdownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP8.Size = new System.Drawing.Size(140, 27);
this.btnUpdownP8.TabIndex = 275;
this.btnUpdownP8.Text = "升降轴出库低点P8:";
this.btnUpdownP8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP8.UseVisualStyleBackColor = true;
this.btnUpdownP8.Click += new System.EventHandler(this.btnUpDownP8_Click);
//
// txtUpdownP2
//
this.txtUpdownP2.AcceptsReturn = true;
this.txtUpdownP2.BackColor = System.Drawing.SystemColors.Window;
this.txtUpdownP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP2.Location = new System.Drawing.Point(153, 163);
this.txtUpdownP2.MaxLength = 0;
this.txtUpdownP2.Name = "txtUpdownP2";
this.txtUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpdownP2.Size = new System.Drawing.Size(89, 23);
this.txtUpdownP2.TabIndex = 274;
this.txtUpdownP2.Text = "1000";
//
// btnUpdownP2
//
this.btnUpdownP2.AutoSize = true;
this.btnUpdownP2.BackColor = System.Drawing.SystemColors.Control;
this.btnUpdownP2.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpdownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP2.Location = new System.Drawing.Point(10, 161);
this.btnUpdownP2.Name = "btnUpdownP2";
this.btnUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP2.Size = new System.Drawing.Size(140, 27);
this.btnUpdownP2.TabIndex = 273;
this.btnUpdownP2.Text = "升降轴出库高点P2:";
this.btnUpdownP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP2.UseVisualStyleBackColor = true;
this.btnUpdownP2.Click += new System.EventHandler(this.btnUpDownP2_Click);
//
// FrmStoreBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......@@ -3002,7 +2989,6 @@
private System.Windows.Forms.Button btnWaitTrgGo;
public System.Windows.Forms.TextBox txtUpDownDoor;
public System.Windows.Forms.Button btnUpDownDoor;
private System.Windows.Forms.CheckBox chbIsUseBatch;
private System.Windows.Forms.Button btnOpenDoor;
private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.Button btnTempClose;
......
......@@ -1551,14 +1551,7 @@ namespace OnlineStore.AutoInOutStore
int value = FormUtil.GetIntValue(txtUpDownDoor);
AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_P7_Speed);
}
}
private void chbIsUseBatch_CheckedChanged(object sender, EventArgs e)
{
store.UseBatchInout = chbIsUseBatch.Checked;
LogUtil.info("切换是否使用批量上下料:" + store.UseBatchInout);
}
}
private void BtnOpenDoor_Click(object sender, EventArgs e)
{
if (store.storeRunStatus.Equals(StoreRunStatus.Runing) && AutomaticBaiting.AutoBaitingStatus.Equals(StoreRunStatus.Runing))
......
......@@ -17,7 +17,7 @@ namespace OnlineStore.DeviceLibrary
public partial class AC_SA_BoxBean : AC_Store
{
private bool IsIntSlvBlock = false;
public bool UseBatchInout = true;
//public bool UseBatchInout = true;
public string CID = "";
public AUTO_SA_Config Config;
/// <summary>
......@@ -152,15 +152,15 @@ namespace OnlineStore.DeviceLibrary
return false;
}
}
if (UseBatchInout)
{
//if (UseBatchInout)
//{
string canStart = AutomaticBaiting.CanStart();
if (!canStart.Equals(""))
{
LogUtil.info(StoreName + canStart);
return false;
}
}
//}
autoNext = false;
mainTimer.Enabled = false;
alarmType = StoreAlarmType.None;
......@@ -178,7 +178,7 @@ namespace OnlineStore.DeviceLibrary
{
return false;
}
if (UseBatchInout)
//if (UseBatchInout)
{
AutomaticBaiting.Reset(false );
}
......@@ -775,7 +775,7 @@ namespace OnlineStore.DeviceLibrary
CheckAxisAlarm();
ShowTimeLog("轴报警检测完成");
}
if (UseBatchInout)
//if (UseBatchInout)
{
AutomaticBaiting.TimerProcess();
}
......@@ -1177,7 +1177,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info(LOGGER, StoreName + "StopMove");
KND.IOMove(IO_Type.Door_Down, IO_VALUE.LOW);
KND.IOMove(IO_Type.Door_Up, IO_VALUE.LOW);
if (UseBatchInout)
//if (UseBatchInout)
{
AutomaticBaiting.StopMove();
}
......@@ -1451,18 +1451,21 @@ namespace OnlineStore.DeviceLibrary
string posIdStr = data[ParamDefine.posId];
string plateWStr = data[ParamDefine.plateW];
string plateHStr = data[ParamDefine.plateH];
string singleOut = data[ParamDefine.singleOut];
LogUtil.info(LOGGER, "收到服务器出库消息:poaIs=" + posIdStr + ",platew=" + plateWStr + ",plateh=" + plateHStr);
LogUtil.info(LOGGER, "收到服务器出库消息:poaIs=" + posIdStr + ",platew=" + plateWStr + ",plateh=" + plateHStr+",singleOut="+singleOut);
char splitChar = '|';
string[] posIdArray = posIdStr.Split(splitChar);
string[] plateWArray = plateWStr.Split(splitChar);
string[] plateHArray = plateHStr.Split(splitChar);
string[] singleOutArray = plateHStr.Split(splitChar);
int index = -1;
foreach (string posId in posIdArray)
{
index++;
string plateW = plateWArray[index];
string plateH = plateHArray[index];
bool isSingleOut = singleOutArray[index].ToLower().Equals("true");
string[] posArray = posId.Split('#');
if (posArray.Length != 2)
{
......@@ -1485,7 +1488,7 @@ namespace OnlineStore.DeviceLibrary
{
if (CanStarInOut())
{
StartOutStoreMove(new InOutStoreParam("", posId, position), true);
StartOutStoreMove(new InOutStoreParam("", posId, position), !isSingleOut);
}
else
{
......
......@@ -384,7 +384,7 @@ namespace OnlineStore.DeviceLibrary
}
else if (StoreMove.MoveStep == StoreMoveStep.SI_05_DoorWarToDevice)
{
if (StoreMove.IsBatchInOutStore && (!StoreMove.IsNeedInStore))
if (!StoreMove.IsNeedInStore)
{
InStoreLog("送出料盘:SI_21 ,需要操作人员拿走料盘,进出轴(叉子)到门口位置P7 ");
StoreMove.NextMoveStep(StoreMoveStep.SI_21_DeviceToDoor);
......@@ -502,9 +502,12 @@ namespace OnlineStore.DeviceLibrary
#region 送出料盘处理
else if (StoreMove.MoveStep == StoreMoveStep.SI_21_DeviceToDoor)
{
InStoreLog("送出料盘:SI_22 ,打开仓门 ");
StoreMove.NextMoveStep(StoreMoveStep.SI_22_OpenDoor);
OpenDoorAndWait();
if (KND.IOValue(IO_Type.SafetyLightCurtains).Equals(IO_VALUE.HIGH))
{
InStoreLog("送出料盘:SI_22 ,打开仓门 ");
StoreMove.NextMoveStep(StoreMoveStep.SI_22_OpenDoor);
OpenDoorAndWait();
}
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.SI_22_OpenDoor))
{
......@@ -517,16 +520,19 @@ namespace OnlineStore.DeviceLibrary
}
else if (StoreMove.MoveStep == StoreMoveStep.SI_23_WaitTrayGo)
{
InStoreLog("送出料盘:SI_13 叉子从库位中返回,进出轴动作至P1(待机点) ");
// 5= 入仓位完成(料仓Box把料盘放入对应的库位中,装置还未恢复原始状态)
string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : "";
lastPosId = "";
lastPosIdStatus = StoreStatus.InStoreEnd;
storeStatus = StoreStatus.InStoreEnd;
StoreMove.NextMoveStep(StoreMoveStep.SI_13_InoutBack);
InOutBackToP1(moveP.InOut_P1);
CloseDoorAndWait();
{
if (KND.IOValue(IO_Type.SafetyLightCurtains).Equals(IO_VALUE.HIGH))
{
InStoreLog("送出料盘:SI_13 叉子从库位中返回,进出轴动作至P1(待机点) ");
// 5= 入仓位完成(料仓Box把料盘放入对应的库位中,装置还未恢复原始状态)
string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : "";
lastPosId = "";
lastPosIdStatus = StoreStatus.InStoreEnd;
storeStatus = StoreStatus.InStoreEnd;
StoreMove.NextMoveStep(StoreMoveStep.SI_13_InoutBack);
InOutBackToP1(moveP.InOut_P1);
CloseDoorAndWait();
}
}
#endregion
......@@ -703,8 +709,8 @@ namespace OnlineStore.DeviceLibrary
ComMoveToPosition(StoreMove.MoveParam.MoveP.ComPress_P3);
ACAxisMove(Config.UpDown_Axis, StoreMove.MoveParam.MoveP.UpDown_OutLow_P8, Config.UpDownAxis_P8_Speed);
}
else
{
else if (KND.IOValue(IO_Type.SafetyLightCurtains).Equals(IO_VALUE.HIGH))
{
StoreMove.NextMoveStep(StoreMoveStep.SO_21_OpenDoor);
OutStoreLog("出库:SO_21打开仓门,压紧轴至P3(压紧前点),定位气缸下降");
ComMoveToPosition(StoreMove.MoveParam.MoveP.ComPress_P3);
......@@ -722,9 +728,12 @@ namespace OnlineStore.DeviceLibrary
StoreMove.WaitList.Add(WaitResultInfo.WaitTakeTray());
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.SO_22_WaitTrayGo))
{
SO_13_InoutBack();
CloseDoorAndWait();
{
if (KND.IOValue(IO_Type.SafetyLightCurtains).Equals(IO_VALUE.HIGH))
{
SO_13_InoutBack();
CloseDoorAndWait();
}
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_11_PutTray)
{
......
......@@ -404,7 +404,7 @@ namespace OnlineStore.DeviceLibrary
string plateW = data[ParamDefine.plateW];
string plateH = data[ParamDefine.plateH];
string singleOut = data[ParamDefine.singleOut];
bool isSingleOut = singleOut.ToLower().Equals("true");
//bool isSingleOut = singleOut.ToLower().Equals("true");
string[] posArray = posId.Split('#');
if (!(posArray.Length == 2))
{
......@@ -429,7 +429,7 @@ namespace OnlineStore.DeviceLibrary
LastPosId = posId;
InOutStoreParam param = new InOutStoreParam(message, posId, plateH, plateW, 0);
StoreManager.Store.StartInStoreMove(param, !isSingleOut);
StoreManager.Store.StartInStoreMove(param, true);
//如果当前正在出入库中,需要记录下来,等待空闲时执行
LogUtil.info(Name + " 收到服务器入库命令:库位号【" + posId + "】二维码【" + message + "】 开始入库!");
}
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!