Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
李娜
/
SO664-AssemblyLine
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit cdb831d5
由
LN
编写于
2021-09-09 10:22:59 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
扫码算法更新0908号版本dll。入料口料串进入逻辑优化。
1 个父辈
79fbb415
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
23 行增加
和
6 行删除
dll/eyemLib.dll
dll/libdecode.dll
source/AssemblyLineClient/App.config
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
source/DeviceLibrary/eyemLib.dll
source/DeviceLibrary/libdecode.dll
source/DeviceLibrary/model/StoreStep.cs
dll/eyemLib.dll
查看文件 @
cdb831d
此文件类型无法预览
dll/libdecode.dll
查看文件 @
cdb831d
此文件类型无法预览
source/AssemblyLineClient/App.config
查看文件 @
cdb831d
...
@@ -69,6 +69,7 @@
...
@@ -69,6 +69,7 @@
<
appender
name
=
"RollingLogFileAppender"
type
=
"log4net.Appender.RollingFileAppender"
>
<
appender
name
=
"RollingLogFileAppender"
type
=
"log4net.Appender.RollingFileAppender"
>
<
file
value
=
"logs/Line-SO664.log"
/>
<
file
value
=
"logs/Line-SO664.log"
/>
<
param
name
=
"Encoding"
value
=
"UTF-8"
/>
<
param
name
=
"Encoding"
value
=
"UTF-8"
/>
<
param
name
=
"maxSizeRollBackups"
value
=
"100"
/>
<
appendToFile
value
=
"true"
/>
<
appendToFile
value
=
"true"
/>
<
rollingStyle
value
=
"Date"
/>
<
rollingStyle
value
=
"Date"
/>
<
datePattern
value
=
"yyyy-MM-dd"
/>
<
datePattern
value
=
"yyyy-MM-dd"
/>
...
@@ -79,6 +80,7 @@
...
@@ -79,6 +80,7 @@
<
appender
name
=
"TheRFID"
type
=
"log4net.Appender.RollingFileAppender"
>
<
appender
name
=
"TheRFID"
type
=
"log4net.Appender.RollingFileAppender"
>
<
file
value
=
"logs/rfid/TheRFID-line.log"
/>
<
file
value
=
"logs/rfid/TheRFID-line.log"
/>
<
param
name
=
"Encoding"
value
=
"UTF-8"
/>
<
param
name
=
"Encoding"
value
=
"UTF-8"
/>
<
param
name
=
"maxSizeRollBackups"
value
=
"3"
/>
<
appendToFile
value
=
"true"
/>
<
appendToFile
value
=
"true"
/>
<
rollingStyle
value
=
"Date"
/>
<
rollingStyle
value
=
"Date"
/>
<
datePattern
value
=
"yyyy-MM-dd"
/>
<
datePattern
value
=
"yyyy-MM-dd"
/>
...
@@ -89,6 +91,7 @@
...
@@ -89,6 +91,7 @@
<
appender
name
=
"AIOBOX"
type
=
"log4net.Appender.RollingFileAppender"
>
<
appender
name
=
"AIOBOX"
type
=
"log4net.Appender.RollingFileAppender"
>
<
file
value
=
"logs/aio/AIOBOX-line.log"
/>
<
file
value
=
"logs/aio/AIOBOX-line.log"
/>
<
param
name
=
"Encoding"
value
=
"UTF-8"
/>
<
param
name
=
"Encoding"
value
=
"UTF-8"
/>
<
param
name
=
"maxSizeRollBackups"
value
=
"100"
/>
<
appendToFile
value
=
"true"
/>
<
appendToFile
value
=
"true"
/>
<
rollingStyle
value
=
"Date"
/>
<
rollingStyle
value
=
"Date"
/>
<
datePattern
value
=
"yyyy-MM-dd"
/>
<
datePattern
value
=
"yyyy-MM-dd"
/>
...
@@ -99,6 +102,7 @@
...
@@ -99,6 +102,7 @@
<
appender
name
=
"RunLog"
type
=
"log4net.Appender.RollingFileAppender"
>
<
appender
name
=
"RunLog"
type
=
"log4net.Appender.RollingFileAppender"
>
<
file
value
=
"logs/log/RunLog-line.log"
/>
<
file
value
=
"logs/log/RunLog-line.log"
/>
<
param
name
=
"Encoding"
value
=
"UTF-8"
/>
<
param
name
=
"Encoding"
value
=
"UTF-8"
/>
<
param
name
=
"maxSizeRollBackups"
value
=
"100"
/>
<
appendToFile
value
=
"true"
/>
<
appendToFile
value
=
"true"
/>
<
rollingStyle
value
=
"Date"
/>
<
rollingStyle
value
=
"Date"
/>
<
datePattern
value
=
"yyyy-MM-dd"
/>
<
datePattern
value
=
"yyyy-MM-dd"
/>
...
@@ -111,7 +115,7 @@
...
@@ -111,7 +115,7 @@
<
appender
-
ref
ref
=
"RollingLogFileAppender"
/>
<
appender
-
ref
ref
=
"RollingLogFileAppender"
/>
</
logger
>
</
logger
>
<
logger
name
=
"TheRFID"
>
<
logger
name
=
"TheRFID"
>
<
level
value
=
"
Info
"
/>
<
level
value
=
"
Error
"
/>
<
appender
-
ref
ref
=
"TheRFID"
/>
<
appender
-
ref
ref
=
"TheRFID"
/>
</
logger
>
</
logger
>
<
logger
name
=
"AIOBOX"
>
<
logger
name
=
"AIOBOX"
>
...
...
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
查看文件 @
cdb831d
...
@@ -173,26 +173,26 @@ namespace OnlineStore.DeviceLibrary
...
@@ -173,26 +173,26 @@ namespace OnlineStore.DeviceLibrary
else
if
(
IOValue
(
IO_Type
.
SL_Stop_Check
).
Equals
(
IO_VALUE
.
HIGH
))
else
if
(
IOValue
(
IO_Type
.
SL_Stop_Check
).
Equals
(
IO_VALUE
.
HIGH
))
{
{
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FI_05_LineStart
);
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FI_05_LineStart
);
InLog
(
"入料检测: "
+
MoveInfo
.
SLog
+
" 阻挡工位有新料架,清理缓存料架RFID ,进料阻挡下降500,缓冲阻挡前进1000,流水线转动
1
000"
);
InLog
(
"入料检测: "
+
MoveInfo
.
SLog
+
" 阻挡工位有新料架,清理缓存料架RFID ,进料阻挡下降500,缓冲阻挡前进1000,流水线转动
3
000"
);
UpdateLastShelfID
();
UpdateLastShelfID
();
IOMove
(
IO_Type
.
SL_Entry_StopDown
,
IO_VALUE
.
HIGH
,
1500
);
//进料阻挡下降
IOMove
(
IO_Type
.
SL_Entry_StopDown
,
IO_VALUE
.
HIGH
,
1500
);
//进料阻挡下降
IOMove
(
IO_Type
.
SL_Buffer_StopDown
,
IO_VALUE
.
HIGH
,
1000
);
//缓冲阻挡前进1000
IOMove
(
IO_Type
.
SL_Buffer_StopDown
,
IO_VALUE
.
HIGH
,
1000
);
//缓冲阻挡前进1000
// IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);//缓冲阻挡下降
// IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);//缓冲阻挡下降
IOMove
(
IO_Type
.
SL_Line_Run
,
IO_VALUE
.
HIGH
);
IOMove
(
IO_Type
.
SL_Line_Run
,
IO_VALUE
.
HIGH
);
//等待指定时间
//等待指定时间
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
1
000
));
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
3
000
));
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
));
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_05_LineStart
);
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FI_05_LineStart
);
InLog
(
"入料检测: "
+
MoveInfo
.
SLog
+
" 进料口有新料架,进料阻挡上升,缓冲阻挡前进1000,流水线转动
1
000"
);
InLog
(
"入料检测: "
+
MoveInfo
.
SLog
+
" 进料口有新料架,进料阻挡上升,缓冲阻挡前进1000,流水线转动
3
000"
);
IOMove
(
IO_Type
.
SL_Entry_StopDown
,
IO_VALUE
.
LOW
);
//进料阻挡上升
IOMove
(
IO_Type
.
SL_Entry_StopDown
,
IO_VALUE
.
LOW
);
//进料阻挡上升
IOMove
(
IO_Type
.
SL_Buffer_StopDown
,
IO_VALUE
.
HIGH
,
1000
);
//缓冲阻挡前进1000
IOMove
(
IO_Type
.
SL_Buffer_StopDown
,
IO_VALUE
.
HIGH
,
1000
);
//缓冲阻挡前进1000
IOMove
(
IO_Type
.
SL_Line_Run
,
IO_VALUE
.
HIGH
);
IOMove
(
IO_Type
.
SL_Line_Run
,
IO_VALUE
.
HIGH
);
//等待指定时间
//等待指定时间
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
1
000
));
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
3
000
));
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
));
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SL_Line_Run
,
IO_VALUE
.
HIGH
));
}
}
...
@@ -245,7 +245,14 @@ namespace OnlineStore.DeviceLibrary
...
@@ -245,7 +245,14 @@ namespace OnlineStore.DeviceLibrary
}
}
else
if
(
MoveInfo
.
IsStep
(
LineMoveStep
.
FI_05_LineStart
))
else
if
(
MoveInfo
.
IsStep
(
LineMoveStep
.
FI_05_LineStart
))
{
{
LineInStoreProcess
();
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FI_05_WaitTime
);
IOMove
(
IO_Type
.
SL_Line_Run
,
IO_VALUE
.
HIGH
);
InLog
(
"料架入库"
+
MoveInfo
.
SLog
+
":流水线再转动2000等待信号稳定"
);
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
2000
));
}
else
if
(
MoveInfo
.
IsStep
(
LineMoveStep
.
FI_05_WaitTime
))
{
LineInStoreProcess
();
}
}
else
if
(
MoveInfo
.
IsStep
(
LineMoveStep
.
FI_06_WaitTime
))
else
if
(
MoveInfo
.
IsStep
(
LineMoveStep
.
FI_06_WaitTime
))
{
{
...
...
source/DeviceLibrary/eyemLib.dll
查看文件 @
cdb831d
此文件类型无法预览
source/DeviceLibrary/libdecode.dll
查看文件 @
cdb831d
此文件类型无法预览
source/DeviceLibrary/model/StoreStep.cs
查看文件 @
cdb831d
...
@@ -592,6 +592,12 @@ namespace OnlineStore.DeviceLibrary
...
@@ -592,6 +592,12 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
/// </summary>
[
Description
(
"入料_阻挡工位或进料口有新料架,相关阻挡上升,流水线转动1000"
)]
[
Description
(
"入料_阻挡工位或进料口有新料架,相关阻挡上升,流水线转动1000"
)]
FI_05_LineStart
,
FI_05_LineStart
,
/// <summary>
/// 入口流水线转动,等待入料检测信号消失
/// </summary>
[
Description
(
"入料_流水线转动2秒等待信号稳定再检测"
)]
FI_05_WaitTime
,
/// <summary>
/// <summary>
/// 入口流水线转动,等待定位工位信号稳定1秒
/// 入口流水线转动,等待定位工位信号稳定1秒
/// </summary>
/// </summary>
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论