Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
RC1250-AssemblyLine
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 8642956f
由
LN
编写于
2020-03-03 17:53:59 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
修改:料架进入入料装置时中途链条停止转动的现象。
1 个父辈
e1c740c7
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
56 行增加
和
68 行删除
source/AssemblyLineClient/记录.txt
source/DeviceLibrary/assemblyLine/EquipBase.cs
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
source/DeviceLibrary/assemblymanager/TrayManager.cs
source/DeviceLibrary/deviceLibrary/IO/AIOBOX/AIOBOXManager.cs
source/DeviceLibrary/deviceLibrary/IO/IOManager.cs
source/AssemblyLineClient/记录.txt
查看文件 @
8642956
...
@@ -224,8 +224,8 @@ PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=800
...
@@ -224,8 +224,8 @@ PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=800
修改:料架进入入料装置时中途链条停止转动的现象。
GetDIValue 方法循环查找三次防止报错引起急停。
...
...
source/DeviceLibrary/assemblyLine/EquipBase.cs
查看文件 @
8642956
...
@@ -314,7 +314,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -314,7 +314,7 @@ namespace OnlineStore.DeviceLibrary
preTrayNum
=
currTrayNum
;
preTrayNum
=
currTrayNum
;
currTrayNum
=
RFIDManager
.
GetTrayNum
(
DeviceID
,
true
);
currTrayNum
=
RFIDManager
.
GetTrayNum
(
DeviceID
,
true
);
LogInfo
(
" ["
+
trayCount
+
"] IP ["
+
RFIDManager
.
GetRFIP
(
DeviceID
)
+
"] ["
+
preTrayNum
+
"] 当前托盘 ["
+
currTrayNum
+
"]"
);
LogInfo
(
" ["
+
trayCount
+
"] IP ["
+
RFIDManager
.
GetRFIP
(
DeviceID
)
+
"] ["
+
preTrayNum
+
"] 当前托盘 ["
+
currTrayNum
+
"]"
);
if
(
preTrayNum
.
Equals
(
currTrayNum
))
if
(
preTrayNum
.
Equals
(
currTrayNum
)
&&
currTrayNum
>
0
)
{
{
TrayManager
.
TrayErrorMsg
=
DateTime
.
Now
.
ToLongTimeString
()+
" "
+
Name
+
"托盘号出现错乱:上一个托盘["
+
preTrayNum
+
"] 当前托盘 ["
+
currTrayNum
+
"],连续两个托盘号一样"
;
TrayManager
.
TrayErrorMsg
=
DateTime
.
Now
.
ToLongTimeString
()+
" "
+
Name
+
"托盘号出现错乱:上一个托盘["
+
preTrayNum
+
"] 当前托盘 ["
+
currTrayNum
+
"],连续两个托盘号一样"
;
LogUtil
.
error
(
Name
+
"托盘号出现错乱:上一个托盘["
+
preTrayNum
+
"] 当前托盘 ["
+
currTrayNum
+
"],连续两个托盘号一样"
);
LogUtil
.
error
(
Name
+
"托盘号出现错乱:上一个托盘["
+
preTrayNum
+
"] 当前托盘 ["
+
currTrayNum
+
"],连续两个托盘号一样"
);
...
...
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
查看文件 @
8642956
...
@@ -768,7 +768,15 @@ namespace OnlineStore.DeviceLibrary
...
@@ -768,7 +768,15 @@ namespace OnlineStore.DeviceLibrary
}
}
//等待200毫秒后停止转动
//等待200毫秒后停止转动
Thread
.
Sleep
(
3000
);
Thread
.
Sleep
(
3000
);
IOMove
(
IO_Type
.
SL_Line_Run
,
IO_VALUE
.
LOW
);
if
(
MoveInfo
.
MoveType
.
Equals
(
LineMoveStep
.
FI_03_LineStart
))
{
LogUtil
.
info
(
logName
+
" 等待3000后, MoveInfo.MoveType= FI_03_LineStart 不需要停止链条转动"
);
}
else
{
LogUtil
.
info
(
logName
+
"等待3000后,停止链条转动"
);
IOMove
(
IO_Type
.
SL_Line_Run
,
IO_VALUE
.
LOW
);
}
//料架可离开
//料架可离开
AgvClient
.
SetStatus
(
Config
.
AgvInName
,
""
,
ClientAction
.
FinishEnter
,
ClientLevel
.
High
,
true
);
AgvClient
.
SetStatus
(
Config
.
AgvInName
,
""
,
ClientAction
.
FinishEnter
,
ClientLevel
.
High
,
true
);
Task
.
Factory
.
StartNew
(
delegate
Task
.
Factory
.
StartNew
(
delegate
...
...
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
查看文件 @
8642956
...
@@ -485,6 +485,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -485,6 +485,7 @@ namespace OnlineStore.DeviceLibrary
//等待指定时间
//等待指定时间
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
1000
));
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
1000
));
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SL_Location_Check
,
IO_VALUE
.
HIGH
));
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SL_Location_Check
,
IO_VALUE
.
HIGH
));
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SL_Line_Run
,
IO_VALUE
.
HIGH
));
}
else
if
(
IOValue
(
IO_Type
.
SL_Entry_Check
).
Equals
(
IO_VALUE
.
HIGH
))
}
else
if
(
IOValue
(
IO_Type
.
SL_Entry_Check
).
Equals
(
IO_VALUE
.
HIGH
))
{
{
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FI_03_LineStart
);
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FI_03_LineStart
);
...
@@ -495,6 +496,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -495,6 +496,7 @@ namespace OnlineStore.DeviceLibrary
//等待指定时间
//等待指定时间
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
1000
));
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
1000
));
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SL_Stop_Check
,
IO_VALUE
.
HIGH
));
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SL_Stop_Check
,
IO_VALUE
.
HIGH
));
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SL_Line_Run
,
IO_VALUE
.
HIGH
));
}
}
else
else
{
{
...
...
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
查看文件 @
8642956
...
@@ -297,21 +297,10 @@ namespace OnlineStore.DeviceLibrary
...
@@ -297,21 +297,10 @@ namespace OnlineStore.DeviceLibrary
return
true
;
return
true
;
}
}
if
(
sidesWayNum
.
Equals
(
2
)
&&
SW23WaitTrayNum
<
0
)
if
(
sidesWayNum
.
Equals
(
2
)
&&
SW23WaitTrayNum
<
0
)
{
{
// LineMoveInfo moveInfo = FeedingEquipMap[104].SecondMoveInfo;
if
(
SW23_MoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
None
))
if
(
SW23_MoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
None
))
{
{
return
true
;
return
true
;
//if (moveInfo.MoveType.Equals(LineMoveType.None))
//{
// return true;
//}
//else if (moveInfo.MoveType.Equals(LineMoveType.CheckFixture) &&
// moveInfo.MoveStep >= LineMoveStep.MO_15_WaitCanGo &&
//moveInfo.MoveStep <= LineMoveStep.MO_18_StopCylinder_Back)
//{
// return true;
//}
}
}
else
if
(
SW23_MoveInfo
.
MoveStep
<=
(
LineMoveStep
.
SW12_WaitTrayGo
)
else
if
(
SW23_MoveInfo
.
MoveStep
<=
(
LineMoveStep
.
SW12_WaitTrayGo
)
&&
SW23_MoveInfo
.
MoveStep
>=
(
LineMoveStep
.
SW10_WatOutFixture2
))
&&
SW23_MoveInfo
.
MoveStep
>=
(
LineMoveStep
.
SW10_WatOutFixture2
))
...
@@ -324,21 +313,10 @@ namespace OnlineStore.DeviceLibrary
...
@@ -324,21 +313,10 @@ namespace OnlineStore.DeviceLibrary
return
true
;
return
true
;
}
}
else
if
(
sidesWayNum
.
Equals
(
4
)
&&
SW41WaitTrayNum
<
0
)
else
if
(
sidesWayNum
.
Equals
(
4
)
&&
SW41WaitTrayNum
<
0
)
{
{
// LineMoveInfo moveInfo = FeedingEquipMap[101].SecondMoveInfo;
if
(
SW41_MoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
None
))
if
(
SW41_MoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
None
))
{
{
return
true
;
return
true
;
//if (moveInfo.MoveType.Equals(LineMoveType.None))
//{
// return true;
//}
//else if (moveInfo.MoveType.Equals(LineMoveType.CheckFixture) &&
// moveInfo.MoveStep >= LineMoveStep.MO_15_WaitCanGo &&
//moveInfo.MoveStep <= LineMoveStep.MO_18_StopCylinder_Back)
//{
// return true;
//}
}
}
else
if
(
SW41_MoveInfo
.
MoveStep
<=
(
LineMoveStep
.
SW12_WaitTrayGo
)
else
if
(
SW41_MoveInfo
.
MoveStep
<=
(
LineMoveStep
.
SW12_WaitTrayGo
)
&&
SW41_MoveInfo
.
MoveStep
>=
(
LineMoveStep
.
SW10_WatOutFixture2
))
&&
SW41_MoveInfo
.
MoveStep
>=
(
LineMoveStep
.
SW10_WatOutFixture2
))
...
@@ -449,9 +427,8 @@ namespace OnlineStore.DeviceLibrary
...
@@ -449,9 +427,8 @@ namespace OnlineStore.DeviceLibrary
if
(
SW41_MoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
None
)
&&
ProvidingEquipMap
[
204
].
runStatus
<=
LineRunStatus
.
Wait
)
if
(
SW41_MoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
None
)
&&
ProvidingEquipMap
[
204
].
runStatus
<=
LineRunStatus
.
Wait
)
{
{
if
(
IOValue
(
IO_Type
.
SW4_TrayCheck
).
Equals
(
IO_VALUE
.
HIGH
)
&&
IOValue
(
IO_Type
.
SW1_TrayCheck
).
Equals
(
IO_VALUE
.
LOW
)
&&
if
(
IOValue
(
IO_Type
.
SW4_TrayCheck
).
Equals
(
IO_VALUE
.
HIGH
)
&&
IOValue
(
IO_Type
.
SW1_TrayCheck
).
Equals
(
IO_VALUE
.
LOW
)
&&
TrayManager
.
LineCanMoveSW
(
4
)
)
TrayManager
.
LineCanMoveSW
(
4
)
&&
TrayManager
.
LineCanMoveSW
(
1
))
//TrayManager.LineCanMoveSW(4) && TrayManager.LineCanMoveSW(1))
{
{
if
(
TrayManager
.
checkWatch
(
sw41WaitWatch
,
TrayManager
.
SwTrayWaitTime
,
true
))
if
(
TrayManager
.
checkWatch
(
sw41WaitWatch
,
TrayManager
.
SwTrayWaitTime
,
true
))
{
{
...
@@ -469,15 +446,14 @@ namespace OnlineStore.DeviceLibrary
...
@@ -469,15 +446,14 @@ namespace OnlineStore.DeviceLibrary
IOValue
(
IO_Type
.
SW4_TrayCheck
).
Equals
(
IO_VALUE
.
LOW
)
&&
IOValue
(
IO_Type
.
SW4_TrayCheck
).
Equals
(
IO_VALUE
.
LOW
)
&&
IOValue
(
IO_Type
.
SW1_TrayCheck
).
Equals
(
IO_VALUE
.
LOW
)
&&
IOValue
(
IO_Type
.
SW1_TrayCheck
).
Equals
(
IO_VALUE
.
LOW
)
&&
(
DateTime
.
Now
-
lastSw4StopDownTime
).
TotalSeconds
>
2
&&
(
DateTime
.
Now
-
lastSw4StopDownTime
).
TotalSeconds
>
2
&&
TrayManager
.
LineCanMoveSW
(
4
))
TrayManager
.
LineCanMoveSW
(
4
)
&&
TrayManager
.
LineCanMoveSW
(
1
))
//TrayManager.LineCanMoveSW(4) && TrayManager.LineCanMoveSW(1))
{
{
if
(
TrayManager
.
checkWatch
(
sw41WaitWatch
,
TrayManager
.
SwTrayWaitTime
,
true
))
if
(
TrayManager
.
checkWatch
(
sw41WaitWatch
,
TrayManager
.
SwTrayWaitTime
,
true
))
{
{
SW41_MoveInfo
.
NewMove
(
LineMoveType
.
InStore
);
SW41_MoveInfo
.
NewMove
(
LineMoveType
.
InStore
);
SW41_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
SW00_Wait
);
SW41_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
SW00_Wait
);
UpateSw41TrayNum
();
UpateSw41TrayNum
();
SWLog
(
"横移轨道41:检测到SW4_StopCheck, 开始处理托盘 ,更新托盘号 ["
+
Sw41TrayNum
+
"] "
);
LogUtil
.
info
(
Name
+
"横移轨道41:检测到SW4_StopCheck, 开始处理托盘 ,更新托盘号 ["
+
Sw41TrayNum
+
"] "
);
//CylinderMove(SW41_MoveInfo, IO_Type.SW4_LocationCylinder_Up, IO_Type.SW4_LocationCylinder_Down);
//CylinderMove(SW41_MoveInfo, IO_Type.SW4_LocationCylinder_Up, IO_Type.SW4_LocationCylinder_Down);
//CylinderMove(SW41_MoveInfo, IO_Type.SW1_LocationCylinder_Up, IO_Type.SW1_LocationCylinder_Down);
//CylinderMove(SW41_MoveInfo, IO_Type.SW1_LocationCylinder_Up, IO_Type.SW1_LocationCylinder_Down);
//阻挡气缸下降500毫秒然后上升
//阻挡气缸下降500毫秒然后上升
...
@@ -499,9 +475,8 @@ namespace OnlineStore.DeviceLibrary
...
@@ -499,9 +475,8 @@ namespace OnlineStore.DeviceLibrary
{
{
//检测到阻挡夹具信号后,阻挡气缸下降,等待有夹具信号,阻挡气缸上升,
//检测到阻挡夹具信号后,阻挡气缸下降,等待有夹具信号,阻挡气缸上升,
//顶升气缸上升到位,开始流水线转动,检测到出口信号后,停止转动,顶升气缸下降,阻挡4下降,盘通过
//顶升气缸上升到位,开始流水线转动,检测到出口信号后,停止转动,顶升气缸下降,阻挡4下降,盘通过
if
(
IOValue
(
IO_Type
.
SW2_TrayCheck
).
Equals
(
IO_VALUE
.
HIGH
)
&&
IOValue
(
IO_Type
.
SW3_TrayCheck
).
Equals
(
IO_VALUE
.
LOW
)
&&
if
(
IOValue
(
IO_Type
.
SW2_TrayCheck
).
Equals
(
IO_VALUE
.
HIGH
)
&&
IOValue
(
IO_Type
.
SW3_TrayCheck
).
Equals
(
IO_VALUE
.
LOW
)
&&
TrayManager
.
LineCanMoveSW
(
2
)
)
TrayManager
.
LineCanMoveSW
(
2
)
&&
TrayManager
.
LineCanMoveSW
(
3
))
//TrayManager.LineCanMoveSW(2) && TrayManager.LineCanMoveSW(3))
{
{
if
(
TrayManager
.
checkWatch
(
sw23WaitWatch
,
TrayManager
.
SwTrayWaitTime
,
true
))
if
(
TrayManager
.
checkWatch
(
sw23WaitWatch
,
TrayManager
.
SwTrayWaitTime
,
true
))
{
{
...
@@ -518,16 +493,15 @@ namespace OnlineStore.DeviceLibrary
...
@@ -518,16 +493,15 @@ namespace OnlineStore.DeviceLibrary
IOValue
(
IO_Type
.
SW2_StopDown
).
Equals
(
IO_VALUE
.
LOW
)
&&
IOValue
(
IO_Type
.
SW2_StopDown
).
Equals
(
IO_VALUE
.
LOW
)
&&
IOValue
(
IO_Type
.
SW2_TrayCheck
).
Equals
(
IO_VALUE
.
LOW
)
&&
IOValue
(
IO_Type
.
SW2_TrayCheck
).
Equals
(
IO_VALUE
.
LOW
)
&&
IOValue
(
IO_Type
.
SW3_TrayCheck
).
Equals
(
IO_VALUE
.
LOW
)
&&
IOValue
(
IO_Type
.
SW3_TrayCheck
).
Equals
(
IO_VALUE
.
LOW
)
&&
(
DateTime
.
Now
-
lastSw2StopDownTime
).
TotalSeconds
>
2
&&
(
DateTime
.
Now
-
lastSw2StopDownTime
).
TotalSeconds
>
2
&&
TrayManager
.
LineCanMoveSW
(
2
)
)
TrayManager
.
LineCanMoveSW
(
2
)
&&
TrayManager
.
LineCanMoveSW
(
3
))
//TrayManager.LineCanMoveSW(2) && TrayManager.LineCanMoveSW(3))
{
{
if
(
TrayManager
.
checkWatch
(
sw23WaitWatch
,
TrayManager
.
SwTrayWaitTime
,
true
))
if
(
TrayManager
.
checkWatch
(
sw23WaitWatch
,
TrayManager
.
SwTrayWaitTime
,
true
))
{
{
SW23_MoveInfo
.
NewMove
(
LineMoveType
.
InStore
);
SW23_MoveInfo
.
NewMove
(
LineMoveType
.
InStore
);
SW23_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
SW00_Wait
);
SW23_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
SW00_Wait
);
UpateSw23TrayNum
();
UpateSw23TrayNum
();
SWLog
(
"横移轨道23:检测到SW2_StopCheck, 开始处理托盘 ,更新托盘号 ["
+
Sw23TrayNum
+
"] "
);
LogUtil
.
info
(
Name
+
"横移轨道23:检测到SW2_StopCheck, 开始处理托盘 ,更新托盘号 ["
+
Sw23TrayNum
+
"] "
);
//CylinderMove(SW23_MoveInfo, IO_Type.SW2_LocationCylinder_Up, IO_Type.SW2_LocationCylinder_Down);
//CylinderMove(SW23_MoveInfo, IO_Type.SW2_LocationCylinder_Up, IO_Type.SW2_LocationCylinder_Down);
//CylinderMove(SW23_MoveInfo, IO_Type.SW3_LocationCylinder_Up, IO_Type.SW3_LocationCylinder_Down);
//CylinderMove(SW23_MoveInfo, IO_Type.SW3_LocationCylinder_Up, IO_Type.SW3_LocationCylinder_Down);
//阻挡气缸下降500毫秒然后上升
//阻挡气缸下降500毫秒然后上升
...
@@ -599,7 +573,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -599,7 +573,7 @@ namespace OnlineStore.DeviceLibrary
if
(
SW41_MoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
SW00_Wait
))
if
(
SW41_MoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
SW00_Wait
))
{
{
SW41_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
SW01_StopDown
);
SW41_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
SW01_StopDown
);
SWLog
(
"横移轨道41: 阻挡气缸下降 等待 SW4_StopCheck=0"
);
LogUtil
.
info
(
Name
+
"横移轨道41: 阻挡气缸下降 等待 SW4_StopCheck=0"
);
IOMove
(
IO_Type
.
SW4_StopDown
,
IO_VALUE
.
HIGH
);
IOMove
(
IO_Type
.
SW4_StopDown
,
IO_VALUE
.
HIGH
);
SW41_MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SW4_StopCheck
,
IO_VALUE
.
LOW
));
SW41_MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SW4_StopCheck
,
IO_VALUE
.
LOW
));
//SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
//SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
...
@@ -786,7 +760,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -786,7 +760,7 @@ namespace OnlineStore.DeviceLibrary
if
(
SW23_MoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
SW00_Wait
))
if
(
SW23_MoveInfo
.
MoveStep
.
Equals
(
LineMoveStep
.
SW00_Wait
))
{
{
SW23_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
SW01_StopDown
);
SW23_MoveInfo
.
NextMoveStep
(
LineMoveStep
.
SW01_StopDown
);
SWLog
(
"横移轨道23:阻挡气缸下降 等待 SW2_StopCheck=0 "
);
LogUtil
.
info
(
Name
+
"横移轨道23:阻挡气缸下降 等待 SW2_StopCheck=0 "
);
IOMove
(
IO_Type
.
SW2_StopDown
,
IO_VALUE
.
HIGH
);
IOMove
(
IO_Type
.
SW2_StopDown
,
IO_VALUE
.
HIGH
);
SW23_MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SW2_StopCheck
,
IO_VALUE
.
LOW
));
SW23_MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SW2_StopCheck
,
IO_VALUE
.
LOW
));
// SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
// SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
...
...
source/DeviceLibrary/assemblymanager/TrayManager.cs
查看文件 @
8642956
...
@@ -182,7 +182,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -182,7 +182,7 @@ namespace OnlineStore.DeviceLibrary
{
{
return
true
;
return
true
;
}
}
if
(
equip
.
SecondMoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
None
))
if
(
swNum
.
Equals
(
2
).
Equals
(
false
)&&
equip
.
SecondMoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
None
))
{
{
return
true
;
return
true
;
}
}
...
@@ -197,7 +197,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -197,7 +197,7 @@ namespace OnlineStore.DeviceLibrary
{
{
return
true
;
return
true
;
}
}
if
(
equip
.
SecondMoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
None
))
if
(
swNum
.
Equals
(
4
).
Equals
(
false
)
&&
equip
.
SecondMoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
None
))
{
{
return
true
;
return
true
;
}
}
...
...
source/DeviceLibrary/deviceLibrary/IO/AIOBOX/AIOBOXManager.cs
查看文件 @
8642956
...
@@ -498,31 +498,35 @@ namespace OnlineStore.DeviceLibrary
...
@@ -498,31 +498,35 @@ namespace OnlineStore.DeviceLibrary
public
override
IO_VALUE
GetDIValue
(
string
ioIP
,
byte
slaveId
,
ushort
StartAddress
)
public
override
IO_VALUE
GetDIValue
(
string
ioIP
,
byte
slaveId
,
ushort
StartAddress
)
{
{
IO_VALUE
value
=
IO_VALUE
.
LOW
;
IO_VALUE
value
=
IO_VALUE
.
LOW
;
try
for
(
int
i
=
1
;
i
<=
3
;
i
++)
{
{
AIOBOX
aioBox
=
getAIO
(
ioIP
);
try
if
(
aioBox
!=
null
)
{
{
Box_Sta
sta
=
Box_Sta
.
Off
;
AIOBOX
aioBox
=
getAIO
(
ioIP
);
// Box_Addr addr = GetAddr(StartAddress);
if
(
aioBox
!=
null
)
int
index
=
StartAddress
;
if
(
DIValueMap
.
ContainsKey
(
ioIP
)
&&
DIValueMap
[
ioIP
].
Count
>
index
)
{
sta
=
DIValueMap
[
ioIP
][
index
];
}
else
{
sta
=
aioBox
.
ReadDI
(
StartAddress
);
}
if
(
sta
.
Equals
(
Box_Sta
.
On
))
{
{
value
=
IO_VALUE
.
HIGH
;
Box_Sta
sta
=
Box_Sta
.
Off
;
// Box_Addr addr = GetAddr(StartAddress);
int
index
=
StartAddress
;
if
(
DIValueMap
.
ContainsKey
(
ioIP
)
&&
DIValueMap
[
ioIP
].
Count
>
index
)
{
sta
=
DIValueMap
[
ioIP
][
index
];
}
else
{
sta
=
aioBox
.
ReadDI
(
StartAddress
);
}
if
(
sta
.
Equals
(
Box_Sta
.
On
))
{
value
=
IO_VALUE
.
HIGH
;
}
}
}
break
;
}
catch
(
Exception
ex
)
{
LogUtil
.
error
(
" 第【"
+
i
+
"】次 GetDIValue ["
+
ioIP
+
"] ["
+
StartAddress
+
"] 出错:"
,
ex
);
}
}
}
catch
(
Exception
ex
)
{
LogUtil
.
error
(
"GetDIValue ["
+
ioIP
+
"] ["
+
StartAddress
+
"] 出错:"
,
ex
);
}
}
return
value
;
return
value
;
}
}
...
...
source/DeviceLibrary/deviceLibrary/IO/IOManager.cs
查看文件 @
8642956
...
@@ -43,7 +43,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -43,7 +43,7 @@ namespace OnlineStore.DeviceLibrary
if
(
configIo
!=
null
)
if
(
configIo
!=
null
)
{
{
if
(
configIo
.
ProType
.
Equals
(
ConfigItemType
.
DI
))
if
(
configIo
.
ProType
.
Equals
(
ConfigItemType
.
DI
))
{
{
ioValue
=
instance
.
GetDIValue
(
configIo
.
IO_IP
,
configIo
.
SlaveID
,
configIo
.
GetIOAddr
());
ioValue
=
instance
.
GetDIValue
(
configIo
.
IO_IP
,
configIo
.
SlaveID
,
configIo
.
GetIOAddr
());
}
}
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论