Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
李娜
/
SO664-AssemblyLine
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit f09113a0
由
LN
编写于
2021-03-04 09:23:23 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
超时时间修改
1 个父辈
747bcc3c
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
9 行增加
和
9 行删除
source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs
source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs
source/DeviceLibrary/assemblyLine/HY/HY_OutLine.cs
source/DeviceLibrary/assemblyLine/LineBean_T3-C1.cs
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
source/DeviceLibrary/assemblymanager/TrayManager.cs
source/DeviceLibrary/libdmtx.dll
source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs
查看文件 @
f09113a
...
@@ -219,7 +219,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -219,7 +219,7 @@ namespace OnlineStore.DeviceLibrary
private
void
CheckFixture
()
private
void
CheckFixture
()
{
{
if
(
Monitor
.
TryEnter
(
lockObj
,
100
))
if
(
Monitor
.
TryEnter
(
lockObj
,
TrayManager
.
mTimeOut
))
{
{
try
try
{
{
...
@@ -1238,7 +1238,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -1238,7 +1238,7 @@ namespace OnlineStore.DeviceLibrary
{
{
if
(
DeviceID
.
Equals
(
208
))
if
(
DeviceID
.
Equals
(
208
))
{
{
if
(
Monitor
.
TryEnter
(
lockObj
,
100
))
if
(
Monitor
.
TryEnter
(
lockObj
,
TrayManager
.
mTimeOut
))
{
{
try
try
{
{
...
@@ -1279,7 +1279,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -1279,7 +1279,7 @@ namespace OnlineStore.DeviceLibrary
}
}
internal
bool
HYOut51_WaitFree
()
internal
bool
HYOut51_WaitFree
()
{
{
if
(
Monitor
.
TryEnter
(
lockObj
,
100
))
if
(
Monitor
.
TryEnter
(
lockObj
,
TrayManager
.
mTimeOut
))
{
{
try
try
{
{
...
...
source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs
查看文件 @
f09113a
...
@@ -182,7 +182,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -182,7 +182,7 @@ namespace OnlineStore.DeviceLibrary
private
object
lockObj
=
""
;
private
object
lockObj
=
""
;
private
void
CheckFixture
()
private
void
CheckFixture
()
{
{
if
(
Monitor
.
TryEnter
(
lockObj
,
100
))
if
(
Monitor
.
TryEnter
(
lockObj
,
TrayManager
.
mTimeOut
))
{
{
try
try
{
{
...
...
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs
查看文件 @
f09113a
...
@@ -20,7 +20,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -20,7 +20,7 @@ namespace OnlineStore.DeviceLibrary
private
object
lockObj
=
""
;
private
object
lockObj
=
""
;
private
void
CheckFixture
()
private
void
CheckFixture
()
{
{
if
(
Monitor
.
TryEnter
(
lockObj
,
100
))
if
(
Monitor
.
TryEnter
(
lockObj
,
TrayManager
.
mTimeOut
))
{
{
try
try
{
{
...
...
source/DeviceLibrary/assemblyLine/HY/HY_OutLine.cs
查看文件 @
f09113a
...
@@ -150,7 +150,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -150,7 +150,7 @@ namespace OnlineStore.DeviceLibrary
private
object
lockObj
=
""
;
private
object
lockObj
=
""
;
private
void
CheckFixture
()
private
void
CheckFixture
()
{
{
if
(
Monitor
.
TryEnter
(
lockObj
,
100
))
if
(
Monitor
.
TryEnter
(
lockObj
,
TrayManager
.
mTimeOut
))
{
{
try
try
{
{
...
...
source/DeviceLibrary/assemblyLine/LineBean_T3-C1.cs
查看文件 @
f09113a
...
@@ -77,7 +77,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -77,7 +77,7 @@ namespace OnlineStore.DeviceLibrary
private
object
lockObj
=
""
;
private
object
lockObj
=
""
;
private
void
T3C1_CheckFixture
()
private
void
T3C1_CheckFixture
()
{
{
if
(
Monitor
.
TryEnter
(
lockObj
,
100
))
if
(
Monitor
.
TryEnter
(
lockObj
,
TrayManager
.
mTimeOut
))
{
{
try
try
{
{
...
...
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
查看文件 @
f09113a
...
@@ -687,7 +687,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -687,7 +687,7 @@ namespace OnlineStore.DeviceLibrary
private
object
lockObj
=
""
;
private
object
lockObj
=
""
;
private
void
CheckFixture
()
private
void
CheckFixture
()
{
{
if
(
Monitor
.
TryEnter
(
lockObj
,
100
))
if
(
Monitor
.
TryEnter
(
lockObj
,
TrayManager
.
mTimeOut
))
{
{
try
try
{
{
...
...
source/DeviceLibrary/assemblymanager/TrayManager.cs
查看文件 @
f09113a
...
@@ -15,7 +15,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -15,7 +15,7 @@ namespace OnlineStore.DeviceLibrary
{
{
public
class
TrayManager
public
class
TrayManager
{
{
public
static
int
mTimeOut
=
20
;
public
static
int
StopDTime
=
2000
;
public
static
int
StopDTime
=
2000
;
public
static
bool
DisTraySave
=
ConfigAppSettings
.
GetIntValue
(
Setting_Init
.
DisTraySave
).
Equals
(
1
);
public
static
bool
DisTraySave
=
ConfigAppSettings
.
GetIntValue
(
Setting_Init
.
DisTraySave
).
Equals
(
1
);
...
...
source/DeviceLibrary/libdmtx.dll
查看文件 @
f09113a
此文件类型无法预览
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论