Skip to content

孙克 / ACSingleStore

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

SO_23_WaitNoTray 等待仓门口无料的超时改为1天

1 个父辈 06446855
内嵌 并排
正在显示 4 个修改的文件 包含 100 行增加 和 91 行删除
source/ACServoDriveTest/FrmACTest.cs
...@@ -175,8 +175,9 @@ namespace ACServoDriveTest ...@@ -175,8 +175,9 @@ namespace ACServoDriveTest
private void btnAbsMove_Click(object sender, EventArgs e) private void btnAbsMove_Click(object sender, EventArgs e)
{ {
int speed = Convert.ToInt32(txtSpeed.Text);
int position = Convert.ToInt32(txtPosition.Text.Trim(), 10); int position = Convert.ToInt32(txtPosition.Text.Trim(), 10);
ACServerManager.AbsMove(GetPortName(), GetSlaveAddr(), position); ACServerManager.AbsMove(GetPortName(), GetSlaveAddr(), position,speed);
} }
private void btnSend_Click(object sender, EventArgs e) private void btnSend_Click(object sender, EventArgs e)
{ {
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
类型,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义,SlaveID, 类型,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义,SlaveID,
PRO,IO模块对应的DI数量,IO_DILength,192.168.202.21#8,,,,,,,,,,, PRO,IO模块对应的DI数量,IO_DILength,192.168.202.21#8,,,,,,,,,,,,,,
PRO,模块对应的DO数量,IO_DOLength,192.168.202.21#8,,,,,,,,,,, PRO,模块对应的DO数量,IO_DOLength,192.168.202.21#8,,,,,,,,,,,,,,
PRO,是否有仓门,HasDoor,1,,,,,,,,,,, PRO,是否有仓门,HasDoor,1,,,,,,,,,,,,,,
PRO,IO模块IP,PRO_AOI_IP_1,192.168.202.21,,,,,,,,,,, PRO,IO模块IP,PRO_AOI_IP_1,192.168.202.21,,,,,,,,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X01,DI-01,0, DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X01,DI-01,0,
DI,复位,Reset_BTN,1,PRO_AOI_IP_1,0,复位,X02,DI-02,0, DI,复位,Reset_BTN,1,PRO_AOI_IP_1,0,复位,X02,DI-02,0,
DI,盘点,CheckPos,2,PRO_AOI_IP_1,0,盘点,X03,DI-03,0, DI,点检,CheckPos,2,PRO_AOI_IP_1,0,点检,X03,DI-03,0,
DI,料盘检测1（进料口）,TrayCheck_Door,3,PRO_AOI_IP_1,0,料盘检测1（进料口）,X04,DI-04,0, DI,料盘检测1（进料口）,TrayCheck_Door,3,PRO_AOI_IP_1,0,料盘检测1（进料口）,X04,DI-04,0,
DI,料盘检测2（料叉）,TrayCheck_Fixture,4,PRO_AOI_IP_1,0,料盘检测2（料叉）,X05,DI-05,0, DI,料盘检测2（料叉）,TrayCheck_Fixture,4,PRO_AOI_IP_1,0,料盘检测2（料叉）,X05,DI-05,0,
DI,气压检测,Airpressure_Check,5,PRO_AOI_IP_1,0,气压检测,X06,DI-06,0, DI,气压检测,Airpressure_Check,5,PRO_AOI_IP_1,0,气压检测,X06,DI-06,0,
...@@ -24,84 +24,83 @@ AXIS,（轴一）旋转轴,Middle_Axis,1,COM4,0,,,,, ...@@ -24,84 +24,83 @@ AXIS,（轴一）旋转轴,Middle_Axis,1,COM4,0,,,,,
AXIS,（轴二）升降轴轴,UpDown_Axis,2,COM4,0,,,,, AXIS,（轴二）升降轴轴,UpDown_Axis,2,COM4,0,,,,,
AXIS,（轴三）进出轴,InOut_Axis,3,COM4,0,,,,, AXIS,（轴三）进出轴,InOut_Axis,3,COM4,0,,,,,
AXIS,（轴四）压紧轴,Comp_Axis,4,COM4,0,,,,, AXIS,（轴四）压紧轴,Comp_Axis,4,COM4,0,,,,,
PRO,升降轴 进料口取料点 P1,UpDownAxis_DoorOPosition_P1,304500,,,,,,,,,,, PRO,升降轴 进料口取料点 P1,UpDownAxis_DoorOPosition_P1,305500,,,,,,,,,,,,,,
PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,325300,,,,,,,,,,, PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,338600,,,,,,,,,,,,,,
PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,325300,,,,,,,,,,, PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,338600,,,,,,,,,,,,,,
PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,304500,,,,,,,,,,, PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,305500,,,,,,,,,,,,,,
PRO,旋转轴（轴1）P1 待机原位点,MiddleAxis_P1_Position,359300,,,,,,,,,,, PRO,旋转轴（轴1）P1 待机原位点,MiddleAxis_P1_Position,351500,,,,,,,,,,,,,,
PRO,进出轴（轴3）P1待机原位点,InOutAxis_P1_Position,1000,,,,,,,,,,, PRO,进出轴（轴3）P1待机原位点,InOutAxis_P1_Position,7900,,,,,,,,,,,,,,
PRO,压紧轴（轴4）P1待机原位点,CompressAxis_P1_Position,28000,,,,,,,,,,, PRO,压紧轴（轴4）P1待机原位点,CompressAxis_P1_Position,137000,,,,,,,,,,,,,,
PRO,是否使用定位气缸,IsHasLocationCylinder,0,,,,,,,,,,, PRO,是否使用定位气缸,IsHasLocationCylinder,0,,,,,,,,,,,,,,
PRO,是否有左右侧门,IsHasDoorLimit,1,,,,,,,,,,, PRO,是否有左右侧门,IsHasDoorLimit,1,,,,,,,,,,,,,,
PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,1,,,,, ,, ,,,, PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,1,,,,, ,, ,,,,,,,
PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,, ,,,, PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,, ,,,,,,,
PRO,是否启用仓门口料盘检测信号,IsUse_Door_Check,0,,,,,,,,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
PRO,预警温度,WarnTemperate,80,,,,,,,,,,, PRO,预警温度,WarnTemperate,80,,,,,,,,,,,,,,
PRO,预警湿度,WarnHumidity,80,,,,,,,,,,, PRO,预警湿度,WarnHumidity,80,,,,,,,,,,,,,,
PRO,（轴一）旋转轴目标速度,MiddleAxis_TargetSpeed,250,,,,,,,,,,, PRO,（轴一）旋转轴目标速度,MiddleAxis_TargetSpeed,100,,,,,,,,,,,,,,
PRO,（轴一）旋转轴加速度,MiddleAxis_AddSpeed,1000,,,,,,,,,,, PRO,（轴一）旋转轴加速度,MiddleAxis_AddSpeed,5000,,,,,,,,,,,,,,
PRO,（轴一）旋转轴减速度,MiddleAxis_DelSpeed,1000,,,,,,,,,,, PRO,（轴一）旋转轴减速度,MiddleAxis_DelSpeed,5000,,,,,,,,,,,,,,
PRO,（轴一）旋转轴原点低速度,MiddleAxis_HomeLowSpeed,80,,,,,,,,,,, PRO,（轴一）旋转轴原点低速度,MiddleAxis_HomeLowSpeed,50,,,,,,,,,,,,,,
PRO,（轴一）旋转轴原点高速,MiddleAxis_HomeHighSpeed,60,,,,,,,,,,, PRO,（轴一）旋转轴原点高速,MiddleAxis_HomeHighSpeed,50,,,,,,,,,,,,,,
PRO,（轴一）旋转轴原点加速度,MiddleAxis_HomeAddSpeed,50,,,,,,,,,,, PRO,（轴一）旋转轴原点加速度,MiddleAxis_HomeAddSpeed,50,,,,,,,,,,,,,,
PRO,（轴二）升降轴轴目标速度,UpdownAxis_TargetSpeed,150,,,,,,,,,,, PRO,（轴二）升降轴轴目标速度,UpdownAxis_TargetSpeed,100,,,,,,,,,,,,,,
PRO,（轴二）升降轴轴加速度,UpdownAxis_AddSpeed,400,,,,,,,,,,, PRO,（轴二）升降轴轴加速度,UpdownAxis_AddSpeed,2500,,,,,,,,,,,,,,
PRO,（轴二）升降轴轴减速度,UpdownAxis_DelSpeed,400,,,,,,,,,,, PRO,（轴二）升降轴轴减速度,UpdownAxis_DelSpeed,2500,,,,,,,,,,,,,,
PRO,（轴二）升降轴轴原点低速度,UpdownAxis_HomeLowSpeed,100,,,,,,,,,,, PRO,（轴二）升降轴轴原点低速度,UpdownAxis_HomeLowSpeed,50,,,,,,,,,,,,,,
PRO,（轴二）升降轴轴原点高速,UpdownAxis_HomeHighSpeed,200,,,,,,,,,,, PRO,（轴二）升降轴轴原点高速,UpdownAxis_HomeHighSpeed,50,,,,,,,,,,,,,,
PRO,（轴二）升降轴轴原点加速度,UpdownAxis_HomeAddSpeed,200,,,,,,,,,,, PRO,（轴二）升降轴轴原点加速度,UpdownAxis_HomeAddSpeed,50,,,,,,,,,,,,,,
PRO,（轴三）进出轴目标速度,InoutAxis_TargetSpeed,100,,,,,,,,,,, PRO,（轴三）进出轴目标速度,InoutAxis_TargetSpeed,100,,,,,,,,,,,,,,
PRO,（轴三）进出轴加速度,InoutAxis_AddSpeed,300,,,,,,,,,,, PRO,（轴三）进出轴加速度,InoutAxis_AddSpeed,500,,,,,,,,,,,,,,
PRO,（轴三）进出轴减速度,InoutAxis_DelSpeed,300,,,,,,,,,,, PRO,（轴三）进出轴减速度,InoutAxis_DelSpeed,500,,,,,,,,,,,,,,
PRO,（轴三）进出轴原点低速,InoutAxis_HomeLowSpeed,20,,,,,,,,,,, PRO,（轴三）进出轴原点低速,InoutAxis_HomeLowSpeed,20,,,,,,,,,,,,,,
PRO,（轴三）进出轴原点高速,InoutAxis_HomeHighSpeed,60,,,,,,,,,,, PRO,（轴三）进出轴原点高速,InoutAxis_HomeHighSpeed,20,,,,,,,,,,,,,,
PRO,（轴三）进出轴原点加速度,InoutAxis_HomeAddSpeed,200,,,,,,,,,,, PRO,（轴三）进出轴原点加速度,InoutAxis_HomeAddSpeed,20,,,,,,,,,,,,,,
PRO,（轴四）压紧轴目标速度,CompAxis_TargetSpeed,100,,,,,,,,,,, PRO,（轴四）压紧轴目标速度,CompAxis_TargetSpeed,80,,,,,,,,,,,,,,
PRO,（轴四）压紧轴加速度,CompAxis_AddSpeed,300,,,,,,,,,,, PRO,（轴四）压紧轴加速度,CompAxis_AddSpeed,500,,,,,,,,,,,,,,
PRO,（轴四）压紧轴减速度,CompAxis_DelSpeed,300,,,,,,,,,,, PRO,（轴四）压紧轴减速度,CompAxis_DelSpeed,500,,,,,,,,,,,,,,
PRO,（轴四）压紧轴原点低速,CompAxis_HomeLowSpeed,20,,,,,,,,,,, PRO,（轴四）压紧轴原点低速,CompAxis_HomeLowSpeed,100,,,,,,,,,,,,,,
PRO,（轴四）压紧轴原点高速,CompAxis_HomeHighSpeed,60,,,,,,,,,,, PRO,（轴四）压紧轴原点高速,CompAxis_HomeHighSpeed,100,,,,,,,,,,,,,,
PRO,（轴四）压紧轴原点加速度,CompAxis_HomeAddSpeed,200,,,,,,,,,,, PRO,（轴四）压紧轴原点加速度,CompAxis_HomeAddSpeed,100,,,,,,,,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
PRO,升降轴（轴2）P1速度,UpDownAxis_P1_Speed,1000,,,,,,,,,,, PRO,升降轴（轴2）P1速度,UpDownAxis_P1_Speed,600,,,,,,,,,,,,,,
PRO,升降轴（轴2）P2速度,UpDownAxis_P2_Speed,600,,,,,,,,,,, PRO,升降轴（轴2）P2速度,UpDownAxis_P2_Speed,600,,,,,,,,,,,,,,
PRO,升降轴（轴2）P3速度,UpDownAxis_P3_Speed,1000,,,,,,,,,,, PRO,升降轴（轴2）P3速度,UpDownAxis_P3_Speed,600,,,,,,,,,,,,,,
PRO,升降轴（轴2）P4速度,UpDownAxis_P4_Speed,100,,,,,,,,,,, PRO,升降轴（轴2）P4速度,UpDownAxis_P4_Speed,200,,,,,,,,,,,,,,
PRO,升降轴（轴2）P5速度,UpDownAxis_P5_Speed,1000,,,,,,,,,,, PRO,升降轴（轴2）P5速度,UpDownAxis_P5_Speed,600,,,,,,,,,,,,,,
PRO,升降轴（轴2）P6速度,UpDownAxis_P6_Speed,100,,,,,,,,,,, PRO,升降轴（轴2）P6速度,UpDownAxis_P6_Speed,100,,,,,,,,,,,,,,
PRO,升降轴（轴2）P7速度,UpDownAxis_P7_Speed,100,,,,,, ,,,,, PRO,升降轴（轴2）P7速度,UpDownAxis_P7_Speed,100,,,,,, ,,,,,,,,
PRO,升降轴（轴2）P8速度,UpDownAxis_P8_Speed,100,,,,,,,,,,, PRO,升降轴（轴2）P8速度,UpDownAxis_P8_Speed,100,,,,,,,,,,,,,,
PRO,旋转轴（轴1）P1速度,MiddleAxis_P1_Speed,500,,,,,,,,,,, PRO,升降轴（轴2）P9速度,UpDownAxis_P9_Speed,20,,,,,,,,,,,,,,
PRO,旋转轴（轴1）P2速度,MiddleAxis_P2_Speed,500,,,,,,,,,,, PRO,旋转轴（轴1）P1速度,MiddleAxis_P1_Speed,300,,,,,,,,,,,,,,
PRO,进出轴（轴3）P1速度,InOutAxis_P1_Speed,500,,,,,,,,,,, PRO,旋转轴（轴1）P2速度,MiddleAxis_P2_Speed,300,,,,,,,,,,,,,,
PRO,进出轴（轴3）P2速度,InOutAxis_P2_Speed,500,,,,,,,,,,, PRO,进出轴（轴3）P1速度,InOutAxis_P1_Speed,300,,,,,,,,,,,,,,
PRO,进出轴（轴3）P3速度,InOutAxis_P3_Speed,500,,,,,,,,,,, PRO,进出轴（轴3）P2速度,InOutAxis_P2_Speed,300,,,,,,,,,,,,,,
PRO,压紧轴（轴4）P1速度,CompAxis_P1_Speed,800,,,,,,,,,,, PRO,进出轴（轴3）P3速度,InOutAxis_P3_Speed,300,,,,,,,,,,,,,,
PRO,压紧轴（轴4）P2速度,CompAxis_P2_Speed,800,,,,,,,,,,, PRO,压紧轴（轴4）P1速度,CompAxis_P1_Speed,300,,,,,,,,,,,,,,
PRO,压紧轴（轴4）P3速度,CompAxis_P3_Speed,800,,,,,,,,,,, PRO,压紧轴（轴4）P2速度,CompAxis_P2_Speed,300,,,,,,,,,,,,,,
PRO,（轴一）旋转轴停止时可误差的脉冲数的最小值,MiddleAxis_ErrorCountMin,10,,,,,,,,,,, PRO,压紧轴（轴4）P3速度,CompAxis_P3_Speed,200,,,,,,,,,,,,,,
PRO,（轴二）升降轴轴停止时可误差的脉冲数的最小值,UpdownAxis_ErrorCountMin,10,,,,,, ,,,,, PRO,（轴一）旋转轴停止时可误差的脉冲数的最小值,MiddleAxis_ErrorCountMin,10,,,,,,,,,,,,,,
PRO,（轴三）进出轴停止时可误差的脉冲数的最小值,InoutAxis_ErrorCountMin,10,,,,,,,,,,, PRO,（轴二）升降轴轴停止时可误差的脉冲数的最小值,UpdownAxis_ErrorCountMin,10,,,,,, ,,,,,,,,
PRO,（轴一）旋转轴停止时可误差的脉冲数的最大值,MiddleAxis_ErrorCountMax,1000,,,,,,,,,,, PRO,（轴三）进出轴停止时可误差的脉冲数的最小值,InoutAxis_ErrorCountMin,10,,,,,,,,,,,,,,
PRO,（轴二）升降轴轴停止时可误差的脉冲数的最大值,UpdownAxis_ErrorCountMax,1000,,,,,,,,,,, PRO,（轴一）旋转轴停止时可误差的脉冲数的最大值,MiddleAxis_ErrorCountMax,1000,,,,,,,,,,,,,,
PRO,（轴三）进出轴停止时可误差的脉冲数的最大值,InoutAxis_ErrorCountMax,1000,,,,,,,,,,, PRO,（轴二）升降轴轴停止时可误差的脉冲数的最大值,UpdownAxis_ErrorCountMax,1000,,,,,,,,,,,,,,
PRO,出入库多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,,,,,, PRO,（轴三）进出轴停止时可误差的脉冲数的最大值,InoutAxis_ErrorCountMax,1000,,,,,,,,,,,,,,
PRO,出入库多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,,,,,,, PRO,出入库多少次，会自动重置旋转轴,Box_ResetMCount,50,,,,,,,,,,,,,,
PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,,,,, PRO,出入库多少次，会自动重置所有轴操作,Box_ResetACount,20,,,,,,,,,,,,,,
PRO,是否使用料叉料盘检测信号,IsUse_Tray_Check,1,,,,,,,,,,, PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,,,,,,,,
PRO,是否启用仓门口料盘检测信号,IsUse_Door_Check,1,,,,,,,,,,, PRO,是否使用料盘检测信号,IsUse_Tray_Check,0,,,,,, ,,,,,,,,
PRO,（轴一）旋转轴最小限位,MiddleAxis_PositionMin,0,,,,,,,,,,, PRO,（轴一）旋转轴最小限位,MiddleAxis_PositionMin,0,,,,,,,,,,,,,,
PRO,（轴二）升降轴最小限位,UpdownAxis_PositionMin,0,,,,,,,,,,, PRO,（轴二）升降轴最小限位,UpdownAxis_PositionMin,0,,,,,,,,,,,,,,
PRO,（轴三）进出轴最小限位,InoutAxis_PositionMin,0,,,,,,,,,,, PRO,（轴三）进出轴最小限位,InoutAxis_PositionMin,0,,,,,,,,,,,,,,
PRO,（轴一）旋转轴最大限位,MiddleAxis_PositionMax,0,,,,,,,,,,, PRO,（轴一）旋转轴最大限位,MiddleAxis_PositionMax,0,,,,,,,,,,,,,,
PRO,（轴二）升降轴最大限位,UpdownAxis_PositionMax,0,,,,,,,,,,, PRO,（轴二）升降轴最大限位,UpdownAxis_PositionMax,0,,,,,,,,,,,,,,
PRO,（轴三）进出轴最大限位,InoutAxis_PositionMax,0,,,,,,,,,,, PRO,（轴三）进出轴最大限位,InoutAxis_PositionMax,0,,,,,,,,,,,,,,
PRO,需要吹气的温度(温度标准),Max_Temperature,0,,,,,,,,,,, PRO,需要吹气的温度(温度标准),Max_Temperature,0,,,,,,,,,,,,,,
PRO,需要吹气的湿度(湿度标准),Max_Humidity,10,,,,,,,,,,, PRO,需要吹气的湿度(湿度标准),Max_Humidity,10,,,,,,,,,,,,,,
PRO,每次吹气的时间（分钟）,BlowAir_Time,10,,,,,,,,,,, PRO,每次吹气的时间（分钟）,BlowAir_Time,10,,,,,,,,,,,,,,
PRO,两次吹气间隔（分钟）,BlowAir_Interval,10,,,,,,, ,,,, PRO,两次吹气间隔（分钟）,BlowAir_Interval,10,,,,,,, ,,,,,,,
PRO,温湿度端口号,Humiture_Port,COM5,,,,,,,,,,, PRO,温湿度端口号,Humiture_Port,COM5,,,,,,,,,,,,,,
,,,,,,,,, , PRO,是否启用仓门口料盘检测信号,IsUse_Door_Check,0,,,,,, ,,,,,,,,
PRO,,仓门口相机IP,Camera_IP,192.168.1.123,,,,,,,,,,,,
PRO,,拍照相机名称,PhotoCamera_Name,,,,,,,,,,,,,
,,,,,,,,, , ,,,,,,,,, ,
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -37,6 +37,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -37,6 +37,7 @@ namespace OnlineStore.DeviceLibrary
private int CurrInOutCount = 0; private int CurrInOutCount = 0;
private int CurrInOutACount = 0; private int CurrInOutACount = 0;
int oneDay = 24 * 60 * 60;
private bool LoadParamPosition(InOutParam param) private bool LoadParamPosition(InOutParam param)
{ {
if (param == null) if (param == null)
...@@ -180,22 +181,27 @@ namespace OnlineStore.DeviceLibrary ...@@ -180,22 +181,27 @@ namespace OnlineStore.DeviceLibrary
else if (wait.WaitType == 2) else if (wait.WaitType == 2)
{ {
wait.IsEnd = IOManager.IOValue(wait.IoType).Equals(wait.IoValue); wait.IsEnd = IOManager.IOValue(wait.IoType).Equals(wait.IoValue);
int timeOutMs = Config.IOSingle_TimerOut; //转为秒
int timeOutMs = Config.IOSingle_TimerOut/1000;
if (StoreMove.MoveStep.Equals(StoreMoveStep.SO_31_WaitTake)) if (StoreMove.MoveStep.Equals(StoreMoveStep.SO_31_WaitTake))
{ {
timeOutMs = 650000; timeOutMs = 650000 / 1000;
} }
else if (StoreMove.MoveStep.Equals(StoreMoveStep.SO_29_CheckTray) else if (StoreMove.MoveStep.Equals(StoreMoveStep.SO_29_CheckTray)
|| StoreMove.MoveStep.Equals(StoreMoveStep.SO_22_WaitTray) || StoreMove.MoveStep.Equals(StoreMoveStep.SO_22_WaitTray)
||StoreMove.MoveStep.Equals(StoreMoveStep.SO_27_WaitDoorTray)) ||StoreMove.MoveStep.Equals(StoreMoveStep.SO_27_WaitDoorTray))
{ {
timeOutMs = 5000; timeOutMs = 5000 / 1000;
} }
if (StoreMove.MoveStep.Equals(StoreMoveStep.SC_03_MoveToHBag)) if (StoreMove.MoveStep.Equals(StoreMoveStep.SC_03_MoveToHBag))
{ {
timeOutMs = 20000; timeOutMs = 20000 / 1000;
} }
if ((!wait.IsEnd) && span.TotalMilliseconds > timeOutMs) if (StoreMove.MoveStep.Equals(StoreMoveStep.SO_23_WaitNoTray)&& wait.IoType.Equals(IO_Type.TrayCheck_Door))
{
timeOutMs = oneDay;
}
if ((!wait.IsEnd) && span.TotalSeconds > timeOutMs)
{ {
ConfigIO io = Config.getWaitIO(wait.IoType); ConfigIO io = Config.getWaitIO(wait.IoType);
string msg = StoreName + "[" + StoreMove.MoveType + "][" + StoreMove.MoveStep + "] 等待" + io.DisplayStr + "=" + wait.IoValue + "超时 "; string msg = StoreName + "[" + StoreMove.MoveType + "][" + StoreMove.MoveStep + "] 等待" + io.DisplayStr + "=" + wait.IoValue + "超时 ";
...@@ -845,16 +851,19 @@ namespace OnlineStore.DeviceLibrary ...@@ -845,16 +851,19 @@ namespace OnlineStore.DeviceLibrary
else else
{ {
StoreMove.NextMoveStep(StoreMoveStep.SO_23_WaitNoTray); StoreMove.NextMoveStep(StoreMoveStep.SO_23_WaitNoTray);
OutStoreLog("出库：打开仓门，等待门口无料盘信号 ");
OutStoreLog("出库：打开仓门，等待门口无料盘信号，超时时间= oneDay");
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW)); StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
StoreMove.TimeOutSeconds = oneDay;
OpenDoor(); OpenDoor();
} }
} }
else if (StoreMove.MoveStep == StoreMoveStep.SO_22_WaitTray) else if (StoreMove.MoveStep == StoreMoveStep.SO_22_WaitTray)
{ {
StoreMove.NextMoveStep(StoreMoveStep.SO_23_WaitNoTray); StoreMove.NextMoveStep(StoreMoveStep.SO_23_WaitNoTray);
OutStoreLog("出库：打开仓门，等待门口无料盘信号 "); OutStoreLog("出库：打开仓门，等待门口无料盘信号，超时时间= "+oneDay);
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW)); StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
StoreMove.TimeOutSeconds = oneDay;
OpenDoor(); OpenDoor();
} }
else if (StoreMove.MoveStep == StoreMoveStep.SO_23_WaitNoTray) else if (StoreMove.MoveStep == StoreMoveStep.SO_23_WaitNoTray)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!