Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
RC1250-ACPackingStore
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit b331ffd9
由
LN
编写于
2020-03-08 18:10:50 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
出库时可以手动拉出料架
1 个父辈
50de5b93
显示空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
14 行增加
和
15 行删除
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean.cs
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Partial.cs
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Shelf.cs
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean.cs
查看文件 @
b331ffd
...
@@ -521,7 +521,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -521,7 +521,7 @@ namespace OnlineStore.DeviceLibrary
if
(
InProcess
)
if
(
InProcess
)
{
{
//TimeSpan span = DateTime.Now - preProcessTime;
//TimeSpan span = DateTime.Now - preProcessTime;
if
(
stopwatch
.
Elapsed
.
Total
Minutes
<
1
)
if
(
stopwatch
.
Elapsed
.
Total
Seconds
<
10
)
{
{
return
;
return
;
}
}
...
...
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Partial.cs
查看文件 @
b331ffd
...
@@ -132,14 +132,14 @@ namespace OnlineStore.DeviceLibrary
...
@@ -132,14 +132,14 @@ namespace OnlineStore.DeviceLibrary
wait
.
IsEnd
=
true
;
wait
.
IsEnd
=
true
;
}
}
}
}
//else if (wait.AgvAction.Equals((int)ClientAction.FinishLea
ve))
else
if
(
wait
.
AgvAction
.
Equals
((
int
)
ClientAction
.
Arrive
)&&
MoveInfo
.
MoveStep
.
Equals
(
StoreMoveStep
.
BS_03_WaitArri
ve
))
//
{
{
//
if (IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.LOW) && IOValue(IO_Type.LineIn_Check).Equals(IO_VALUE.LOW))
if
(
IOValue
(
IO_Type
.
LineTake_Check
).
Equals
(
IO_VALUE
.
LOW
)
&&
IOValue
(
IO_Type
.
LineIn_Check
).
Equals
(
IO_VALUE
.
LOW
))
//
{
{
// LogInfo("等待agv离开FinishOut
,检测到 LineTake_Check和LineIn_Check都没有信号,结束等待");
LogInfo
(
"BS_03_WaitArrive 等待agv到达Arrive
,检测到 LineTake_Check和LineIn_Check都没有信号,结束等待"
);
//
wait.IsEnd = true;
wait
.
IsEnd
=
true
;
//
}
}
//
}
}
}
}
}
}
else
if
(
wait
.
WaitType
.
Equals
(
WaitEnum
.
W011_DoorCloseEvent
))
else
if
(
wait
.
WaitType
.
Equals
(
WaitEnum
.
W011_DoorCloseEvent
))
...
...
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Shelf.cs
查看文件 @
b331ffd
...
@@ -261,12 +261,11 @@ namespace OnlineStore.DeviceLibrary
...
@@ -261,12 +261,11 @@ namespace OnlineStore.DeviceLibrary
{
{
MoveInfo
.
NextMoveStep
(
StoreMoveStep
.
BS_03_WaitArrive
);
MoveInfo
.
NextMoveStep
(
StoreMoveStep
.
BS_03_WaitArrive
);
MoveInfo
.
TimeOutSeconds
=
600
;
MoveInfo
.
TimeOutSeconds
=
600
;
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
30000
));
//MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(30000));
InOutStoreLog
(
moveName
+
MoveInfo
.
SLog
+
":再次调用 NeedLeave["
+
mark
+
"]["
+
CurrShelfID
+
"],等待Agv "
+
Config
.
AgvNodeName
+
" Arrive ,最多等待1200秒"
);
AgvClient
.
SetStatus
(
Config
.
AgvNodeName
,
mark
,
CurrShelfID
,
ClientAction
.
NeedLeave
,
ClientLevel
.
Low
,
true
);
//等待agv到达
//等待agv到达
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitAgvAction
((
int
)
ClientAction
.
Arrive
));
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitAgvAction
((
int
)
ClientAction
.
Arrive
));
MoveInfo
.
OneWaitCanEndStep
=
true
;
InOutStoreLog
(
moveName
+
MoveInfo
.
SLog
+
":再次调用 NeedLeave["
+
mark
+
"]["
+
CurrShelfID
+
"],等待Agv "
+
Config
.
AgvNodeName
+
" Arrive ,最多等待1200秒"
);
AgvClient
.
SetStatus
(
Config
.
AgvNodeName
,
mark
,
CurrShelfID
,
ClientAction
.
NeedLeave
,
ClientLevel
.
Low
,
true
);
}
}
else
if
(
MoveInfo
.
MoveStep
.
Equals
(
StoreMoveStep
.
BS_03_WaitArrive
))
else
if
(
MoveInfo
.
MoveStep
.
Equals
(
StoreMoveStep
.
BS_03_WaitArrive
))
{
{
...
@@ -287,7 +286,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -287,7 +286,7 @@ namespace OnlineStore.DeviceLibrary
//如果agv未到达,直接结束
//如果agv未到达,直接结束
MoveEndToRuningStatus
();
MoveEndToRuningStatus
();
//EmprtShelfList = new ConcurrentQueue<string>();
//EmprtShelfList = new ConcurrentQueue<string>();
InOutStoreLog
(
moveName
+
MoveInfo
.
SLog
+
":等待Agv "
+
Config
.
AgvNodeName
+
" Arrive超时,检测不到料架信号,认为料架已手动离开"
);
InOutStoreLog
(
moveName
+
MoveInfo
.
SLog
+
":等待Agv "
+
Config
.
AgvNodeName
+
" Arrive超时,检测不到料架信号,认为料架已手动离开
,出库结束
"
);
}
}
else
else
{
{
...
@@ -325,9 +324,9 @@ namespace OnlineStore.DeviceLibrary
...
@@ -325,9 +324,9 @@ namespace OnlineStore.DeviceLibrary
MoveInfo
.
NextMoveStep
(
StoreMoveStep
.
BS_08_WaitInLineSingle
);
MoveInfo
.
NextMoveStep
(
StoreMoveStep
.
BS_08_WaitInLineSingle
);
InOutStoreLog
(
moveName
+
MoveInfo
.
SLog
+
":等待 入料口有信号,最多等待30秒"
);
InOutStoreLog
(
moveName
+
MoveInfo
.
SLog
+
":等待 入料口有信号,最多等待30秒"
);
// MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineTake_Check, IO_VALUE.LOW));
// MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LineTake_Check, IO_VALUE.LOW));
MoveInfo
.
OneWaitCanEndStep
=
true
;
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
30000
));
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
30000
));
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
LineIn_Check
,
IO_VALUE
.
HIGH
));
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
LineIn_Check
,
IO_VALUE
.
HIGH
));
MoveInfo
.
OneWaitCanEndStep
=
true
;
}
}
else
if
(
MoveInfo
.
MoveStep
.
Equals
(
StoreMoveStep
.
BS_08_WaitInLineSingle
))
else
if
(
MoveInfo
.
MoveStep
.
Equals
(
StoreMoveStep
.
BS_08_WaitInLineSingle
))
{
{
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论