Skip to content

刘韬 / SO775-DUOStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 6847c33d 由 刘韬
选项

导入所有io,修正所有出错位置

1 个父辈 ab330180
内嵌 并排
正在显示 11 个修改的文件 包含 273 行增加 和 53 行删除
source/DUOStore/FrmAxisMove.cs
......@@ -34,7 +34,7 @@ namespace OnlineStore.DUOStore
private void FrmTest_Load(object sender, EventArgs e)
{
axisMoveControl1.LoadData(null, new AxisBean[] { StoreManager.Store.T1_BatchAxis, StoreManager.Store.T2_MiddleAxis, StoreManager.Store.T3_UpdownAxis });
axisMoveControl1.LoadData(null, new AxisBean[] { StoreManager.Store.T1_BatchAxis, StoreManager.Store.T2_MiddleAxis, StoreManager.Store.T3_UpdownAxis, StoreManager.Store.T4_InOut_Axis });
LoadPostion();
}
......
source/DUOStore/FrmIOStatus.Designer.cs
......@@ -37,6 +37,9 @@
this.txtWriteTime = new System.Windows.Forms.TextBox();
this.btnBack = new System.Windows.Forms.Button();
this.label5 = new System.Windows.Forms.Label();
this.btn_Stop = new System.Windows.Forms.Button();
this.btn_Down = new System.Windows.Forms.Button();
this.btn_Up = new System.Windows.Forms.Button();
this.btnFoward = new System.Windows.Forms.Button();
this.cmbWriteIO = new System.Windows.Forms.ComboBox();
this.groupBox4 = new System.Windows.Forms.GroupBox();
......@@ -87,12 +90,15 @@
this.groupBox1.Controls.Add(this.txtWriteTime);
this.groupBox1.Controls.Add(this.btnBack);
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.btn_Stop);
this.groupBox1.Controls.Add(this.btn_Down);
this.groupBox1.Controls.Add(this.btn_Up);
this.groupBox1.Controls.Add(this.btnFoward);
this.groupBox1.Controls.Add(this.cmbWriteIO);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(524, 3);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(322, 544);
this.groupBox1.Size = new System.Drawing.Size(322, 536);
this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入";
......@@ -102,7 +108,7 @@
//
this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAll.Location = new System.Drawing.Point(167, 358);
this.btnCloseAll.Location = new System.Drawing.Point(167, 421);
this.btnCloseAll.Name = "btnCloseAll";
this.btnCloseAll.Size = new System.Drawing.Size(125, 34);
this.btnCloseAll.TabIndex = 302;
......@@ -114,7 +120,7 @@
//
this.btnRelax.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnRelax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRelax.Location = new System.Drawing.Point(167, 300);
this.btnRelax.Location = new System.Drawing.Point(167, 363);
this.btnRelax.Name = "btnRelax";
this.btnRelax.Size = new System.Drawing.Size(125, 34);
this.btnRelax.TabIndex = 297;
......@@ -126,7 +132,7 @@
//
this.btnClamp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClamp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClamp.Location = new System.Drawing.Point(167, 263);
this.btnClamp.Location = new System.Drawing.Point(167, 326);
this.btnClamp.Name = "btnClamp";
this.btnClamp.Size = new System.Drawing.Size(125, 34);
this.btnClamp.TabIndex = 296;
......@@ -138,7 +144,7 @@
//
this.btnLineStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLineStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLineStop.Location = new System.Drawing.Point(31, 300);
this.btnLineStop.Location = new System.Drawing.Point(31, 363);
this.btnLineStop.Name = "btnLineStop";
this.btnLineStop.Size = new System.Drawing.Size(125, 34);
this.btnLineStop.TabIndex = 295;
......@@ -150,7 +156,7 @@
//
this.btnLineRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLineRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLineRun.Location = new System.Drawing.Point(31, 263);
this.btnLineRun.Location = new System.Drawing.Point(31, 326);
this.btnLineRun.Name = "btnLineRun";
this.btnLineRun.Size = new System.Drawing.Size(125, 34);
this.btnLineRun.TabIndex = 294;
......@@ -162,7 +168,7 @@
//
this.btnDeviceLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDeviceLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDeviceLed.Location = new System.Drawing.Point(31, 398);
this.btnDeviceLed.Location = new System.Drawing.Point(31, 461);
this.btnDeviceLed.Name = "btnDeviceLed";
this.btnDeviceLed.Size = new System.Drawing.Size(125, 34);
this.btnDeviceLed.TabIndex = 293;
......@@ -174,7 +180,7 @@
//
this.btnCamerLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCamerLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCamerLed.Location = new System.Drawing.Point(31, 358);
this.btnCamerLed.Location = new System.Drawing.Point(31, 421);
this.btnCamerLed.Name = "btnCamerLed";
this.btnCamerLed.Size = new System.Drawing.Size(125, 34);
this.btnCamerLed.TabIndex = 290;
......@@ -190,7 +196,7 @@
this.btnTopDown.Name = "btnTopDown";
this.btnTopDown.Size = new System.Drawing.Size(125, 34);
this.btnTopDown.TabIndex = 289;
this.btnTopDown.Text = "顶升气缸下降";
this.btnTopDown.Text = "线体顶升气缸下降";
this.btnTopDown.UseVisualStyleBackColor = false;
this.btnTopDown.Click += new System.EventHandler(this.btnTopDown_Click);
//
......@@ -202,7 +208,7 @@
this.btnTopUp.Name = "btnTopUp";
this.btnTopUp.Size = new System.Drawing.Size(125, 34);
this.btnTopUp.TabIndex = 288;
this.btnTopUp.Text = "顶升气缸上升";
this.btnTopUp.Text = "线体顶升气缸上升";
this.btnTopUp.UseVisualStyleBackColor = false;
this.btnTopUp.Click += new System.EventHandler(this.btnTopUp_Click);
//
......@@ -294,9 +300,9 @@
this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(125, 34);
this.btnBack.TabIndex = 251;
this.btnBack.Text = "提升机构后退";
this.btnBack.Text = "提升线体后退";
this.btnBack.UseVisualStyleBackColor = false;
this.btnBack.Click += new System.EventHandler(this.btnLocationDown_Click);
this.btnBack.Click += new System.EventHandler(this.btnBack_Click);
//
// label5
//
......@@ -310,6 +316,42 @@
this.label5.Text = "定时(ms):";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btn_Stop
//
this.btn_Stop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_Stop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btn_Stop.Location = new System.Drawing.Point(167, 246);
this.btn_Stop.Name = "btn_Stop";
this.btn_Stop.Size = new System.Drawing.Size(125, 34);
this.btn_Stop.TabIndex = 250;
this.btn_Stop.Text = "提升线体停止";
this.btn_Stop.UseVisualStyleBackColor = false;
this.btn_Stop.Click += new System.EventHandler(this.btn_Stop_Click);
//
// btn_Down
//
this.btn_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btn_Down.Location = new System.Drawing.Point(167, 286);
this.btn_Down.Name = "btn_Down";
this.btn_Down.Size = new System.Drawing.Size(125, 34);
this.btn_Down.TabIndex = 250;
this.btn_Down.Text = "定位销下降";
this.btn_Down.UseVisualStyleBackColor = false;
this.btn_Down.Click += new System.EventHandler(this.btnLocationUp_Click);
//
// btn_Up
//
this.btn_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btn_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btn_Up.Location = new System.Drawing.Point(34, 286);
this.btn_Up.Name = "btn_Up";
this.btn_Up.Size = new System.Drawing.Size(125, 34);
this.btn_Up.TabIndex = 250;
this.btn_Up.Text = "定位销上升";
this.btn_Up.UseVisualStyleBackColor = false;
this.btn_Up.Click += new System.EventHandler(this.btnLocationUp_Click);
//
// btnFoward
//
this.btnFoward.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
......@@ -318,9 +360,9 @@
this.btnFoward.Name = "btnFoward";
this.btnFoward.Size = new System.Drawing.Size(125, 34);
this.btnFoward.TabIndex = 250;
this.btnFoward.Text = "提升机构前进";
this.btnFoward.Text = "提升线体前进";
this.btnFoward.UseVisualStyleBackColor = false;
this.btnFoward.Click += new System.EventHandler(this.btnLocationUp_Click);
this.btnFoward.Click += new System.EventHandler(this.btnFoward_Click);
//
// cmbWriteIO
//
......@@ -446,6 +488,9 @@
private System.Windows.Forms.Button btnRelax;
private System.Windows.Forms.Button btnClamp;
private System.Windows.Forms.Button btnCloseAll;
private System.Windows.Forms.Button btn_Stop;
private System.Windows.Forms.Button btn_Down;
private System.Windows.Forms.Button btn_Up;
}
}
source/DUOStore/FrmIOStatus.cs
......@@ -228,12 +228,14 @@ namespace OnlineStore.DUOStore
private void btnLocationUp_Click(object sender, EventArgs e)
{
StoreManager.Store.hoisterCylinder.StartForward(null);
//StoreManager.Store.hoisterCylinder.StartForward(null);
StoreManager.Store.InOutStation_LocationUp();
}
private void btnLocationDown_Click(object sender, EventArgs e)
{
StoreManager.Store.hoisterCylinder.StartBack(null);
//StoreManager.Store.hoisterCylinder.StartBack(null);
StoreManager.Store.InOutStation_LocationDown();
}
private void FrmIOStatus_Shown(object sender, EventArgs e)
......@@ -351,5 +353,20 @@ namespace OnlineStore.DUOStore
{
}
private void btn_Stop_Click(object sender, EventArgs e)
{
StoreManager.Store.InOutStation_Stop();
}
private void btnFoward_Click(object sender, EventArgs e)
{
StoreManager.Store.InOutStation_GoIn();
}
private void btnBack_Click(object sender, EventArgs e)
{
StoreManager.Store.InOutStation_GoOut();
}
}
}
source/DUOStore/FrmStore.cs
......@@ -47,7 +47,7 @@ namespace OnlineStore.DUOStore
this.Close();
return;
}
foreach (BoxBean box in store.BoxMap.Values)
foreach (BoxBean box in store.BoxMap.Values)//eqList
{
FrmBox frm = new FrmBox();
frm.BoxBean = box;
......@@ -138,7 +138,7 @@ namespace OnlineStore.DUOStore
List<EquipBase> eqList = new List<EquipBase>(store.BoxMap.Values);
eqList.Insert(0, store);
foreach (EquipBase equip in store.BoxMap.Values)
foreach (EquipBase equip in eqList)
{
if (i.Equals(0))
{
......
source/DeviceLibrary/DeviceLibrary.csproj
......@@ -73,6 +73,7 @@
<Compile Include="AXIS\PanasonicServo\ACServerManager.cs" />
<Compile Include="AXIS\PanasonicServo\ACServerManager_Partial.cs" />
<Compile Include="device\IO\HCIOManager.cs" />
<Compile Include="duoStore\DUOStoreBean_RaiseStation.cs" />
<Compile Include="duoStore\AxisBean.cs" />
<Compile Include="duoStore\BoxBean.cs" />
<Compile Include="duoStore\BoxBean_Partial.cs" />
......@@ -80,7 +81,6 @@
<Compile Include="duoStore\DUOStoreBean_Partial.cs" />
<Compile Include="duoStore\ElectricClamp.cs" />
<Compile Include="duoStore\EquipBase.cs" />
<Compile Include="duoStore\HoisterCylinder.cs" />
<Compile Include="duoStore\HumitureBean.cs" />
<Compile Include="duoStore\DUOStoreBean.cs" />
<Compile Include="duoStore\StoreManager.cs" />
......
source/DeviceLibrary/device/IO/HCIOManager.cs
......@@ -24,6 +24,7 @@ namespace OnlineStore.DeviceLibrary.IO
{
if (dIODeviceNameList.Count > 0 && dIODeviceNameList.Contains("HC"))
{
HCBoardManager.InitConfig();
if (!HCBoardManager.CardInitOk())
{
HCBoardManager.OpenCard();
......
source/DeviceLibrary/duoStore/DUOStoreBean.cs
......@@ -88,7 +88,7 @@ namespace OnlineStore.DeviceLibrary
int isAuto = ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun);
if (isAuto == 1)
{
mainTimer.Enabled = true;
IoCheckTimer.Enabled = true;
}
});
}
......@@ -239,7 +239,10 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StoreMoveStep.LR_05_Hoister_Back);
LogUtil.info(Name + "复位 " + MoveInfo.MoveStep + " ：取料电机后退，旋转轴回原点");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
hoisterCylinder.StartBack(MoveInfo);
//hoisterCylinder.StartBack(MoveInfo);
IOMove(IO_Type.RaiseStation_LocationUp, IO_VALUE.LOW);
IOMove(IO_Type.RaiseStation_LocationDown, IO_VALUE.HIGH);
//InOutStation_LocationDown();
T2_MiddleAxis.HomeMove(MoveInfo);
}
else if (MoveInfo.IsStep(StoreMoveStep.LR_05_Hoister_Back))
......
source/DeviceLibrary/duoStore/DUOStoreBean_Partial.cs
......@@ -113,8 +113,19 @@ namespace OnlineStore.DeviceLibrary
public override bool StartOutStoreMove(InOutParam param)
{
if (IOValue(IO_Type.RaiseStation_BackendCheck).Equals(IO_VALUE.HIGH)) {
runStatus = StoreRunStatus.Busy;
storeStatus = StoreStatus.OutStoreExecute;
MoveInfo.NewMove(MoveType.OutStore, new InOutParam(MoveType.OutStore));
LogUtil.info(Name + " 检测到库位有料架");
//LogUtil.info(Name + " 当前料架[" + CurrShelfNum + "][" + CurrShelfType + "],开始出库");
//UpdateShelfNum(CurrShelfNum, 2);
//L_05_WaitTime(StoreMoveStep.LO_05_WaitTime);
MoveInfo.NextMoveStep(StoreMoveStep.LO_07_RaiseStationForward);
return true;
}
//判断是哪个工位有料架
if (IOValue(IO_Type.Line_WorkCheck).Equals(IO_VALUE.HIGH))
else if (IOValue(IO_Type.Line_WorkCheck).Equals(IO_VALUE.HIGH))
{
if (CurrShelfNum >= 0 && (CurrShelfType.Equals(0) || CurrShelfType.Equals(2)))
{
......@@ -179,19 +190,27 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StoreMoveStep.LO_05_WaitTime))
{
MoveInfo.NextMoveStep(StoreMoveStep.LO_06_TopUp);
InOutStoreLog("料架出库： 顶升气缸上升");
CylinderMove(MoveInfo, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_Up);
InOutStoreLog("料架出库： 提升机构上升");
InOutStation_RasieUp();
}
else if (MoveInfo.IsStep(StoreMoveStep.LO_06_TopUp))
{
MoveInfo.NextMoveStep(StoreMoveStep.LO_07_HoisterForward);
InOutStoreLog("料架出库：取料提升机构前进");
hoisterCylinder.StartForward(MoveInfo);
MoveInfo.NextMoveStep(StoreMoveStep.LO_07_RaiseStationForward);
InOutStoreLog("料架出库：横移机构前进");
InOutStation_GoIn();
//hoisterCylinder.StartForward(MoveInfo);
}
else if (MoveInfo.IsStep(StoreMoveStep.LO_07_HoisterForward))
else if (MoveInfo.IsStep(StoreMoveStep.LO_07_RaiseStationForward))
{
MoveInfo.NextMoveStep(StoreMoveStep.LO_07_RaiseStationForward_2);
InOutStoreLog("料架出库：料窜到位，顶升上升");
InOutStation_Stop(1000);
InOutStation_LocationUp();
}
else if (MoveInfo.IsStep(StoreMoveStep.LO_07_RaiseStationForward_2))
{
MoveInfo.NextMoveStep(StoreMoveStep.LO_08_AxisUpToP2);
InOutStoreLog("料架出库：上料轴开始慢速上升到P2点["+Config.BatchAxis_P2+"]，等待检测到料盘");
InOutStoreLog("料架出库：上料轴开始慢速上升到P2点[" + Config.BatchAxis_P2 + "]，等待检测到料盘");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
BatchAxisToP2(true);
}
......@@ -341,13 +360,27 @@ namespace OnlineStore.DeviceLibrary
#region 送出料架处理
else if (MoveInfo.IsStep(StoreMoveStep.LO_31_BatchAxisToP1))
{
MoveInfo.NextMoveStep(StoreMoveStep.LO_32_HoisterBack);
MoveInfo.NextMoveStep(StoreMoveStep.LO_32_RaiseStationBack);
InOutStoreLog("送出料架：升降盘定位气缸后退");
hoisterCylinder.StartBack(MoveInfo);
InOutStation_LocationDown();
}
else if (MoveInfo.IsStep(StoreMoveStep.LO_32_HoisterBack))
else if (MoveInfo.IsStep(StoreMoveStep.LO_32_RaiseStationBack))
{
MoveInfo.NextMoveStep(StoreMoveStep.LO_32_RaiseStationBack_2);
InOutStoreLog("送出料架：横移机构后退");
InOutStation_GoOut();
}
else if (MoveInfo.IsStep(StoreMoveStep.LO_32_RaiseStationBack_2))
{
MoveInfo.NextMoveStep(StoreMoveStep.LO_32_RaiseStationBack_3);
InOutStation_Stop();
InOutStoreLog("送出料架：横移机构停止");
}
else if (MoveInfo.IsStep(StoreMoveStep.LO_32_RaiseStationBack_3))
{
MoveInfo.NextMoveStep(StoreMoveStep.LO_33_TopCylinderDown);
InOutStoreLog("送出料架：顶升气缸下降");
CylinderMove(MoveInfo, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Up);
}
......@@ -534,7 +567,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_02_HoisterBack);
InOutStoreLog("检测到料架：取料提升机构后退端");
hoisterCylinder.StartBack(MoveInfo);
InOutStation_LocationDown();
}
else
{
......@@ -563,16 +596,17 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_02_HoisterBack);
InOutStoreLog("检测到料架：取料提升机构后退端");
hoisterCylinder.StartBack(MoveInfo);
//hoisterCylinder.StartBack(MoveInfo);
InOutStation_LocationDown();
}
else if (MoveInfo.IsStep(StoreMoveStep.LI_02_HoisterBack))
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_03_LocationDown);
InOutStoreLog("入料检测：定位气缸下降");
CylinderMove(MoveInfo, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down);
InOutStation_RasieDown();
}
else if (MoveInfo.IsStep(StoreMoveStep.LI_03_LocationDown))
{
{
LI_04_LineStart();
}
else if (MoveInfo.IsStep(StoreMoveStep.LI_04_LineStart))
......@@ -582,18 +616,25 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StoreMoveStep.LI_05_WaitTime))
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_06_TopUp);
InOutStoreLog("入料检测：链条停止转动， 顶升气缸上升");
InOutStoreLog("入料检测：链条停止转动， 进出机构上升");
LineStop(MoveInfo);
CylinderMove(MoveInfo, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_Up);
InOutStation_RasieUp();
}
else if (MoveInfo.IsStep(StoreMoveStep.LI_06_TopUp))
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_07_HoisterForward);
InOutStoreLog("入料检测：取料提升机构前进");
hoisterCylinder.StartForward(MoveInfo);
InOutStoreLog("入料检测：进出机构前进");
InOutStation_GoIn();
}
else if (MoveInfo.IsStep(StoreMoveStep.LI_07_HoisterForward))
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_07_HoisterForward_2);
InOutStoreLog("入料检测：定位销上升");
InOutStation_LocationUp();
}
else if (MoveInfo.IsStep(StoreMoveStep.LI_07_HoisterForward_2))
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_08_AxisUpToP2);
InOutStoreLog("入料检测：上料轴开始慢速上升到P2 [" + Config.BatchAxis_P2 + "]，等待检测到料盘");
BatchAxisToP2(true);
......@@ -774,18 +815,33 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StoreMoveStep.LI_31_BatchAxisToP1))
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_32_HoisterBack);
InOutStoreLog("送出料架：升降盘定位气缸后退");
hoisterCylinder.StartBack(MoveInfo);
InOutStoreLog("送出料架：顶升气缸下降");
InOutStation_LocationDown();
InOutStation_RasieUp();
}
else if (MoveInfo.IsStep(StoreMoveStep.LI_32_HoisterBack))
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_33_TopCylinderDown);
InOutStoreLog("送出料架：顶升气缸下降");
CylinderMove(MoveInfo, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Up);
InOutStoreLog("送出料架：升降盘定位气缸后退");
InOutStation_GoOut();
//hoisterCylinder.StartBack(MoveInfo);
}
else if (MoveInfo.IsStep(StoreMoveStep.LI_33_TopCylinderDown))
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_33_TopCylinderDown_2);
InOutStoreLog("送出料架：进出滚筒往外");
InOutStation_GoOut();
}
else if (MoveInfo.IsStep(StoreMoveStep.LI_33_TopCylinderDown_2))
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_33_TopCylinderDown_3);
InOutStoreLog("送出料架：进出机构下降");
InOutStation_RasieDown();
}
else if (MoveInfo.IsStep(StoreMoveStep.LI_33_TopCylinderDown_3))
{
InOutStation_Stop(1000);
//判断是否需要送出料架，如果入口和等待区无料架，暂不送出
if (IOValue(IO_Type.Line_InCheck).Equals(IO_VALUE.HIGH) || IOValue(IO_Type.Line_WaitCheck).Equals(IO_VALUE.HIGH) || InstoreEndSendShelf)
{
......@@ -1133,7 +1189,7 @@ namespace OnlineStore.DeviceLibrary
internal bool BoxDoorFree(int id)
{
if (MoveInfo.MoveType.Equals(MoveType.InStore))
if (MoveInfo.MoveType.Equals(MoveType.OutStore))
{
if (MoveInfo.MoveStep >= StoreMoveStep.LO_13_UpdownDown && MoveInfo.MoveStep <= StoreMoveStep.LO_16_MiddleToP1)
{
......@@ -1143,7 +1199,7 @@ namespace OnlineStore.DeviceLibrary
}
}
}else if (MoveInfo.MoveType.Equals(MoveType.OutStore))
}else if (MoveInfo.MoveType.Equals(MoveType.InStore))
{
if (MoveInfo.MoveStep >= StoreMoveStep.LI_23_UpdownDown && MoveInfo.MoveStep <= StoreMoveStep.LI_26_AxisToWait)
{
......
source/DeviceLibrary/duoStore/DUOStoreBean_RaiseStation.cs 0 → 100644
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary
{
partial class DUOStoreBean
{
/// <summary>
/// 进出滚筒往内
/// </summary>
public void InOutStation_GoIn()
{
IOMove(IO_Type.RaiseStation_GoIn, IO_VALUE.HIGH);
IOMove(IO_Type.RaiseStation_GoIn1, IO_VALUE.HIGH);
IOMove(IO_Type.RaiseStation_GoOut, IO_VALUE.LOW);
IOMove(IO_Type.RaiseStation_GoOut1, IO_VALUE.LOW);
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.RaiseStation_FrontCheck, IO_VALUE.HIGH));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.RaiseStation_BackendCheck, IO_VALUE.HIGH));
}
/// <summary>
/// 进出滚筒停止
/// </summary>
public void InOutStation_Stop(int delay = 0)
{
var t = Task.Run(()=> {
if (delay > 0)
{
Task.Delay(delay).Wait();
}
IOMove(IO_Type.RaiseStation_GoIn, IO_VALUE.LOW);
IOMove(IO_Type.RaiseStation_GoIn1, IO_VALUE.LOW);
IOMove(IO_Type.RaiseStation_GoOut, IO_VALUE.LOW);
IOMove(IO_Type.RaiseStation_GoOut1, IO_VALUE.LOW);
});
if (delay == 0)
t.Wait();
}
/// <summary>
/// 提升工位定位销上升
/// </summary>
public void InOutStation_LocationUp()
{
IOMove(IO_Type.RaiseStation_LocationUp, IO_VALUE.HIGH);
IOMove(IO_Type.RaiseStation_LocationDown, IO_VALUE.LOW);
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.RaiseStation_UpLocation1, IO_VALUE.HIGH));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.RaiseStation_UpLocation2, IO_VALUE.HIGH));
}
/// <summary>
/// 进出滚筒往外
/// </summary>
public void InOutStation_GoOut()
{
IOMove(IO_Type.RaiseStation_GoIn, IO_VALUE.LOW);
IOMove(IO_Type.RaiseStation_GoIn1, IO_VALUE.LOW);
IOMove(IO_Type.RaiseStation_GoOut, IO_VALUE.HIGH);
IOMove(IO_Type.RaiseStation_GoOut1, IO_VALUE.HIGH);
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.RaiseStation_FrontCheck, IO_VALUE.LOW));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.RaiseStation_BackendCheck, IO_VALUE.LOW));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Line_SideCheck, IO_VALUE.HIGH));
}
/// <summary>
/// 提升工位定位销下降
/// </summary>
public void InOutStation_LocationDown()
{
IOMove(IO_Type.RaiseStation_LocationUp, IO_VALUE.LOW);
IOMove(IO_Type.RaiseStation_LocationDown, IO_VALUE.HIGH);
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.RaiseStation_DownLocation1, IO_VALUE.HIGH));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.RaiseStation_DownLocation2, IO_VALUE.HIGH));
}
/// <summary>
/// 进出提升机构提升
/// </summary>
public void InOutStation_RasieUp()
{
CylinderMove(MoveInfo, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_Up);
}
/// <summary>
/// 进出提升机构下降
/// </summary>
public void InOutStation_RasieDown()
{
CylinderMove(MoveInfo, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down);
}
}
}
source/DeviceLibrary/store/StoreStep.cs
......@@ -369,9 +369,10 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
LI_06_TopUp,
/// <summary>
/// 入料检测：取料提升机构前进
/// 入料检测：进出机构前进
/// </summary>
LI_07_HoisterForward,
LI_07_HoisterForward_2,
/// <summary>
/// 入料检测：上料轴开始慢速上升到P2点，等待检测到料盘
/// </summary>
......@@ -458,6 +459,8 @@ namespace OnlineStore.DeviceLibrary
/// 送出料架，顶升气缸下降
/// </summary>
LI_33_TopCylinderDown,
LI_33_TopCylinderDown_2,
LI_33_TopCylinderDown_3,
/// <summary>
/// 送出料架，上料阻挡下降1秒，流水线开始转动
......@@ -509,7 +512,8 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 料架出库：取料提升机构前进
/// </summary>
LO_07_HoisterForward,
LO_07_RaiseStationForward,
LO_07_RaiseStationForward_2,
/// <summary>
/// 料架出库：上料轴开始慢速上升到P2点，等待检测到料盘
/// </summary>
......@@ -575,8 +579,9 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 送出料架，升降盘定位气缸后退
/// </summary>
LO_32_HoisterBack,
LO_32_RaiseStationBack,
LO_32_RaiseStationBack_2,
LO_32_RaiseStationBack_3,
/// <summary>
/// 送出料架，顶升气缸下降
/// </summary>
......
source/LoadCVSLibrary/storeConfig/config/Store_Config.cs
......@@ -36,7 +36,7 @@ namespace OnlineStore.LoadCSVLibrary
/// <summary>
/// AXIS,,T4_取料机构进出轴,T4_InOut_Axis,3,COM3,,800,1000,1000,200,500,500,10,1000,0,0
/// </summary>
[ConfigProAttribute("T3_Updown_Axis")]
[ConfigProAttribute("T4_InOut_Axis")]
public ConfigMoveAxis T4_InOut_Axis { get; set; }
/// <summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!