Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 67440366 由 几米阳光
选项

修改问题：出库后马上入库

1 个父辈 503dbb97
全部展开
内嵌 并排
正在显示 3 个修改的文件 包含 150 行增加 和 150 行删除
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
......@@ -34,72 +34,72 @@ DO,相机照明开,CameraLight_Power,110,192.168.200.10,0,相机照明开,Y11,DO-11,0
AXIS,（轴一）旋转轴,Middle_Axis,1,COM3,0,,,,
AXIS,（轴二）升降轴轴,UpDown_Axis,1,COM4,0,,,,
AXIS,（轴三）进出轴,InOut_Axis,1,COM5,0,,,,
PRO,温湿度传感器地址,Temperate_ServerAddress,192.168.200.14,,,,,,
PRO,扫码枪IP,Scanner_Ip,192.168.200.13,,,,,,
PRO,扫码枪端口号,Scanner_Port,51236,,,,,,
PRO,升降轴 进料口取料点 P1,UpDownAxis_DoorOPosition_P1,421300,,,,,,
PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,452000,,,,,,
PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,452000,,,,,,
PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,421300,,,,,,
PRO,旋转轴（轴1）P1 待机原位点,MiddleAxis_P1_Position,-200450,,,,,,
PRO,进出轴（轴3）P1待机原位点,InOutAxis_P1_Position,500,,,,,,
PRO,押金轴（轴4）P1待机原位点,CompressAxis_P1_Position,0,,,,,,
PRO,是否使用定位气缸,IsHasLocationCylinder,1,,,,,,
PRO,是否有左右侧门,IsHasDoorLimit,0,,,,,,
PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,0,,,,, ,
PRO,设备是否处于调试状态（1=调试，0=正常）,IsInDebug,0,,,,,,
PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,
PRO,温湿度传感器地址,TemperateServer_Port,9001,,,,,,
PRO,预警温度,WarnTemperate,80,,,,,,
PRO,预警湿度,WarnHumidity,80,,,,,,
PRO,（轴一）旋转轴目标速度,MiddleAxis_TargetSpeed,40,,,,,,
PRO,（轴一）旋转轴加速度,MiddleAxis_AddSpeed,2000,,,,,,
PRO,（轴一）旋转轴减速度,MiddleAxis_DelSpeed,2000,,,,,,
PRO,（轴一）旋转轴原点低速度,MiddleAxis_HomeLowSpeed,800,,,,,,
PRO,（轴一）旋转轴原点高速,MiddleAxis_HomeHighSpeed,60,,,,,,
PRO,（轴一）旋转轴原点加速度,MiddleAxis_HomeAddSpeed,500,,,,,,
PRO,（轴二）升降轴轴目标速度,UpdownAxis_TargetSpeed,40,,,,,,
PRO,（轴二）升降轴轴加速度,UpdownAxis_AddSpeed,1000,,,,,,
PRO,（轴二）升降轴轴减速度,UpdownAxis_DelSpeed,1000,,,,,,
PRO,（轴二）升降轴轴原点低速度,UpdownAxis_HomeLowSpeed,100,,,,,,
PRO,（轴二）升降轴轴原点高速,UpdownAxis_HomeHighSpeed,200,,,,,,
PRO,（轴二）升降轴轴原点加速度,UpdownAxis_HomeAddSpeed,200,,,,,,
PRO,（轴三）进出轴目标速度,InoutAxis_TargetSpeed,40,,,,,,
PRO,（轴三）进出轴加速度,InoutAxis_AddSpeed,1500,,,,,,
PRO,（轴三）进出轴减速度,InoutAxis_DelSpeed,1500,,,,,,
PRO,（轴三）进出轴原点低速,InoutAxis_HomeLowSpeed,20,,,,,,
PRO,（轴三）进出轴原点高速,InoutAxis_HomeHighSpeed,60,,,,,,
PRO,（轴三）进出轴原点加速度,InoutAxis_HomeAddSpeed,200,,,,,,
PRO,升降轴（轴2）P1速度,UpDownAxis_P1_Speed,800,,,,,,
PRO,升降轴（轴2）P2速度,UpDownAxis_P2_Speed,800,,,,,,
PRO,升降轴（轴2）P3速度,UpDownAxis_P3_Speed,800,,,,,,
PRO,升降轴（轴2）P4速度,UpDownAxis_P4_Speed,200,,,,,,
PRO,升降轴（轴2）P5速度,UpDownAxis_P5_Speed,800,,,,,,
PRO,升降轴（轴2）P6速度,UpDownAxis_P6_Speed,200,,,,,,
PRO,升降轴（轴2）P7速度,UpDownAxis_P7_Speed,200,,,,,,
PRO,升降轴（轴2）P8速度,UpDownAxis_P8_Speed,200,,,,,,
PRO,旋转轴（轴1）P1速度,MiddleAxis_P1_Speed,400,,,,,,
PRO,旋转轴（轴1）P2速度,MiddleAxis_P2_Speed,400,,,,,,
PRO,进出轴（轴3）P1速度,InOutAxis_P1_Speed,180,,,,,,
PRO,进出轴（轴3）P2速度,InOutAxis_P2_Speed,180,,,,,,
PRO,进出轴（轴3）P3速度,InOutAxis_P3_Speed,180,,,,,,
PRO,（轴一）旋转轴停止时可误差的脉冲数的最小值,MiddleAxis_ErrorCountMin,10,,,,,,
PRO,（轴二）升降轴轴停止时可误差的脉冲数的最小值,UpdownAxis_ErrorCountMin,10,,,,,,
PRO,（轴三）进出轴停止时可误差的脉冲数的最小值,InoutAxis_ErrorCountMin,10,,,,,,
PRO,（轴一）旋转轴停止时可误差的脉冲数的最大值,MiddleAxis_ErrorCountMax,1000,,,,,,
PRO,（轴二）升降轴轴停止时可误差的脉冲数的最大值,UpdownAxis_ErrorCountMax,1000,,,,,,
PRO,（轴三）进出轴停止时可误差的脉冲数的最大值,InoutAxis_ErrorCountMax,1000,,,,,,
PRO,出入库多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,
PRO,出入库多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,,
PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,
PRO,是否使用料盘检测信号,IsUse_Tray_Check,0,,,,,,
PRO,（轴一）旋转轴最小限位,MiddleAxis_PositionMin,0,,,,,,
PRO,（轴二）升降轴最小限位,UpdownAxis_PositionMin,0,,,,,,
PRO,（轴三）进出轴最小限位,InoutAxis_PositionMin,0,,,,,,
PRO,（轴一）旋转轴最大限位,MiddleAxis_PositionMax,0,,,,,,
PRO,（轴二）升降轴最大限位,UpdownAxis_PositionMax,0,,,,,,
PRO,（轴三）进出轴最大限位,InoutAxis_PositionMax,0,,,,,,
PRO,需要吹气的温度(温度标准),Max_Temperature,0,,,,,,
PRO,需要吹气的湿度(湿度标准),Max_Humidity,10,,,,,,
PRO,每次吹气的时间（分钟）,BlowAir_Time,10,,,,,,
PRO,两次吹气间隔（分钟）,BlowAir_Interval,10,,,,,,
PRO,温湿度传感器地址,Temperate_ServerAddress,192.168.200.14,,,,,,,
PRO,扫码枪IP,Scanner_Ip,192.168.200.13,,,,,,,
PRO,扫码枪端口号,Scanner_Port,51236,,,,,,,
PRO,升降轴 进料口取料点 P1,UpDownAxis_DoorOPosition_P1,423300,,,,,,,
PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,450000,,,,,,,
PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,450000,,,,,,,
PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,423300,,,,,,,
PRO,旋转轴（轴1）P1 待机原位点,MiddleAxis_P1_Position,-200400,,,,,,,
PRO,进出轴（轴3）P1待机原位点,InOutAxis_P1_Position,500,,,,,,,
PRO,押金轴（轴4）P1待机原位点,CompressAxis_P1_Position,0,,,,,,,
PRO,是否使用定位气缸,IsHasLocationCylinder,1,,,,,,,
PRO,是否有左右侧门,IsHasDoorLimit,0,,,,,,,
PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,0,,,,, ,,
PRO,设备是否处于调试状态（1=调试，0=正常）,IsInDebug,0,,,,,,,
PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,,
PRO,温湿度传感器地址,TemperateServer_Port,9001,,,,,,,
PRO,预警温度,WarnTemperate,80,,,,,,,
PRO,预警湿度,WarnHumidity,80,,,,,,,
PRO,（轴一）旋转轴目标速度,MiddleAxis_TargetSpeed,40,,,,,,,
PRO,（轴一）旋转轴加速度,MiddleAxis_AddSpeed,2500,,,,,,,
PRO,（轴一）旋转轴减速度,MiddleAxis_DelSpeed,2500,,,,,,,
PRO,（轴一）旋转轴原点低速度,MiddleAxis_HomeLowSpeed,800,,,,,,,
PRO,（轴一）旋转轴原点高速,MiddleAxis_HomeHighSpeed,60,,,,,,,
PRO,（轴一）旋转轴原点加速度,MiddleAxis_HomeAddSpeed,500,,,,,,,
PRO,（轴二）升降轴轴目标速度,UpdownAxis_TargetSpeed,40,,,,,,,
PRO,（轴二）升降轴轴加速度,UpdownAxis_AddSpeed,1500,,,,,,,
PRO,（轴二）升降轴轴减速度,UpdownAxis_DelSpeed,1500,,,,,,,
PRO,（轴二）升降轴轴原点低速度,UpdownAxis_HomeLowSpeed,100,,,,,,,
PRO,（轴二）升降轴轴原点高速,UpdownAxis_HomeHighSpeed,200,,,,,,,
PRO,（轴二）升降轴轴原点加速度,UpdownAxis_HomeAddSpeed,200,,,,,,,
PRO,（轴三）进出轴目标速度,InoutAxis_TargetSpeed,40,,,,,,,
PRO,（轴三）进出轴加速度,InoutAxis_AddSpeed,2500,,,,,,,
PRO,（轴三）进出轴减速度,InoutAxis_DelSpeed,2500,,,,,,,
PRO,（轴三）进出轴原点低速,InoutAxis_HomeLowSpeed,20,,,,,,,
PRO,（轴三）进出轴原点高速,InoutAxis_HomeHighSpeed,60,,,,,,,
PRO,（轴三）进出轴原点加速度,InoutAxis_HomeAddSpeed,200,,,,,,,
PRO,升降轴（轴2）P1速度,UpDownAxis_P1_Speed,800,,,,,,,
PRO,升降轴（轴2）P2速度,UpDownAxis_P2_Speed,800,,,,,,,
PRO,升降轴（轴2）P3速度,UpDownAxis_P3_Speed,800,,,,,,,
PRO,升降轴（轴2）P4速度,UpDownAxis_P4_Speed,200,,,,,,,
PRO,升降轴（轴2）P5速度,UpDownAxis_P5_Speed,800,,,,,,,
PRO,升降轴（轴2）P6速度,UpDownAxis_P6_Speed,200,,,,,,,
PRO,升降轴（轴2）P7速度,UpDownAxis_P7_Speed,200,,,,,, ,
PRO,升降轴（轴2）P8速度,UpDownAxis_P8_Speed,200,,,,,,,
PRO,旋转轴（轴1）P1速度,MiddleAxis_P1_Speed,400,,,,,,,
PRO,旋转轴（轴1）P2速度,MiddleAxis_P2_Speed,400,,,,,,,
PRO,进出轴（轴3）P1速度,InOutAxis_P1_Speed,150,,,,,,,
PRO,进出轴（轴3）P2速度,InOutAxis_P2_Speed,150,,,,,,,
PRO,进出轴（轴3）P3速度,InOutAxis_P3_Speed,150,,,,,,,
PRO,（轴一）旋转轴停止时可误差的脉冲数的最小值,MiddleAxis_ErrorCountMin,10,,,,,,,
PRO,（轴二）升降轴轴停止时可误差的脉冲数的最小值,UpdownAxis_ErrorCountMin,10,,,,,, ,
PRO,（轴三）进出轴停止时可误差的脉冲数的最小值,InoutAxis_ErrorCountMin,10,,,,,,,
PRO,（轴一）旋转轴停止时可误差的脉冲数的最大值,MiddleAxis_ErrorCountMax,1000,,,,,,,
PRO,（轴二）升降轴轴停止时可误差的脉冲数的最大值,UpdownAxis_ErrorCountMax,1000,,,,,,,
PRO,（轴三）进出轴停止时可误差的脉冲数的最大值,InoutAxis_ErrorCountMax,1000,,,,,,,
PRO,出入库多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,,
PRO,出入库多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,,,
PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,
PRO,是否使用料盘检测信号,IsUse_Tray_Check,0,,,,,, ,
PRO,（轴一）旋转轴最小限位,MiddleAxis_PositionMin,0,,,,,,,
PRO,（轴二）升降轴最小限位,UpdownAxis_PositionMin,0,,,,,,,
PRO,（轴三）进出轴最小限位,InoutAxis_PositionMin,0,,,,,,,
PRO,（轴一）旋转轴最大限位,MiddleAxis_PositionMax,0,,,,,,,
PRO,（轴二）升降轴最大限位,UpdownAxis_PositionMax,0,,,,,,,
PRO,（轴三）进出轴最大限位,InoutAxis_PositionMax,0,,,,,,,
PRO,需要吹气的温度(温度标准),Max_Temperature,0,,,,,,,
PRO,需要吹气的湿度(湿度标准),Max_Humidity,10,,,,,,,
PRO,每次吹气的时间（分钟）,BlowAir_Time,10,,,,,,,
PRO,两次吹气间隔（分钟）,BlowAir_Interval,10,,,,,,,
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
......@@ -117,43 +117,21 @@ namespace OnlineStore.DeviceLibrary
}
if (list.Count > 0)
{
bool isOk = true;
bool isOk = true;
foreach (WaitResultInfo wait in list)
{
if (wait.WaitType == 1)
{
string msg = "";
if (wait.IsHomeMove)
if (wait.WaitType == 1)
{
if (wait.IsEnd.Equals(false) && (!ACHomeMoveIsEnd(wait.AxisInfo, out msg)))
string msg = "";
if (wait.IsHomeMove)
{
if (!msg.Equals(""))
{
WarnMsg = msg;
Alarm(StoreAlarmType.AxisMoveError, GetAlarmCodeByAxis(wait.AxisInfo).ToString(), WarnMsg, StoreMove.MoveType);
}
isOk = false;
break;
}
else
{
wait.IsEnd = true;
}
}
else
{
if (!wait.IsEnd)
{
bool isEnd = ACAxisMoveIsEnd(wait.AxisInfo, wait.TargetPosition, wait.TargetSpeed, out msg);
if (!msg.Equals(""))
{
isOk = false;
WarnMsg = msg;
Alarm(StoreAlarmType.AxisMoveError, GetAlarmCodeByAxis(wait.AxisInfo).ToString(), WarnMsg, StoreMove.MoveType);
break;
}
else if (!isEnd)
if (wait.IsEnd.Equals(false) && (!ACHomeMoveIsEnd(wait.AxisInfo, out msg)))
{
if (!msg.Equals(""))
{
WarnMsg = msg;
Alarm(StoreAlarmType.AxisMoveError, GetAlarmCodeByAxis(wait.AxisInfo).ToString(), WarnMsg, StoreMove.MoveType);
}
isOk = false;
break;
}
......@@ -164,80 +142,102 @@ namespace OnlineStore.DeviceLibrary
}
else
{
if (!wait.IsEnd)
{
bool isEnd = ACAxisMoveIsEnd(wait.AxisInfo, wait.TargetPosition, wait.TargetSpeed, out msg);
if (!msg.Equals(""))
{
isOk = false;
WarnMsg = msg;
Alarm(StoreAlarmType.AxisMoveError, GetAlarmCodeByAxis(wait.AxisInfo).ToString(), WarnMsg, StoreMove.MoveType);
break;
}
else if (!isEnd)
{
isOk = false;
break;
}
else
{
wait.IsEnd = true;
}
}
else
{
}
}
}
}
else if (wait.WaitType == 2)
{
if (!KNDIOValue(wait.IoType).Equals(wait.IoValue))
else if (wait.WaitType == 2)
{
//一分钟还未检测到
if (span.TotalMilliseconds > Config.IOSingle_TimerOut)
{
ConfigIO io = Config.getWaitIO(wait.IoType);
WarnMsg = StoreName + " 等待信号" + io.DisplayStr + "=" + wait.IoValue + "超时！";
//SendAlarmCode(StoreID, LineAlarm.IoNotOk, wait.IoType);
Alarm(StoreAlarmType.IoSingleTimeOut, io.ElectricalDefinition, WarnMsg, StoreMove.MoveType);
LogUtil.error(LOGGER, StoreName + wait.IoType + "等待信号(" + io.DisplayStr + "=" + wait.IoValue + ") 超时", 14);
}
if (StoreMove.OneWaitCanEndStep.Equals(false))
if (!KNDIOValue(wait.IoType).Equals(wait.IoValue))
{
//一分钟还未检测到
if (span.TotalMilliseconds > Config.IOSingle_TimerOut)
{
ConfigIO io = Config.getWaitIO(wait.IoType);
WarnMsg = StoreName + " 等待信号" + io.DisplayStr + "=" + wait.IoValue + "超时！";
//SendAlarmCode(StoreID, LineAlarm.IoNotOk, wait.IoType);
Alarm(StoreAlarmType.IoSingleTimeOut, io.ElectricalDefinition, WarnMsg, StoreMove.MoveType);
LogUtil.error(LOGGER, StoreName + wait.IoType + "等待信号(" + io.DisplayStr + "=" + wait.IoValue + ") 超时", 14);
}
isOk = false;
break;
if (StoreMove.OneWaitCanEndStep.Equals(false))
{
break;
}
}
}
else if (StoreMove.OneWaitCanEndStep)
{
isOk = true;
break;
}
}
else if (wait.WaitType == 3)
{
if (span.TotalMilliseconds < wait.TimeMSeconds)
{
if (StoreMove.OneWaitCanEndStep.Equals(false))
else if (StoreMove.OneWaitCanEndStep)
{
isOk = false;
isOk = true;
break;
}
}
else if (StoreMove.OneWaitCanEndStep)
else if (wait.WaitType == 3)
{
isOk = true;
break;
}
}
else if (wait.WaitType == 5)
{
if (wait.IsHomeMove)
{
if (!ShuoKeControls.IsHomeMoveEnd(wait.SlvAddr, StoreMove.LastSetpTime))
if (span.TotalMilliseconds < wait.TimeMSeconds)
{
ShuoKeControls.GetStatus(wait.SlvAddr);
isOk = false;
break;
if (StoreMove.OneWaitCanEndStep.Equals(false))
{
break;
}
}
else if (StoreMove.OneWaitCanEndStep)
{
isOk = true; break;
isOk = true;
break;
}
}
else
else if (wait.WaitType == 5)
{
if (!ShuoKeControls.IsMoveEnd(wait.SlvAddr, StoreMove.LastSetpTime))
if (wait.IsHomeMove)
{
ShuoKeControls.GetStatus(wait.SlvAddr);
isOk = false;
break;
if (!ShuoKeControls.IsHomeMoveEnd(wait.SlvAddr, StoreMove.LastSetpTime))
{
ShuoKeControls.GetStatus(wait.SlvAddr);
isOk = false;
break;
}
else if (StoreMove.OneWaitCanEndStep)
{
isOk = true; break;
}
}
else if (StoreMove.OneWaitCanEndStep)
else
{
isOk = true; break;
if (!ShuoKeControls.IsMoveEnd(wait.SlvAddr, StoreMove.LastSetpTime))
{
ShuoKeControls.GetStatus(wait.SlvAddr);
isOk = false;
break;
}
else if (StoreMove.OneWaitCanEndStep)
{
isOk = true; break;
}
}
}
}
}
if (isOk)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!