Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
李娜
/
SO664-AssemblyLine
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 859314a0
由
LN
编写于
2023-08-29 14:02:34 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
HY12如果10秒未处理托盘,HY13工单料直接横移
1 个父辈
fb6c05d4
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
89 行增加
和
1 行删除
source/AssemblyLineClient/FrmLineStore.cs
source/AssemblyLineClient/记录.txt
source/DeviceLibrary/assemblyLine/HY/HYEquipBase.cs
source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor.cs
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs
source/AssemblyLineClient/FrmLineStore.cs
查看文件 @
859314a
...
...
@@ -1280,9 +1280,28 @@ namespace OnlineStore.AssemblyLine
LineManager
.
Line
.
HYEquipMap
[
id
].
IsDebug
=
isD
;
}
}
private
void
Test
()
{
RemoteDecodeHelper
.
RemoteDecodeParam
remoteDecodeParam
=
new
RemoteDecodeHelper
.
RemoteDecodeParam
{
codeTypeList
=
CodeManager
.
allCodeTypeList
.
ToArray
(),
codeCount
=
3
,
timeout
=
3000
};
Bitmap
bitmap
=
new
Bitmap
(
"test.bmp"
);
List
<
CodeInfo
>
LastCodeList
=
RemoteDecodeHelper
.
DecodeRequest
(
bitmap
,
remoteDecodeParam
);
List
<
string
>
test
=
new
List
<
string
>();
foreach
(
CodeInfo
codeInfo
in
LastCodeList
)
{
test
.
Add
(
codeInfo
.
CodeStr
);
}
string
codeMsg
=
CodeManager
.
ProcessCode
(
test
);
bitmap
.
Dispose
();
MessageBox
.
Show
(
"test.bmp:\r\n"
+
codeMsg
,
"test.bmp扫码测试结果"
,
MessageBoxButtons
.
OK
);
}
private
void
chbDisMove_CheckedChanged
(
object
sender
,
EventArgs
e
)
{
Test
();
if
(!
LoadOk
)
{
return
;
...
...
source/AssemblyLineClient/记录.txt
查看文件 @
859314a
20230825
HY03顶升和前阻挡下降慢问题。
HY12如果10秒未处理托盘,HY13工单料直接横移。
20230811
1.HY15处,紧急料一盘去出料四,一盘去HY17
...
...
source/DeviceLibrary/assemblyLine/HY/HYEquipBase.cs
查看文件 @
859314a
...
...
@@ -187,6 +187,10 @@ namespace OnlineStore.DeviceLibrary
{
}
internal
virtual
bool
noTrayTime
(
int
targetMs
)
{
return
false
;
}
internal
virtual
bool
CanStartMove
()
{
if
(
MoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
None
)
&&
runStatus
.
Equals
(
LineRunStatus
.
Runing
))
...
...
source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs
查看文件 @
859314a
...
...
@@ -1464,6 +1464,12 @@ namespace OnlineStore.DeviceLibrary
{
return
false
;
}
if
(
HY12NoTray
())
{
LogInfo
(
" C1->出料线:工单料,HY12空闲10秒"
+
LastValue
+
","
+
""
+
param
.
ToStr
());
MoveInfo
.
MoveParam
=
param
;
return
true
;
}
if
(
LastValue
.
Equals
(
0
))
{
LogInfo
(
" C1->出料线:工单料,随意放"
+
LastValue
+
","
+
""
+
param
.
ToStr
());
...
...
@@ -1498,6 +1504,18 @@ namespace OnlineStore.DeviceLibrary
return
false
;
}
private
bool
HY12NoTray
()
{
//Hy12已经10秒钟未处理托盘
HYEquipBase
hy12
=
LineManager
.
Line
.
HYEquipMap
[
212
];
if
(
hy12
.
noTrayTime
(
10000
))
{
return
true
;
}
return
false
;
}
private
bool
LeftLinePriority
()
{
if
(!
LineManager
.
DisLeftOutLine
)
...
...
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor.cs
查看文件 @
859314a
...
...
@@ -197,6 +197,8 @@ namespace OnlineStore.DeviceLibrary
{
CheckAxisAlarm
(
UpdownAxis
);
}
HasTrayProcess
();
}
}
}
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs
查看文件 @
859314a
...
...
@@ -18,6 +18,43 @@ namespace OnlineStore.DeviceLibrary
private
Stopwatch
trayCheckWait
=
new
Stopwatch
();
private
Stopwatch
trayCheckLowWait
=
new
Stopwatch
();
private
object
lockObj
=
""
;
//没有处理托盘计时器
private
Stopwatch
noTrayProcessWatch
=
new
Stopwatch
();
private
void
HasTrayProcess
()
{
try
{
if
(
SecondMoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
None
)&&
IOValue
(
IO_Type
.
HY_FrontStopCheck
).
Equals
(
IO_VALUE
.
LOW
))
{
//无托盘开始计时
CheckStopWatch
(
noTrayProcessWatch
,
3000000
,
false
);
}
else
{
noTrayProcessWatch
.
Stop
();
}
}
catch
(
Exception
ex
)
{
LogUtil
.
error
(
"HasTrayProcess 出错:"
+
ex
.
ToString
());
}
}
internal
override
bool
noTrayTime
(
int
targetMs
)
{
if
(
noTrayProcessWatch
.
IsRunning
)
{
if
(
noTrayProcessWatch
.
ElapsedMilliseconds
>=
targetMs
)
{
return
true
;
}
}
return
false
;
}
private
void
CheckFixture
()
{
if
(
Monitor
.
TryEnter
(
lockObj
,
TrayManager
.
mTimeOut
))
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论