Skip to content

孙克 / ACSquareStore

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

去掉料架检测到信号和托架前进后退

1 个父辈 758f33da
全部展开
内嵌 并排
正在显示 4 个修改的文件 包含 73 行增加 和 71 行删除
source/DeviceLibrary/acSquareStore/ShelfMoveBean.cs
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
using OnlineStore.LoadCSVLibrary; using OnlineStore.LoadCSVLibrary;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
...@@ -96,52 +97,53 @@ namespace OnlineStore.DeviceLibrary ...@@ -96,52 +97,53 @@ namespace OnlineStore.DeviceLibrary
public bool StartForward(StoreMoveInfo moveInfo) public bool StartForward(StoreMoveInfo moveInfo)
{ {
string forwardIO = IO_Type.LeftShelf_Forward; //string forwardIO = IO_Type.LeftShelf_Forward;
string backIO = IO_Type.LeftShelf_Back; //string backIO = IO_Type.LeftShelf_Back;
if (this.ShelfType.Equals(2)) //if (this.ShelfType.Equals(2))
{ //{
forwardIO = IO_Type.RightShelf_Forward; // forwardIO = IO_Type.RightShelf_Forward;
backIO = IO_Type.RightShelf_Back; // backIO = IO_Type.RightShelf_Back;
} //}
//如果门已打开直接返回 ////如果门已打开直接返回
if (IOManager.IOValue(forwardIO).Equals(IO_VALUE.HIGH) && //if (IOManager.IOValue(forwardIO).Equals(IO_VALUE.HIGH) &&
IOManager.IOValue(backIO).Equals(IO_VALUE.LOW)) // IOManager.IOValue(backIO).Equals(IO_VALUE.LOW))
{ //{
return true; // return true;
} //}
if (moveInfo != null) //if (moveInfo != null)
{ //{
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(forwardIO, IO_VALUE.HIGH)); // moveInfo.WaitList.Add(WaitResultInfo.WaitIO(forwardIO, IO_VALUE.HIGH));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(backIO, IO_VALUE.LOW)); // moveInfo.WaitList.Add(WaitResultInfo.WaitIO(backIO, IO_VALUE.LOW));
} //}
return Start(forwardIO, backIO, forwardIO); //return Start(forwardIO, backIO, forwardIO);
return true;
} }
public bool StartBack(StoreMoveInfo moveInfo) public bool StartBack(StoreMoveInfo moveInfo)
{ {
string forwardIO = IO_Type.LeftShelf_Forward; //string forwardIO = IO_Type.LeftShelf_Forward;
string backIO = IO_Type.LeftShelf_Back; //string backIO = IO_Type.LeftShelf_Back;
if (this.ShelfType.Equals(2)) //if (this.ShelfType.Equals(2))
{ //{
forwardIO = IO_Type.RightShelf_Forward; // forwardIO = IO_Type.RightShelf_Forward;
backIO = IO_Type.RightShelf_Back; // backIO = IO_Type.RightShelf_Back;
} //}
//如果门已打开直接返回 ////如果门已打开直接返回
if (IOManager.IOValue(backIO).Equals(IO_VALUE.HIGH) && //if (IOManager.IOValue(backIO).Equals(IO_VALUE.HIGH) &&
IOManager.IOValue(forwardIO).Equals(IO_VALUE.LOW)) // IOManager.IOValue(forwardIO).Equals(IO_VALUE.LOW))
{ //{
return true; // return true;
} //}
if (moveInfo != null)
{
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(backIO, IO_VALUE.HIGH));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(forwardIO, IO_VALUE.LOW));
}
return Start(backIO, forwardIO, backIO);
//if (moveInfo != null)
//{
// moveInfo.WaitList.Add(WaitResultInfo.WaitIO(backIO, IO_VALUE.HIGH));
// moveInfo.WaitList.Add(WaitResultInfo.WaitIO(forwardIO, IO_VALUE.LOW));
//}
//return Start(backIO, forwardIO, backIO);
return true;
} }
} }
} }
source/DeviceLibrary/acSquareStore/Square_BoxBean.cs
...@@ -1641,14 +1641,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -1641,14 +1641,14 @@ namespace OnlineStore.DeviceLibrary
{ {
return false; return false;
} }
if (door == 1 && IOManager.IOValue(IO_Type.LeftShelf_Check).Equals(IO_VALUE.HIGH)) //if (door == 1 && IOManager.IOValue(IO_Type.LeftShelf_Check).Equals(IO_VALUE.HIGH))
{ //{
return false; // return false;
} //}
if (door == 2 && IOManager.IOValue(IO_Type.RightShelf_Check).Equals(IO_VALUE.HIGH)) //if (door == 2 && IOManager.IOValue(IO_Type.RightShelf_Check).Equals(IO_VALUE.HIGH))
{ //{
return false; // return false;
} //}
return true; return true;
} }
......
source/LoadCVSLibrary/storeConfig/config/IO_Type.cs
...@@ -61,26 +61,26 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -61,26 +61,26 @@ namespace OnlineStore.LoadCSVLibrary
/// DI,右取料口门开关信号,RightDoor_Close,6 0,右取料口门开关信号,X1-7,A7 /// DI,右取料口门开关信号,RightDoor_Close,6 0,右取料口门开关信号,X1-7,A7
/// </summary> /// </summary>
public static string RightDoor_Close = "RightDoor_Close"; public static string RightDoor_Close = "RightDoor_Close";
/// <summary> ///// <summary>
/// DI,出料下托架前进（左）,LeftShelf_Forward,7 0,出料下托架前进（左）,X1-8,A8 ///// DI,出料下托架前进（左）,LeftShelf_Forward,7 0,出料下托架前进（左）,X1-8,A8
/// </summary> ///// </summary>
public static string LeftShelf_Forward = "LeftShelf_Forward"; //public static string LeftShelf_Forward = "LeftShelf_Forward";
/// <summary> ///// <summary>
/// DI,出料下托架后退（左）,LeftShelf_Back,8 0,出料下托架后退（左）,X2-1,A10 ///// DI,出料下托架后退（左）,LeftShelf_Back,8 0,出料下托架后退（左）,X2-1,A10
/// </summary> ///// </summary>
public static string LeftShelf_Back = "LeftShelf_Back"; //public static string LeftShelf_Back = "LeftShelf_Back";
/// <summary> ///// <summary>
/// DI,出料下托架前进（右）,RightShelf_Forward,9 0,出料下托架前进（右）,X2-2,A11 ///// DI,出料下托架前进（右）,RightShelf_Forward,9 0,出料下托架前进（右）,X2-2,A11
/// </summary> ///// </summary>
public static string RightShelf_Forward = "RightShelf_Forward"; //public static string RightShelf_Forward = "RightShelf_Forward";
/// <summary> ///// <summary>
///DI,出料下托架后退（右）,RightShelf_Back,10 0,出料下托架后退（右）,X2-3,A12 /////DI,出料下托架后退（右）,RightShelf_Back,10 0,出料下托架后退（右）,X2-3,A12
/// </summary> ///// </summary>
public static string RightShelf_Back = "RightShelf_Back"; //public static string RightShelf_Back = "RightShelf_Back";
/// <summary> /// <summary>
...@@ -92,14 +92,14 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -92,14 +92,14 @@ namespace OnlineStore.LoadCSVLibrary
/// DI,空气压力检测信号,Airpressure_Check,12 0,空气压力检测信号,X2-5,A14 /// DI,空气压力检测信号,Airpressure_Check,12 0,空气压力检测信号,X2-5,A14
/// </summary> /// </summary>
public static string Airpressure_Check = "Airpressure_Check"; public static string Airpressure_Check = "Airpressure_Check";
/// <summary> ///// <summary>
/// DI,托架物料检测（左）,LeftShelf_Check,13 0,托架物料检测（左）,X2-6,A15 ///// DI,托架物料检测（左）,LeftShelf_Check,13 0,托架物料检测（左）,X2-6,A15
/// </summary> ///// </summary>
public static string LeftShelf_Check = "LeftShelf_Check"; //public static string LeftShelf_Check = "LeftShelf_Check";
/// <summary> ///// <summary>
/// DI,托架物料检测（右）,RightShelf_Check,14 0,托架物料检测（右）,X2-7,A16 ///// DI,托架物料检测（右）,RightShelf_Check,14 0,托架物料检测（右）,X2-7,A16
/// </summary> ///// </summary>
public static string RightShelf_Check = "RightShelf_Check"; //public static string RightShelf_Check = "RightShelf_Check";
/// <summary> /// <summary>
/// DO,信号灯绿色开机,AutoRun_HddLed,0 ,信号灯绿色开机,Y1-1,B1 /// DO,信号灯绿色开机,AutoRun_HddLed,0 ,信号灯绿色开机,Y1-1,B1
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!