Skip to content

张东亮 / SO1131-XLRStore

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

横移测试

1 个父辈 cb03fa83
内嵌 并排
正在显示 5 个修改的文件 包含 115 行增加 和 55 行删除
source/DeviceLibrary/storeBean/inputBean/TurnoverBox.cs.cs
......@@ -3,13 +3,8 @@ using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Xml.Linq;
using static JAKA.JKTYPE;
namespace OnlineStore.DeviceLibrary
{
......@@ -117,10 +112,10 @@ namespace OnlineStore.DeviceLibrary
DO_TranverseUp = "TurnoverBoxB_TranverseUp";
DO_TranverseDown = "TurnoverBoxB_TranverseDown";
//以A方向的正转，对于B就是反转
DO_TranverseRun = "TurnoverBoxB_TranverseBackRun";
DO_TranverseBackRun = "TurnoverBoxB_TranverseRun";
DO_Transition_RollerRun = "Transition_RollerBackRun";
DO_Transition_RollerBackRun = "Transition_RollerRun";
DO_TranverseRun = "TurnoverBoxB_TranverseRun";
DO_TranverseBackRun = "TurnoverBoxB_TranverseBackRun";
DO_Transition_RollerRun = "Transition_RollerRun";
DO_Transition_RollerBackRun = "Transition_RollerBackRun";
}
RFID_IP = rfidIp;
config = inputEquip_Config;
......@@ -188,9 +183,12 @@ namespace OnlineStore.DeviceLibrary
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DI_TranverseDownCheck, IO_VALUE.HIGH));
}
}
bool isBoxA()
{
return "A".Equals(outLet);
}
/// <summary>
/// 横移正转
/// 横移往外转
/// </summary>
/// <param name="moveInfo"></param>
public void TranverseRun(DeviceMoveInfo moveInfo = null)
......@@ -204,13 +202,13 @@ namespace OnlineStore.DeviceLibrary
//}
}
/// <summary>
/// 横移反转
/// 横移往里转
/// </summary>
/// <param name="moveInfo"></param>
public void TranverseBackRun(DeviceMoveInfo moveInfo = null)
{
IOManager.IOMove(DO_TranverseRun, IO_VALUE.LOW, config.Id);
IOManager.IOMove(DO_TranverseBackRun, IO_VALUE.HIGH, config.Id);
IOManager.IOMove(DO_TranverseRun, IO_VALUE.HIGH, config.Id);
//if (moveInfo != null)
//{
// moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_TranverseRun, IO_VALUE.LOW));
......@@ -221,49 +219,69 @@ namespace OnlineStore.DeviceLibrary
{
IOManager.IOMove(DO_TranverseRun, IO_VALUE.LOW, config.Id);
IOManager.IOMove(DO_TranverseBackRun, IO_VALUE.LOW, config.Id);
if (moveInfo != null)
{
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_TranverseRun, IO_VALUE.LOW));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_TranverseBackRun, IO_VALUE.LOW));
}
//if (moveInfo != null)
//{
// moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_TranverseRun, IO_VALUE.LOW));
// moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_TranverseBackRun, IO_VALUE.LOW));
//}
}
/// <summary>
/// 过渡滚筒正转
/// 过渡滚筒正转A-B
/// </summary>
/// <param name="moveInfo"></param>
public void Transition_RollerRun(DeviceMoveInfo moveInfo = null)
public void Transition_RollerRunAtoB(DeviceMoveInfo moveInfo = null)
{
if (isBoxA())
{
IOManager.IOMove(DO_Transition_RollerBackRun, IO_VALUE.LOW, config.Id);
IOManager.IOMove(DO_Transition_RollerRun, IO_VALUE.HIGH, config.Id);
if (moveInfo != null)
}
else
{
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_Transition_RollerBackRun, IO_VALUE.LOW));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_Transition_RollerRun, IO_VALUE.HIGH));
IOManager.IOMove(DO_Transition_RollerRun, IO_VALUE.LOW, config.Id);
IOManager.IOMove(DO_Transition_RollerBackRun, IO_VALUE.HIGH, config.Id);
}
//if (moveInfo != null)
//{
// moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_Transition_RollerBackRun, IO_VALUE.LOW));
// moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_Transition_RollerRun, IO_VALUE.HIGH));
//}
}
/// <summary>
/// 过渡滚筒反转
/// 过渡滚筒反转B-A
/// </summary>
/// <param name="moveInfo"></param>
public void Transition_RollerBackRun(DeviceMoveInfo moveInfo = null)
public void Transition_RollerBackRunBToA(DeviceMoveInfo moveInfo = null)
{
if (isBoxA())
{
IOManager.IOMove(DO_Transition_RollerRun, IO_VALUE.LOW, config.Id);
IOManager.IOMove(DO_Transition_RollerBackRun, IO_VALUE.HIGH, config.Id);
if (moveInfo != null)
}
else
{
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_Transition_RollerRun, IO_VALUE.LOW));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_Transition_RollerBackRun, IO_VALUE.HIGH));
IOManager.IOMove(DO_Transition_RollerBackRun, IO_VALUE.LOW, config.Id);
IOManager.IOMove(DO_Transition_RollerRun, IO_VALUE.HIGH, config.Id);
}
//if (moveInfo != null)
//{
// moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_Transition_RollerRun, IO_VALUE.LOW));
// moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_Transition_RollerBackRun, IO_VALUE.HIGH));
//}
}
public void Transition_RollerStopRun(DeviceMoveInfo moveInfo = null)
{
IOManager.IOMove(DO_Transition_RollerRun, IO_VALUE.LOW, config.Id);
IOManager.IOMove(DO_Transition_RollerBackRun, IO_VALUE.LOW, config.Id);
if (moveInfo != null)
{
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_Transition_RollerRun, IO_VALUE.LOW));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_Transition_RollerBackRun, IO_VALUE.LOW));
}
//if (moveInfo != null)
//{
// moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_Transition_RollerRun, IO_VALUE.LOW));
// moveInfo.WaitList.Add(WaitResultInfo.WaitIO(DO_Transition_RollerBackRun, IO_VALUE.LOW));
//}
}
public bool CacheFrontCheck(IO_VALUE iO_VALUE)
......@@ -477,7 +495,7 @@ namespace OnlineStore.DeviceLibrary
to.TranverseUp();
LogUtil.info(logname + "横移正转");
from.TranverseRun();
from.Transition_RollerRun();
from.Transition_RollerRunAtoB();
to.TranverseBackRun();
bool result = WaitIo(to.DI_CacheBackCheck, IO_VALUE.HIGH, 600_000);
if (!result)
......@@ -502,7 +520,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info(logname + "转移目的地，横移不下降");
}
}
void BoxOutProcess()
public void BoxOutProcess()
{
//AGV已到达，将料串送入AGV中
Task.Factory.StartNew(delegate
......@@ -553,10 +571,14 @@ namespace OnlineStore.DeviceLibrary
//Thread.Sleep(8000);
// Complete();
if (ConfigHelper.Config.Get("BoxLeaveNeedCompleSig", false))
{
while (!AgvNode.status.Equals(NodeStatus.Complete))
{
Thread.Sleep(1000);
}
}
if (!ProcessShelfOut) return;
Thread.Sleep(1000);
FinishLeave();
......@@ -641,7 +663,7 @@ namespace OnlineStore.DeviceLibrary
}
});
}
void BoxEnterProcess()
public void BoxEnterProcess()
{
Task.Factory.StartNew(delegate
{
......
source/XLRStoreClient/inputForm/FrmInputEquip.Designer.cs
......@@ -191,7 +191,7 @@ namespace OnlineStore.XLRStore
this.button15.BackColor = System.Drawing.Color.White;
this.button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button15.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button15.Location = new System.Drawing.Point(215, 303);
this.button15.Location = new System.Drawing.Point(224, 303);
this.button15.Name = "button15";
this.button15.Size = new System.Drawing.Size(92, 34);
this.button15.TabIndex = 312;
......@@ -206,9 +206,9 @@ namespace OnlineStore.XLRStore
this.button14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button14.Location = new System.Drawing.Point(117, 303);
this.button14.Name = "button14";
this.button14.Size = new System.Drawing.Size(92, 34);
this.button14.Size = new System.Drawing.Size(101, 34);
this.button14.TabIndex = 311;
this.button14.Text = "过渡滚筒反转";
this.button14.Text = "过渡滚筒B->A";
this.button14.UseVisualStyleBackColor = false;
this.button14.Click += new System.EventHandler(this.button14_Click);
//
......@@ -221,7 +221,7 @@ namespace OnlineStore.XLRStore
this.button13.Name = "button13";
this.button13.Size = new System.Drawing.Size(99, 34);
this.button13.TabIndex = 310;
this.button13.Text = "过渡滚筒正转";
this.button13.Text = "过渡滚筒A->B";
this.button13.UseVisualStyleBackColor = false;
this.button13.Click += new System.EventHandler(this.button13_Click);
//
......@@ -273,7 +273,7 @@ namespace OnlineStore.XLRStore
this.btnTranverBackRun.Name = "btnTranverBackRun";
this.btnTranverBackRun.Size = new System.Drawing.Size(135, 34);
this.btnTranverBackRun.TabIndex = 306;
this.btnTranverBackRun.Text = "周转箱横移反转";
this.btnTranverBackRun.Text = "周转箱横移流入";
this.btnTranverBackRun.UseVisualStyleBackColor = false;
this.btnTranverBackRun.Click += new System.EventHandler(this.btnTranverBackRun_Click);
//
......@@ -286,7 +286,7 @@ namespace OnlineStore.XLRStore
this.btnTranverRun.Name = "btnTranverRun";
this.btnTranverRun.Size = new System.Drawing.Size(135, 34);
this.btnTranverRun.TabIndex = 305;
this.btnTranverRun.Text = "周转箱横移正转";
this.btnTranverRun.Text = "周转箱横移流出";
this.btnTranverRun.UseVisualStyleBackColor = false;
this.btnTranverRun.Click += new System.EventHandler(this.btnTranverRun_Click);
//
......
source/XLRStoreClient/inputForm/FrmInputEquip.cs
......@@ -798,14 +798,14 @@ namespace OnlineStore.XLRStore
private void button13_Click(object sender, EventArgs e)
{
turnoverBox?.Transition_RollerRun();
turnoverBox?.Transition_RollerRunAtoB();
var btn = sender as Button;
LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
}
private void button14_Click(object sender, EventArgs e)
{
turnoverBox?.Transition_RollerBackRun();
turnoverBox?.Transition_RollerBackRunBToA();
var btn = sender as Button;
LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
}
......@@ -819,7 +819,7 @@ namespace OnlineStore.XLRStore
private void button10_Click_1(object sender, EventArgs e)
{
turnoverBox?.Transition_RollerStopRun();
turnoverBox?.TranverseStopRun();
var btn = sender as Button;
LogUtil.info(inputEquip.BatchMove.Name + "点击：" + btn?.Text);
}
......
source/XLRStoreClient/inputForm/FrmTurnoverBox.Designer.cs
......@@ -24,6 +24,8 @@
this.button4 = new System.Windows.Forms.Button();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.button7 = new System.Windows.Forms.Button();
this.button6 = new System.Windows.Forms.Button();
this.button5 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
......@@ -83,7 +85,7 @@
this.checkBox2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.checkBox2.Location = new System.Drawing.Point(514, 327);
this.checkBox2.Name = "checkBox2";
this.checkBox2.Size = new System.Drawing.Size(151, 23);
this.checkBox2.Size = new System.Drawing.Size(123, 21);
this.checkBox2.TabIndex = 289;
this.checkBox2.Text = "自动清除料箱绑定";
this.checkBox2.UseVisualStyleBackColor = true;
......@@ -109,7 +111,7 @@
this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.checkBox1.Location = new System.Drawing.Point(514, 372);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(94, 23);
this.checkBox1.Size = new System.Drawing.Size(78, 21);
this.checkBox1.TabIndex = 283;
this.checkBox1.Text = "AGV手动";
this.checkBox1.UseVisualStyleBackColor = true;
......@@ -117,6 +119,8 @@
//
// groupBox1
//
this.groupBox1.Controls.Add(this.button7);
this.groupBox1.Controls.Add(this.button6);
this.groupBox1.Controls.Add(this.button5);
this.groupBox1.Controls.Add(this.button1);
this.groupBox1.Controls.Add(this.button2);
......@@ -129,6 +133,26 @@
this.groupBox1.TabStop = false;
this.groupBox1.Text = "AGV信号手动";
//
// button7
//
this.button7.Location = new System.Drawing.Point(661, 62);
this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(135, 34);
this.button7.TabIndex = 291;
this.button7.Text = "测试-料箱流出";
this.button7.UseVisualStyleBackColor = true;
this.button7.Click += new System.EventHandler(this.button7_Click);
//
// button6
//
this.button6.Location = new System.Drawing.Point(661, 22);
this.button6.Name = "button6";
this.button6.Size = new System.Drawing.Size(135, 34);
this.button6.TabIndex = 290;
this.button6.Text = "测试-料箱进入";
this.button6.UseVisualStyleBackColor = true;
this.button6.Click += new System.EventHandler(this.button6_Click);
//
// button5
//
this.button5.BackColor = System.Drawing.Color.White;
......@@ -160,7 +184,7 @@
this.button2.BackColor = System.Drawing.Color.White;
this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button2.Location = new System.Drawing.Point(497, 30);
this.button2.Location = new System.Drawing.Point(338, 30);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(135, 34);
this.button2.TabIndex = 287;
......@@ -173,7 +197,7 @@
this.button3.BackColor = System.Drawing.Color.White;
this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button3.Location = new System.Drawing.Point(638, 30);
this.button3.Location = new System.Drawing.Point(485, 30);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(135, 34);
this.button3.TabIndex = 284;
......@@ -252,9 +276,9 @@
this.chbMoveStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbMoveStop.AutoSize = true;
this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbMoveStop.Location = new System.Drawing.Point(432, 260);
this.chbMoveStop.Location = new System.Drawing.Point(452, 260);
this.chbMoveStop.Name = "chbMoveStop";
this.chbMoveStop.Size = new System.Drawing.Size(104, 28);
this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
this.chbMoveStop.TabIndex = 327;
this.chbMoveStop.Text = "暂停运动";
this.chbMoveStop.UseVisualStyleBackColor = true;
......@@ -280,9 +304,9 @@
this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
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.Location = new System.Drawing.Point(330, 260);
this.chbDebug.Location = new System.Drawing.Point(350, 260);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(104, 28);
this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 325;
this.chbDebug.Text = "调试状态";
this.chbDebug.UseVisualStyleBackColor = true;
......@@ -295,7 +319,7 @@
this.lblAgvInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblAgvInfo.Location = new System.Drawing.Point(9, 233);
this.lblAgvInfo.Name = "lblAgvInfo";
this.lblAgvInfo.Size = new System.Drawing.Size(75, 20);
this.lblAgvInfo.Size = new System.Drawing.Size(61, 17);
this.lblAgvInfo.TabIndex = 282;
this.lblAgvInfo.Text = "AGV 状态";
//
......@@ -341,7 +365,7 @@
//
// FrmTurnoverBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(949, 546);
this.Controls.Add(this.panel2);
......@@ -388,6 +412,8 @@
private System.Windows.Forms.Button button4;
private System.Windows.Forms.CheckBox checkBox2;
private System.Windows.Forms.Button button5;
private System.Windows.Forms.Button button7;
private System.Windows.Forms.Button button6;
}
}
source/XLRStoreClient/inputForm/FrmTurnoverBox.cs
......@@ -217,6 +217,18 @@ namespace OnlineStore.XLRStore
{
moveBean.FinishEnter();
}
private void button6_Click(object sender, EventArgs e)
{
moveBean?.BoxEnterProcess();
LogUtil.info(moveBean.Name + "手动点击料箱流入测试 ");
}
private void button7_Click(object sender, EventArgs e)
{
moveBean?.BoxOutProcess();
LogUtil.info(moveBean.Name + "手动点击料箱流出测试 ");
}
}
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!