Skip to content

孙克 / ACSingleStore

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

出入库增加门关闭验证。中英文修改。

1 个父辈 d908af79
全部展开
内嵌 并排
正在显示 7 个修改的文件 包含 55 行增加 和 28 行删除
source/ACSingleStore/FrmStoreBox.cs
...@@ -168,8 +168,10 @@ namespace OnlineStore.ACSingleStore ...@@ -168,8 +168,10 @@ namespace OnlineStore.ACSingleStore
{ {
groupHistory.Visible = false; groupHistory.Visible = false;
} }
// this.tabControl1.TabPages.Remove(tabPage3); LanguageProcess();
// groupCode.Visible = false; LanguagePro();
// this.tabControl1.TabPages.Remove(tabPage3);
// groupCode.Visible = false;
} }
private string WaitStart = ResourceCulture.GetString("等待启动"); private string WaitStart = ResourceCulture.GetString("等待启动");
private string dooropen = ResourceCulture.GetString("前门未关"); private string dooropen = ResourceCulture.GetString("前门未关");
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -456,6 +456,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -456,6 +456,15 @@ namespace OnlineStore.DeviceLibrary
} }
return false; return false;
} }
private bool DoorIsOpen()
{
if (IOManager.IOValue(IO_Type.Door_Down).Equals(IO_VALUE.LOW) &&
IOManager.IOValue(IO_Type.Door_Up).Equals(IO_VALUE.HIGH))
{
return true;
}
return false;
}
private void OpenDoorAndWait() private void OpenDoorAndWait()
{ {
Thread.Sleep(60); Thread.Sleep(60);
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -305,7 +305,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -305,7 +305,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0)) if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0))
{ {
SI_02_Move(param.MoveP); SI_02_OpenDoor(param.MoveP);
} }
else else
{ {
...@@ -328,10 +328,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -328,10 +328,11 @@ namespace OnlineStore.DeviceLibrary
{ {
StartInStoreMove(param, false); StartInStoreMove(param, false);
} }
private void SI_02_Move(LineMoveP moveP) private void SI_02_OpenDoor(LineMoveP moveP)
{ {
InStoreLog("入库：SI_02_ 进出轴(叉子)动作至P1, 打开仓门"); InStoreLog("入库：SI_02_ 进出轴(叉子)动作至P1, 打开仓门");
StoreMove.NextMoveStep(StoreMoveStep.SI_02_InOutAxisHome); StoreMove.NextMoveStep(StoreMoveStep.SI_02_OpenDoor);
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(200));
OpenDoorAndWait(); OpenDoorAndWait();
InOutBackToP1(moveP.InOut_P1); InOutBackToP1(moveP.InOut_P1);
} }
...@@ -361,7 +362,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -361,7 +362,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0)) if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0))
{ {
SI_02_Move(moveP); SI_02_OpenDoor(moveP);
} }
else else
{ {
...@@ -372,15 +373,22 @@ namespace OnlineStore.DeviceLibrary ...@@ -372,15 +373,22 @@ namespace OnlineStore.DeviceLibrary
} }
if (StoreMove.MoveStep == StoreMoveStep.SI_01_LocationCylinderDown) if (StoreMove.MoveStep == StoreMoveStep.SI_01_LocationCylinderDown)
{ {
SI_02_Move(moveP); SI_02_OpenDoor(moveP);
} }
else if (StoreMove.MoveStep == StoreMoveStep.SI_02_InOutAxisHome) else if (StoreMove.MoveStep == StoreMoveStep.SI_02_OpenDoor)
{ {
InStoreLog("入库：SI_03 所有轴回到待机点，轴2、轴1 动作到P1,，轴4动作至P3"); if (DoorIsOpen())
StoreMove.NextMoveStep(StoreMoveStep.SI_03_ReturnHome); {
ComMoveToPosition(moveP.ComPress_P3, Config.CompAxis_P3_Speed); InStoreLog("入库：SI_03 所有轴回到待机点，轴2、轴1 动作到P1,，轴4动作至P3");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed); StoreMove.NextMoveStep(StoreMoveStep.SI_03_ReturnHome);
ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed); ComMoveToPosition(moveP.ComPress_P3, Config.CompAxis_P3_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
}
else
{
SI_02_OpenDoor(moveP);
}
} }
else if (StoreMove.MoveStep == StoreMoveStep.SI_03_ReturnHome) else if (StoreMove.MoveStep == StoreMoveStep.SI_03_ReturnHome)
{ {
...@@ -675,13 +683,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -675,13 +683,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0)) if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0))
{ {
//SO_10_DeviceToDoorPro(); SO_091_WaitNoTray();
StoreMove.NextMoveStep(StoreMoveStep.SO_091_WaitNoTray);
OutStoreLog("出库：SO_091 打开仓门，等待门口无料盘 ");
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0));
OpenDoorAndWait();
} }
else else
{ {
...@@ -693,16 +695,19 @@ namespace OnlineStore.DeviceLibrary ...@@ -693,16 +695,19 @@ namespace OnlineStore.DeviceLibrary
//此处需要等待移栽没有工作，才能把盘放入出料口 //此处需要等待移栽没有工作，才能把盘放入出料口
else if (StoreMove.MoveStep == StoreMoveStep.SO_09_LocationCylinder_Down) else if (StoreMove.MoveStep == StoreMoveStep.SO_09_LocationCylinder_Down)
{ {
StoreMove.NextMoveStep(StoreMoveStep.SO_091_WaitNoTray); SO_091_WaitNoTray();
OutStoreLog("出库：SO_091 打开仓门，等待门口无料盘 ");
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0));
OpenDoorAndWait();
} }
else if (StoreMove.MoveStep == StoreMoveStep.SO_091_WaitNoTray) else if (StoreMove.MoveStep == StoreMoveStep.SO_091_WaitNoTray)
{ {
SO_10_DeviceToDoorPro(); if (DoorIsOpen())
{
SO_10_DeviceToDoorPro();
}
else
{
SO_091_WaitNoTray();
}
} }
else if (StoreMove.MoveStep == StoreMoveStep.SO_10_DeviceToDoor) else if (StoreMove.MoveStep == StoreMoveStep.SO_10_DeviceToDoor)
{ {
...@@ -790,6 +795,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -790,6 +795,14 @@ namespace OnlineStore.DeviceLibrary
} }
} }
private void SO_091_WaitNoTray()
{
StoreMove.NextMoveStep(StoreMoveStep.SO_091_WaitNoTray);
OutStoreLog("出库：SO_091 打开仓门，等待门口无料盘 ");
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0));
OpenDoorAndWait();
}
private void OutStoreEnd() private void OutStoreEnd()
{ {
TimeSpan span = DateTime.Now - startOutStoreTime; TimeSpan span = DateTime.Now - startOutStoreTime;
......
source/DeviceLibrary/dataLogic/DLScanSocket.cs
...@@ -68,7 +68,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -68,7 +68,10 @@ namespace OnlineStore.DeviceLibrary
{ {
try try
{ {
scannerSocket.close(); if (scannerSocket != null)
{
scannerSocket.close();
}
isScannerRun = false; isScannerRun = false;
} }
catch (Exception ex) catch (Exception ex)
......
source/DeviceLibrary/store/StoreStep.cs
...@@ -272,7 +272,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -272,7 +272,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 入库。。进出轴（叉子）先返回P1 /// 入库。。进出轴（叉子）先返回P1
/// </summary> /// </summary>
SI_02_InOutAxisHome = 202, SI_02_OpenDoor = 202,
/// <summary> /// <summary>
/// 入库。。所有轴先回到待机点，轴2、轴1 动作到P1,，轴4动作至P3 /// 入库。。所有轴先回到待机点，轴2、轴1 动作到P1,，轴4动作至P3
/// </summary> /// </summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!