Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
李娜
/
SO664-AssemblyLine
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 42a0eb1f
由
LN
编写于
2021-01-12 15:59:43 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
增加暂停抓料复选框
1 个父辈
038c4e47
显示空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
74 行增加
和
27 行删除
source/AssemblyLineClient/FrmLineStore.Designer.cs
source/AssemblyLineClient/FrmLineStore.cs
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
source/DeviceLibrary/assemblymanager/ALineManager.cs
source/AssemblyLineClient/FrmLineStore.Designer.cs
查看文件 @
42a0eb1
...
@@ -33,6 +33,7 @@
...
@@ -33,6 +33,7 @@
this
.
tabControl1
=
new
System
.
Windows
.
Forms
.
TabControl
();
this
.
tabControl1
=
new
System
.
Windows
.
Forms
.
TabControl
();
this
.
tabPage1
=
new
System
.
Windows
.
Forms
.
TabPage
();
this
.
tabPage1
=
new
System
.
Windows
.
Forms
.
TabPage
();
this
.
groupBox2
=
new
System
.
Windows
.
Forms
.
GroupBox
();
this
.
groupBox2
=
new
System
.
Windows
.
Forms
.
GroupBox
();
this
.
chbDisGetWare
=
new
System
.
Windows
.
Forms
.
CheckBox
();
this
.
chbTrayTest
=
new
System
.
Windows
.
Forms
.
CheckBox
();
this
.
chbTrayTest
=
new
System
.
Windows
.
Forms
.
CheckBox
();
this
.
chbDisMove
=
new
System
.
Windows
.
Forms
.
CheckBox
();
this
.
chbDisMove
=
new
System
.
Windows
.
Forms
.
CheckBox
();
this
.
lblCardMsg
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
lblCardMsg
=
new
System
.
Windows
.
Forms
.
Label
();
...
@@ -219,6 +220,7 @@
...
@@ -219,6 +220,7 @@
//
//
this
.
groupBox2
.
Anchor
=
((
System
.
Windows
.
Forms
.
AnchorStyles
)(((
System
.
Windows
.
Forms
.
AnchorStyles
.
Top
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Bottom
)
this
.
groupBox2
.
Anchor
=
((
System
.
Windows
.
Forms
.
AnchorStyles
)(((
System
.
Windows
.
Forms
.
AnchorStyles
.
Top
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Bottom
)
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Left
)));
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Left
)));
this
.
groupBox2
.
Controls
.
Add
(
this
.
chbDisGetWare
);
this
.
groupBox2
.
Controls
.
Add
(
this
.
chbTrayTest
);
this
.
groupBox2
.
Controls
.
Add
(
this
.
chbTrayTest
);
this
.
groupBox2
.
Controls
.
Add
(
this
.
chbDisMove
);
this
.
groupBox2
.
Controls
.
Add
(
this
.
chbDisMove
);
this
.
groupBox2
.
Controls
.
Add
(
this
.
lblCardMsg
);
this
.
groupBox2
.
Controls
.
Add
(
this
.
lblCardMsg
);
...
@@ -227,27 +229,40 @@
...
@@ -227,27 +229,40 @@
this
.
groupBox2
.
Controls
.
Add
(
this
.
chbLeftDis
);
this
.
groupBox2
.
Controls
.
Add
(
this
.
chbLeftDis
);
this
.
groupBox2
.
Controls
.
Add
(
this
.
chbDisSL
);
this
.
groupBox2
.
Controls
.
Add
(
this
.
chbDisSL
);
this
.
groupBox2
.
Controls
.
Add
(
this
.
chbRightDis
);
this
.
groupBox2
.
Controls
.
Add
(
this
.
chbRightDis
);
this
.
groupBox2
.
Location
=
new
System
.
Drawing
.
Point
(
10
,
3
);
this
.
groupBox2
.
Location
=
new
System
.
Drawing
.
Point
(
5
,
3
);
this
.
groupBox2
.
Name
=
"groupBox2"
;
this
.
groupBox2
.
Name
=
"groupBox2"
;
this
.
groupBox2
.
Size
=
new
System
.
Drawing
.
Size
(
3
02
,
630
);
this
.
groupBox2
.
Size
=
new
System
.
Drawing
.
Size
(
3
10
,
630
);
this
.
groupBox2
.
TabIndex
=
200
;
this
.
groupBox2
.
TabIndex
=
200
;
this
.
groupBox2
.
TabStop
=
false
;
this
.
groupBox2
.
TabStop
=
false
;
//
//
// chbDisGetWare
//
this
.
chbDisGetWare
.
AutoSize
=
true
;
this
.
chbDisGetWare
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
12F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
chbDisGetWare
.
Location
=
new
System
.
Drawing
.
Point
(
11
,
24
);
this
.
chbDisGetWare
.
Name
=
"chbDisGetWare"
;
this
.
chbDisGetWare
.
Size
=
new
System
.
Drawing
.
Size
(
173
,
25
);
this
.
chbDisGetWare
.
TabIndex
=
204
;
this
.
chbDisGetWare
.
Text
=
"暂停抓料,准备更新"
;
this
.
chbDisGetWare
.
UseVisualStyleBackColor
=
true
;
this
.
chbDisGetWare
.
CheckedChanged
+=
new
System
.
EventHandler
(
this
.
chbDisGetWare_CheckedChanged
);
//
// chbTrayTest
// chbTrayTest
//
//
this
.
chbTrayTest
.
AutoSize
=
true
;
this
.
chbTrayTest
.
AutoSize
=
true
;
this
.
chbTrayTest
.
Location
=
new
System
.
Drawing
.
Point
(
9
,
22
);
this
.
chbTrayTest
.
Location
=
new
System
.
Drawing
.
Point
(
11
,
60
);
this
.
chbTrayTest
.
Name
=
"chbTrayTest"
;
this
.
chbTrayTest
.
Name
=
"chbTrayTest"
;
this
.
chbTrayTest
.
Size
=
new
System
.
Drawing
.
Size
(
168
,
24
);
this
.
chbTrayTest
.
Size
=
new
System
.
Drawing
.
Size
(
168
,
24
);
this
.
chbTrayTest
.
TabIndex
=
203
;
this
.
chbTrayTest
.
TabIndex
=
203
;
this
.
chbTrayTest
.
Text
=
"托盘横移到出料线测试"
;
this
.
chbTrayTest
.
Text
=
"托盘横移到出料线测试"
;
this
.
chbTrayTest
.
UseVisualStyleBackColor
=
true
;
this
.
chbTrayTest
.
UseVisualStyleBackColor
=
true
;
this
.
chbTrayTest
.
Visible
=
false
;
this
.
chbTrayTest
.
CheckedChanged
+=
new
System
.
EventHandler
(
this
.
chbTrayTest_CheckedChanged
);
this
.
chbTrayTest
.
CheckedChanged
+=
new
System
.
EventHandler
(
this
.
chbTrayTest_CheckedChanged
);
//
//
// chbDisMove
// chbDisMove
//
//
this
.
chbDisMove
.
AutoSize
=
true
;
this
.
chbDisMove
.
AutoSize
=
true
;
this
.
chbDisMove
.
Location
=
new
System
.
Drawing
.
Point
(
9
,
222
);
this
.
chbDisMove
.
Location
=
new
System
.
Drawing
.
Point
(
11
,
240
);
this
.
chbDisMove
.
Name
=
"chbDisMove"
;
this
.
chbDisMove
.
Name
=
"chbDisMove"
;
this
.
chbDisMove
.
Size
=
new
System
.
Drawing
.
Size
(
144
,
24
);
this
.
chbDisMove
.
Size
=
new
System
.
Drawing
.
Size
(
144
,
24
);
this
.
chbDisMove
.
TabIndex
=
202
;
this
.
chbDisMove
.
TabIndex
=
202
;
...
@@ -265,7 +280,7 @@
...
@@ -265,7 +280,7 @@
// chbDisHy
// chbDisHy
//
//
this
.
chbDisHy
.
AutoSize
=
true
;
this
.
chbDisHy
.
AutoSize
=
true
;
this
.
chbDisHy
.
Location
=
new
System
.
Drawing
.
Point
(
9
,
187
);
this
.
chbDisHy
.
Location
=
new
System
.
Drawing
.
Point
(
11
,
205
);
this
.
chbDisHy
.
Name
=
"chbDisHy"
;
this
.
chbDisHy
.
Name
=
"chbDisHy"
;
this
.
chbDisHy
.
Size
=
new
System
.
Drawing
.
Size
(
194
,
24
);
this
.
chbDisHy
.
Size
=
new
System
.
Drawing
.
Size
(
194
,
24
);
this
.
chbDisHy
.
TabIndex
=
201
;
this
.
chbDisHy
.
TabIndex
=
201
;
...
@@ -287,7 +302,7 @@
...
@@ -287,7 +302,7 @@
// chbLeftDis
// chbLeftDis
//
//
this
.
chbLeftDis
.
AutoSize
=
true
;
this
.
chbLeftDis
.
AutoSize
=
true
;
this
.
chbLeftDis
.
Location
=
new
System
.
Drawing
.
Point
(
9
,
67
);
this
.
chbLeftDis
.
Location
=
new
System
.
Drawing
.
Point
(
11
,
93
);
this
.
chbLeftDis
.
Name
=
"chbLeftDis"
;
this
.
chbLeftDis
.
Name
=
"chbLeftDis"
;
this
.
chbLeftDis
.
Size
=
new
System
.
Drawing
.
Size
(
277
,
24
);
this
.
chbLeftDis
.
Size
=
new
System
.
Drawing
.
Size
(
277
,
24
);
this
.
chbLeftDis
.
TabIndex
=
196
;
this
.
chbLeftDis
.
TabIndex
=
196
;
...
@@ -298,7 +313,7 @@
...
@@ -298,7 +313,7 @@
// chbDisSL
// chbDisSL
//
//
this
.
chbDisSL
.
AutoSize
=
true
;
this
.
chbDisSL
.
AutoSize
=
true
;
this
.
chbDisSL
.
Location
=
new
System
.
Drawing
.
Point
(
9
,
152
);
this
.
chbDisSL
.
Location
=
new
System
.
Drawing
.
Point
(
11
,
170
);
this
.
chbDisSL
.
Name
=
"chbDisSL"
;
this
.
chbDisSL
.
Name
=
"chbDisSL"
;
this
.
chbDisSL
.
Size
=
new
System
.
Drawing
.
Size
(
192
,
24
);
this
.
chbDisSL
.
Size
=
new
System
.
Drawing
.
Size
(
192
,
24
);
this
.
chbDisSL
.
TabIndex
=
199
;
this
.
chbDisSL
.
TabIndex
=
199
;
...
@@ -309,7 +324,7 @@
...
@@ -309,7 +324,7 @@
// chbRightDis
// chbRightDis
//
//
this
.
chbRightDis
.
AutoSize
=
true
;
this
.
chbRightDis
.
AutoSize
=
true
;
this
.
chbRightDis
.
Location
=
new
System
.
Drawing
.
Point
(
9
,
101
);
this
.
chbRightDis
.
Location
=
new
System
.
Drawing
.
Point
(
11
,
126
);
this
.
chbRightDis
.
Name
=
"chbRightDis"
;
this
.
chbRightDis
.
Name
=
"chbRightDis"
;
this
.
chbRightDis
.
Size
=
new
System
.
Drawing
.
Size
(
293
,
24
);
this
.
chbRightDis
.
Size
=
new
System
.
Drawing
.
Size
(
293
,
24
);
this
.
chbRightDis
.
TabIndex
=
197
;
this
.
chbRightDis
.
TabIndex
=
197
;
...
@@ -1120,38 +1135,38 @@
...
@@ -1120,38 +1135,38 @@
// toolStripSeparator6
// toolStripSeparator6
//
//
this
.
toolStripSeparator6
.
Name
=
"toolStripSeparator6"
;
this
.
toolStripSeparator6
.
Name
=
"toolStripSeparator6"
;
this
.
toolStripSeparator6
.
Size
=
new
System
.
Drawing
.
Size
(
17
7
,
6
);
this
.
toolStripSeparator6
.
Size
=
new
System
.
Drawing
.
Size
(
17
3
,
6
);
this
.
toolStripSeparator6
.
Visible
=
false
;
this
.
toolStripSeparator6
.
Visible
=
false
;
//
//
// 二维码学习ToolStripMenuItem
// 二维码学习ToolStripMenuItem
//
//
this
.
二维码学习
ToolStripMenuItem
.
Name
=
"二维码学习ToolStripMenuItem"
;
this
.
二维码学习
ToolStripMenuItem
.
Name
=
"二维码学习ToolStripMenuItem"
;
this
.
二维码学习
ToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
80
,
26
);
this
.
二维码学习
ToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
76
,
26
);
this
.
二维码学习
ToolStripMenuItem
.
Text
=
"二维码学习"
;
this
.
二维码学习
ToolStripMenuItem
.
Text
=
"二维码学习"
;
this
.
二维码学习
ToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
二维码学习
ToolStripMenuItem_Click
);
this
.
二维码学习
ToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
二维码学习
ToolStripMenuItem_Click
);
//
//
// toolStripSeparator7
// toolStripSeparator7
//
//
this
.
toolStripSeparator7
.
Name
=
"toolStripSeparator7"
;
this
.
toolStripSeparator7
.
Name
=
"toolStripSeparator7"
;
this
.
toolStripSeparator7
.
Size
=
new
System
.
Drawing
.
Size
(
17
7
,
6
);
this
.
toolStripSeparator7
.
Size
=
new
System
.
Drawing
.
Size
(
17
3
,
6
);
//
//
// 托盘初始化ToolStripMenuItem
// 托盘初始化ToolStripMenuItem
//
//
this
.
托盘初始化
ToolStripMenuItem
.
Name
=
"托盘初始化ToolStripMenuItem"
;
this
.
托盘初始化
ToolStripMenuItem
.
Name
=
"托盘初始化ToolStripMenuItem"
;
this
.
托盘初始化
ToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
80
,
26
);
this
.
托盘初始化
ToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
76
,
26
);
this
.
托盘初始化
ToolStripMenuItem
.
Text
=
"托盘编码"
;
this
.
托盘初始化
ToolStripMenuItem
.
Text
=
"托盘编码"
;
this
.
托盘初始化
ToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
托盘初始化
ToolStripMenuItem_Click
);
this
.
托盘初始化
ToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
托盘初始化
ToolStripMenuItem_Click
);
//
//
// toolStripSeparator9
// toolStripSeparator9
//
//
this
.
toolStripSeparator9
.
Name
=
"toolStripSeparator9"
;
this
.
toolStripSeparator9
.
Name
=
"toolStripSeparator9"
;
this
.
toolStripSeparator9
.
Size
=
new
System
.
Drawing
.
Size
(
17
7
,
6
);
this
.
toolStripSeparator9
.
Size
=
new
System
.
Drawing
.
Size
(
17
3
,
6
);
this
.
toolStripSeparator9
.
Visible
=
false
;
this
.
toolStripSeparator9
.
Visible
=
false
;
//
//
// toolStripMenuItem2
// toolStripMenuItem2
//
//
this
.
toolStripMenuItem2
.
Name
=
"toolStripMenuItem2"
;
this
.
toolStripMenuItem2
.
Name
=
"toolStripMenuItem2"
;
this
.
toolStripMenuItem2
.
Size
=
new
System
.
Drawing
.
Size
(
1
80
,
26
);
this
.
toolStripMenuItem2
.
Size
=
new
System
.
Drawing
.
Size
(
1
76
,
26
);
this
.
toolStripMenuItem2
.
Text
=
"AGV调试"
;
this
.
toolStripMenuItem2
.
Text
=
"AGV调试"
;
this
.
toolStripMenuItem2
.
Visible
=
false
;
this
.
toolStripMenuItem2
.
Visible
=
false
;
this
.
toolStripMenuItem2
.
Click
+=
new
System
.
EventHandler
(
this
.
toolStripMenuItem2_Click
);
this
.
toolStripMenuItem2
.
Click
+=
new
System
.
EventHandler
(
this
.
toolStripMenuItem2_Click
);
...
@@ -1159,36 +1174,36 @@
...
@@ -1159,36 +1174,36 @@
// toolStripSeparator13
// toolStripSeparator13
//
//
this
.
toolStripSeparator13
.
Name
=
"toolStripSeparator13"
;
this
.
toolStripSeparator13
.
Name
=
"toolStripSeparator13"
;
this
.
toolStripSeparator13
.
Size
=
new
System
.
Drawing
.
Size
(
17
7
,
6
);
this
.
toolStripSeparator13
.
Size
=
new
System
.
Drawing
.
Size
(
17
3
,
6
);
//
//
// iO模块状态ToolStripMenuItem
// iO模块状态ToolStripMenuItem
//
//
this
.
iO
模块状态
ToolStripMenuItem
.
Name
=
"iO模块状态ToolStripMenuItem"
;
this
.
iO
模块状态
ToolStripMenuItem
.
Name
=
"iO模块状态ToolStripMenuItem"
;
this
.
iO
模块状态
ToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
80
,
26
);
this
.
iO
模块状态
ToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
76
,
26
);
this
.
iO
模块状态
ToolStripMenuItem
.
Text
=
"查看料仓状态"
;
this
.
iO
模块状态
ToolStripMenuItem
.
Text
=
"查看料仓状态"
;
this
.
iO
模块状态
ToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
iO
模块状态
ToolStripMenuItem_Click
);
this
.
iO
模块状态
ToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
iO
模块状态
ToolStripMenuItem_Click
);
//
//
// toolStripSeparator14
// toolStripSeparator14
//
//
this
.
toolStripSeparator14
.
Name
=
"toolStripSeparator14"
;
this
.
toolStripSeparator14
.
Name
=
"toolStripSeparator14"
;
this
.
toolStripSeparator14
.
Size
=
new
System
.
Drawing
.
Size
(
17
7
,
6
);
this
.
toolStripSeparator14
.
Size
=
new
System
.
Drawing
.
Size
(
17
3
,
6
);
//
//
// 查看托盘信息ToolStripMenuItem
// 查看托盘信息ToolStripMenuItem
//
//
this
.
查看托盘信息
ToolStripMenuItem
.
Name
=
"查看托盘信息ToolStripMenuItem"
;
this
.
查看托盘信息
ToolStripMenuItem
.
Name
=
"查看托盘信息ToolStripMenuItem"
;
this
.
查看托盘信息
ToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
80
,
26
);
this
.
查看托盘信息
ToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
76
,
26
);
this
.
查看托盘信息
ToolStripMenuItem
.
Text
=
"查看托盘信息"
;
this
.
查看托盘信息
ToolStripMenuItem
.
Text
=
"查看托盘信息"
;
this
.
查看托盘信息
ToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
btnTrayInfo_Click
);
this
.
查看托盘信息
ToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
btnTrayInfo_Click
);
//
//
// toolStripSeparator12
// toolStripSeparator12
//
//
this
.
toolStripSeparator12
.
Name
=
"toolStripSeparator12"
;
this
.
toolStripSeparator12
.
Name
=
"toolStripSeparator12"
;
this
.
toolStripSeparator12
.
Size
=
new
System
.
Drawing
.
Size
(
17
7
,
6
);
this
.
toolStripSeparator12
.
Size
=
new
System
.
Drawing
.
Size
(
17
3
,
6
);
//
//
// 清空托盘信息ToolStripMenuItem
// 清空托盘信息ToolStripMenuItem
//
//
this
.
清空托盘信息
ToolStripMenuItem
.
Name
=
"清空托盘信息ToolStripMenuItem"
;
this
.
清空托盘信息
ToolStripMenuItem
.
Name
=
"清空托盘信息ToolStripMenuItem"
;
this
.
清空托盘信息
ToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
80
,
26
);
this
.
清空托盘信息
ToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
76
,
26
);
this
.
清空托盘信息
ToolStripMenuItem
.
Text
=
"清空托盘信息"
;
this
.
清空托盘信息
ToolStripMenuItem
.
Text
=
"清空托盘信息"
;
this
.
清空托盘信息
ToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
清空托盘信息
ToolStripMenuItem_Click
);
this
.
清空托盘信息
ToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
清空托盘信息
ToolStripMenuItem_Click
);
//
//
...
@@ -1207,31 +1222,31 @@
...
@@ -1207,31 +1222,31 @@
// 清空日志ToolStripMenuItem
// 清空日志ToolStripMenuItem
//
//
this
.
清空日志
ToolStripMenuItem
.
Name
=
"清空日志ToolStripMenuItem"
;
this
.
清空日志
ToolStripMenuItem
.
Name
=
"清空日志ToolStripMenuItem"
;
this
.
清空日志
ToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
80
,
26
);
this
.
清空日志
ToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
44
,
26
);
this
.
清空日志
ToolStripMenuItem
.
Text
=
"清空日志"
;
this
.
清空日志
ToolStripMenuItem
.
Text
=
"清空日志"
;
this
.
清空日志
ToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
清空日志
ToolStripMenuItem_Click
);
this
.
清空日志
ToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
清空日志
ToolStripMenuItem_Click
);
//
//
// toolStripSeparator10
// toolStripSeparator10
//
//
this
.
toolStripSeparator10
.
Name
=
"toolStripSeparator10"
;
this
.
toolStripSeparator10
.
Name
=
"toolStripSeparator10"
;
this
.
toolStripSeparator10
.
Size
=
new
System
.
Drawing
.
Size
(
1
77
,
6
);
this
.
toolStripSeparator10
.
Size
=
new
System
.
Drawing
.
Size
(
1
41
,
6
);
//
//
// 复制日志ToolStripMenuItem
// 复制日志ToolStripMenuItem
//
//
this
.
复制日志
ToolStripMenuItem
.
Name
=
"复制日志ToolStripMenuItem"
;
this
.
复制日志
ToolStripMenuItem
.
Name
=
"复制日志ToolStripMenuItem"
;
this
.
复制日志
ToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
80
,
26
);
this
.
复制日志
ToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
44
,
26
);
this
.
复制日志
ToolStripMenuItem
.
Text
=
"复制日志"
;
this
.
复制日志
ToolStripMenuItem
.
Text
=
"复制日志"
;
this
.
复制日志
ToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
复制日志
ToolStripMenuItem_Click
);
this
.
复制日志
ToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
复制日志
ToolStripMenuItem_Click
);
//
//
// toolStripSeparator11
// toolStripSeparator11
//
//
this
.
toolStripSeparator11
.
Name
=
"toolStripSeparator11"
;
this
.
toolStripSeparator11
.
Name
=
"toolStripSeparator11"
;
this
.
toolStripSeparator11
.
Size
=
new
System
.
Drawing
.
Size
(
1
77
,
6
);
this
.
toolStripSeparator11
.
Size
=
new
System
.
Drawing
.
Size
(
1
41
,
6
);
//
//
// 版本号ToolStripMenuItem
// 版本号ToolStripMenuItem
//
//
this
.
版本号
ToolStripMenuItem
.
Name
=
"版本号ToolStripMenuItem"
;
this
.
版本号
ToolStripMenuItem
.
Name
=
"版本号ToolStripMenuItem"
;
this
.
版本号
ToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
80
,
26
);
this
.
版本号
ToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
44
,
26
);
this
.
版本号
ToolStripMenuItem
.
Text
=
"关于软件"
;
this
.
版本号
ToolStripMenuItem
.
Text
=
"关于软件"
;
this
.
版本号
ToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
版本号
ToolStripMenuItem_Click
);
this
.
版本号
ToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
版本号
ToolStripMenuItem_Click
);
//
//
...
@@ -1582,6 +1597,7 @@
...
@@ -1582,6 +1597,7 @@
private
System
.
Windows
.
Forms
.
Label
label9
;
private
System
.
Windows
.
Forms
.
Label
label9
;
private
System
.
Windows
.
Forms
.
Panel
panel13
;
private
System
.
Windows
.
Forms
.
Panel
panel13
;
private
System
.
Windows
.
Forms
.
Label
label15
;
private
System
.
Windows
.
Forms
.
Label
label15
;
private
System
.
Windows
.
Forms
.
CheckBox
chbDisGetWare
;
}
}
}
}
source/AssemblyLineClient/FrmLineStore.cs
查看文件 @
42a0eb1
...
@@ -1265,5 +1265,19 @@ namespace OnlineStore.AssemblyLine
...
@@ -1265,5 +1265,19 @@ namespace OnlineStore.AssemblyLine
LineManager
.
TrayToOutLineTest
=
chbTrayTest
.
Checked
;
LineManager
.
TrayToOutLineTest
=
chbTrayTest
.
Checked
;
LogUtil
.
info
(
"界面点击勾选:"
+
chbTrayTest
.
Text
+
"="
+
LineManager
.
TrayToOutLineTest
);
LogUtil
.
info
(
"界面点击勾选:"
+
chbTrayTest
.
Text
+
"="
+
LineManager
.
TrayToOutLineTest
);
}
}
private
void
chbDisGetWare_CheckedChanged
(
object
sender
,
EventArgs
e
)
{
if
(!
LoadOk
)
{
return
;
}
if
(
LineManager
.
DisGetWare
.
Equals
(
chbDisGetWare
.
Checked
))
{
return
;
}
LineManager
.
DisGetWare
=
chbDisGetWare
.
Checked
;
LogUtil
.
info
(
"界面点击勾选:"
+
chbDisGetWare
.
Text
+
"="
+
LineManager
.
DisGetWare
);
}
}
}
}
}
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
查看文件 @
42a0eb1
...
@@ -342,10 +342,18 @@ namespace OnlineStore.DeviceLibrary
...
@@ -342,10 +342,18 @@ namespace OnlineStore.DeviceLibrary
if
(
ScanCodeTask
==
null
||
ScanCodeTask
.
IsCompleted
)
if
(
ScanCodeTask
==
null
||
ScanCodeTask
.
IsCompleted
)
{
{
ClearTimeoutAlarm
(
"扫码结束超时"
);
ClearTimeoutAlarm
(
"扫码结束超时"
);
ClearTimeoutAlarm
(
"扫码执行结束超时"
);
if
(!
LineManager
.
DisGetWare
)
{
ClearTimeoutAlarm
(
"启用抓料超时"
);
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FI_21_CylinderTake
);
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FI_21_CylinderTake
);
InLog
(
"料盘移栽"
+
MoveInfo
.
SLog
+
":上料横移取料端"
);
InLog
(
"料盘移栽"
+
MoveInfo
.
SLog
+
":上料横移取料端"
);
CylinderMove
(
MoveInfo
,
IO_Type
.
SL_MoveCylinder_Give
,
IO_Type
.
SL_MoveCylinder_Take
);
CylinderMove
(
MoveInfo
,
IO_Type
.
SL_MoveCylinder_Give
,
IO_Type
.
SL_MoveCylinder_Take
);
ClearTimeoutAlarm
(
"扫码执行结束超时"
);
}
else
if
(
MoveInfo
.
IsTimeOut
(
60
))
{
MoveTimeOut
(
MoveInfo
,
"启用抓料超时"
);
}
}
}
else
if
(
MoveInfo
.
IsTimeOut
(
60
))
else
if
(
MoveInfo
.
IsTimeOut
(
60
))
{
{
...
...
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
查看文件 @
42a0eb1
...
@@ -284,6 +284,10 @@ namespace OnlineStore.DeviceLibrary
...
@@ -284,6 +284,10 @@ namespace OnlineStore.DeviceLibrary
{
{
return
false
;
return
false
;
}
}
if
(
LineManager
.
DisGetWare
)
{
return
false
;
}
MoveEquip
move
=
MoveEquipMap
[
id
];
MoveEquip
move
=
MoveEquipMap
[
id
];
if
(!
move
.
NoAlarm
()
||
move
.
waitInStoreList
.
Count
>
0
||
move
.
IsDebug
||
move
.
waitOutStoreList
.
Count
>
0
)
if
(!
move
.
NoAlarm
()
||
move
.
waitInStoreList
.
Count
>
0
||
move
.
IsDebug
||
move
.
waitOutStoreList
.
Count
>
0
)
{
{
...
...
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
查看文件 @
42a0eb1
...
@@ -536,7 +536,10 @@ namespace OnlineStore.DeviceLibrary
...
@@ -536,7 +536,10 @@ namespace OnlineStore.DeviceLibrary
{
{
return
false
;
return
false
;
}
}
if
(
LineManager
.
DisGetWare
)
{
return
false
;
}
//如果正在出库执行中,不能拦截入库托盘
//如果正在出库执行中,不能拦截入库托盘
if
(
MoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
OutStore
))
if
(
MoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
OutStore
))
{
{
...
...
source/DeviceLibrary/assemblymanager/ALineManager.cs
查看文件 @
42a0eb1
...
@@ -22,6 +22,8 @@ namespace OnlineStore.DeviceLibrary
...
@@ -22,6 +22,8 @@ namespace OnlineStore.DeviceLibrary
public
static
bool
DisAllMove
=
false
;
public
static
bool
DisAllMove
=
false
;
public
static
bool
TrayToOutLineTest
=
false
;
public
static
bool
TrayToOutLineTest
=
false
;
public
static
bool
DisGetWare
=
false
;
public
static
bool
UseBuzzer
=
ConfigAppSettings
.
GetIntValue
(
Setting_Init
.
UseBuzzer
).
Equals
(
1
);
public
static
bool
UseBuzzer
=
ConfigAppSettings
.
GetIntValue
(
Setting_Init
.
UseBuzzer
).
Equals
(
1
);
private
static
bool
isInit
=
false
;
private
static
bool
isInit
=
false
;
public
static
bool
IsConnectServer
=
!
ConfigAppSettings
.
GetValue
(
Setting_Init
.
http_server
).
Equals
(
""
);
public
static
bool
IsConnectServer
=
!
ConfigAppSettings
.
GetValue
(
Setting_Init
.
http_server
).
Equals
(
""
);
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论