Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
李娜
/
SO908-XLRStore
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 367d54f3
由
张东亮
编写于
2023-09-20 08:57:39 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
Revert "调试状态逻辑修改"
This reverts commit
4891a12a
.
1 个父辈
4891a12a
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
52 行增加
和
78 行删除
source/XLRStoreClient/FrmXLRStore.Designer.cs
source/XLRStoreClient/boxForm/FrmBoxEquip.Designer.cs
source/XLRStoreClient/boxForm/FrmBoxEquip.cs
source/XLRStoreClient/FrmXLRStore.Designer.cs
查看文件 @
367d54f
...
@@ -144,7 +144,7 @@
...
@@ -144,7 +144,7 @@
this
.
tabPage2
.
Controls
.
Add
(
this
.
panel1
);
this
.
tabPage2
.
Controls
.
Add
(
this
.
panel1
);
this
.
tabPage2
.
Location
=
new
System
.
Drawing
.
Point
(
4
,
32
);
this
.
tabPage2
.
Location
=
new
System
.
Drawing
.
Point
(
4
,
32
);
this
.
tabPage2
.
Name
=
"tabPage2"
;
this
.
tabPage2
.
Name
=
"tabPage2"
;
this
.
tabPage2
.
Size
=
new
System
.
Drawing
.
Size
(
988
,
602
);
this
.
tabPage2
.
Size
=
new
System
.
Drawing
.
Size
(
192
,
64
);
this
.
tabPage2
.
TabIndex
=
1
;
this
.
tabPage2
.
TabIndex
=
1
;
this
.
tabPage2
.
Text
=
" 设备状态 "
;
this
.
tabPage2
.
Text
=
" 设备状态 "
;
this
.
tabPage2
.
UseVisualStyleBackColor
=
true
;
this
.
tabPage2
.
UseVisualStyleBackColor
=
true
;
...
@@ -155,7 +155,7 @@
...
@@ -155,7 +155,7 @@
this
.
panel1
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
panel1
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
panel1
.
Location
=
new
System
.
Drawing
.
Point
(
0
,
0
);
this
.
panel1
.
Location
=
new
System
.
Drawing
.
Point
(
0
,
0
);
this
.
panel1
.
Name
=
"panel1"
;
this
.
panel1
.
Name
=
"panel1"
;
this
.
panel1
.
Size
=
new
System
.
Drawing
.
Size
(
988
,
602
);
this
.
panel1
.
Size
=
new
System
.
Drawing
.
Size
(
192
,
64
);
this
.
panel1
.
TabIndex
=
1
;
this
.
panel1
.
TabIndex
=
1
;
//
//
// tableLayoutPanel1
// tableLayoutPanel1
...
@@ -180,7 +180,7 @@
...
@@ -180,7 +180,7 @@
this
.
tableLayoutPanel1
.
RowStyles
.
Add
(
new
System
.
Windows
.
Forms
.
RowStyle
(
System
.
Windows
.
Forms
.
SizeType
.
Percent
,
14.28571F
));
this
.
tableLayoutPanel1
.
RowStyles
.
Add
(
new
System
.
Windows
.
Forms
.
RowStyle
(
System
.
Windows
.
Forms
.
SizeType
.
Percent
,
14.28571F
));
this
.
tableLayoutPanel1
.
RowStyles
.
Add
(
new
System
.
Windows
.
Forms
.
RowStyle
(
System
.
Windows
.
Forms
.
SizeType
.
Percent
,
19.04762F
));
this
.
tableLayoutPanel1
.
RowStyles
.
Add
(
new
System
.
Windows
.
Forms
.
RowStyle
(
System
.
Windows
.
Forms
.
SizeType
.
Percent
,
19.04762F
));
this
.
tableLayoutPanel1
.
RowStyles
.
Add
(
new
System
.
Windows
.
Forms
.
RowStyle
(
System
.
Windows
.
Forms
.
SizeType
.
Percent
,
19.04762F
));
this
.
tableLayoutPanel1
.
RowStyles
.
Add
(
new
System
.
Windows
.
Forms
.
RowStyle
(
System
.
Windows
.
Forms
.
SizeType
.
Percent
,
19.04762F
));
this
.
tableLayoutPanel1
.
Size
=
new
System
.
Drawing
.
Size
(
988
,
602
);
this
.
tableLayoutPanel1
.
Size
=
new
System
.
Drawing
.
Size
(
192
,
64
);
this
.
tableLayoutPanel1
.
TabIndex
=
0
;
this
.
tableLayoutPanel1
.
TabIndex
=
0
;
//
//
// InputControl
// InputControl
...
@@ -191,11 +191,11 @@
...
@@ -191,11 +191,11 @@
this
.
tableLayoutPanel1
.
SetColumnSpan
(
this
.
InputControl
,
2
);
this
.
tableLayoutPanel1
.
SetColumnSpan
(
this
.
InputControl
,
2
);
this
.
InputControl
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
InputControl
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
InputControl
.
EquipText
=
"上料机构"
;
this
.
InputControl
.
EquipText
=
"上料机构"
;
this
.
InputControl
.
Location
=
new
System
.
Drawing
.
Point
(
4
,
374
);
this
.
InputControl
.
Location
=
new
System
.
Drawing
.
Point
(
4
,
43
);
this
.
InputControl
.
Margin
=
new
System
.
Windows
.
Forms
.
Padding
(
4
,
4
,
4
,
4
);
this
.
InputControl
.
Margin
=
new
System
.
Windows
.
Forms
.
Padding
(
4
,
4
,
4
,
4
);
this
.
InputControl
.
MoveInfo
=
"暂无出入库"
;
this
.
InputControl
.
MoveInfo
=
"暂无出入库"
;
this
.
InputControl
.
Name
=
"InputControl"
;
this
.
InputControl
.
Name
=
"InputControl"
;
this
.
InputControl
.
Size
=
new
System
.
Drawing
.
Size
(
980
,
106
);
this
.
InputControl
.
Size
=
new
System
.
Drawing
.
Size
(
184
,
4
);
this
.
InputControl
.
TabIndex
=
5
;
this
.
InputControl
.
TabIndex
=
5
;
this
.
InputControl
.
WorkStatus
=
"暂未启动"
;
this
.
InputControl
.
WorkStatus
=
"暂未启动"
;
//
//
...
@@ -205,11 +205,11 @@
...
@@ -205,11 +205,11 @@
this
.
ReelControlA1
.
BorderStyle
=
System
.
Windows
.
Forms
.
BorderStyle
.
FixedSingle
;
this
.
ReelControlA1
.
BorderStyle
=
System
.
Windows
.
Forms
.
BorderStyle
.
FixedSingle
;
this
.
ReelControlA1
.
ColorStatus
=
System
.
Drawing
.
Color
.
White
;
this
.
ReelControlA1
.
ColorStatus
=
System
.
Drawing
.
Color
.
White
;
this
.
ReelControlA1
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
ReelControlA1
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
ReelControlA1
.
Location
=
new
System
.
Drawing
.
Point
(
4
,
2
04
);
this
.
ReelControlA1
.
Location
=
new
System
.
Drawing
.
Point
(
4
,
2
5
);
this
.
ReelControlA1
.
Margin
=
new
System
.
Windows
.
Forms
.
Padding
(
4
,
4
,
4
,
4
);
this
.
ReelControlA1
.
Margin
=
new
System
.
Windows
.
Forms
.
Padding
(
4
,
4
,
4
,
4
);
this
.
ReelControlA1
.
Name
=
"ReelControlA1"
;
this
.
ReelControlA1
.
Name
=
"ReelControlA1"
;
this
.
ReelControlA1
.
ReelText
=
"暂存区物料"
;
this
.
ReelControlA1
.
ReelText
=
"暂存区物料"
;
this
.
ReelControlA1
.
Size
=
new
System
.
Drawing
.
Size
(
486
,
77
);
this
.
ReelControlA1
.
Size
=
new
System
.
Drawing
.
Size
(
88
,
1
);
this
.
ReelControlA1
.
TabIndex
=
0
;
this
.
ReelControlA1
.
TabIndex
=
0
;
//
//
// ReelControlA2
// ReelControlA2
...
@@ -218,11 +218,11 @@
...
@@ -218,11 +218,11 @@
this
.
ReelControlA2
.
BorderStyle
=
System
.
Windows
.
Forms
.
BorderStyle
.
FixedSingle
;
this
.
ReelControlA2
.
BorderStyle
=
System
.
Windows
.
Forms
.
BorderStyle
.
FixedSingle
;
this
.
ReelControlA2
.
ColorStatus
=
System
.
Drawing
.
Color
.
White
;
this
.
ReelControlA2
.
ColorStatus
=
System
.
Drawing
.
Color
.
White
;
this
.
ReelControlA2
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
ReelControlA2
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
ReelControlA2
.
Location
=
new
System
.
Drawing
.
Point
(
4
,
289
);
this
.
ReelControlA2
.
Location
=
new
System
.
Drawing
.
Point
(
4
,
34
);
this
.
ReelControlA2
.
Margin
=
new
System
.
Windows
.
Forms
.
Padding
(
4
,
4
,
4
,
4
);
this
.
ReelControlA2
.
Margin
=
new
System
.
Windows
.
Forms
.
Padding
(
4
,
4
,
4
,
4
);
this
.
ReelControlA2
.
Name
=
"ReelControlA2"
;
this
.
ReelControlA2
.
Name
=
"ReelControlA2"
;
this
.
ReelControlA2
.
ReelText
=
"暂存区物料"
;
this
.
ReelControlA2
.
ReelText
=
"暂存区物料"
;
this
.
ReelControlA2
.
Size
=
new
System
.
Drawing
.
Size
(
486
,
77
);
this
.
ReelControlA2
.
Size
=
new
System
.
Drawing
.
Size
(
88
,
1
);
this
.
ReelControlA2
.
TabIndex
=
1
;
this
.
ReelControlA2
.
TabIndex
=
1
;
//
//
// ReelControlB1
// ReelControlB1
...
@@ -231,11 +231,11 @@
...
@@ -231,11 +231,11 @@
this
.
ReelControlB1
.
BorderStyle
=
System
.
Windows
.
Forms
.
BorderStyle
.
FixedSingle
;
this
.
ReelControlB1
.
BorderStyle
=
System
.
Windows
.
Forms
.
BorderStyle
.
FixedSingle
;
this
.
ReelControlB1
.
ColorStatus
=
System
.
Drawing
.
Color
.
White
;
this
.
ReelControlB1
.
ColorStatus
=
System
.
Drawing
.
Color
.
White
;
this
.
ReelControlB1
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
ReelControlB1
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
ReelControlB1
.
Location
=
new
System
.
Drawing
.
Point
(
498
,
204
);
this
.
ReelControlB1
.
Location
=
new
System
.
Drawing
.
Point
(
100
,
25
);
this
.
ReelControlB1
.
Margin
=
new
System
.
Windows
.
Forms
.
Padding
(
4
,
4
,
4
,
4
);
this
.
ReelControlB1
.
Margin
=
new
System
.
Windows
.
Forms
.
Padding
(
4
,
4
,
4
,
4
);
this
.
ReelControlB1
.
Name
=
"ReelControlB1"
;
this
.
ReelControlB1
.
Name
=
"ReelControlB1"
;
this
.
ReelControlB1
.
ReelText
=
"暂存区物料"
;
this
.
ReelControlB1
.
ReelText
=
"暂存区物料"
;
this
.
ReelControlB1
.
Size
=
new
System
.
Drawing
.
Size
(
486
,
77
);
this
.
ReelControlB1
.
Size
=
new
System
.
Drawing
.
Size
(
88
,
1
);
this
.
ReelControlB1
.
TabIndex
=
2
;
this
.
ReelControlB1
.
TabIndex
=
2
;
//
//
// ReelControlB2
// ReelControlB2
...
@@ -244,11 +244,11 @@
...
@@ -244,11 +244,11 @@
this
.
ReelControlB2
.
BorderStyle
=
System
.
Windows
.
Forms
.
BorderStyle
.
FixedSingle
;
this
.
ReelControlB2
.
BorderStyle
=
System
.
Windows
.
Forms
.
BorderStyle
.
FixedSingle
;
this
.
ReelControlB2
.
ColorStatus
=
System
.
Drawing
.
Color
.
White
;
this
.
ReelControlB2
.
ColorStatus
=
System
.
Drawing
.
Color
.
White
;
this
.
ReelControlB2
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
ReelControlB2
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
ReelControlB2
.
Location
=
new
System
.
Drawing
.
Point
(
498
,
289
);
this
.
ReelControlB2
.
Location
=
new
System
.
Drawing
.
Point
(
100
,
34
);
this
.
ReelControlB2
.
Margin
=
new
System
.
Windows
.
Forms
.
Padding
(
4
,
4
,
4
,
4
);
this
.
ReelControlB2
.
Margin
=
new
System
.
Windows
.
Forms
.
Padding
(
4
,
4
,
4
,
4
);
this
.
ReelControlB2
.
Name
=
"ReelControlB2"
;
this
.
ReelControlB2
.
Name
=
"ReelControlB2"
;
this
.
ReelControlB2
.
ReelText
=
"暂存区物料"
;
this
.
ReelControlB2
.
ReelText
=
"暂存区物料"
;
this
.
ReelControlB2
.
Size
=
new
System
.
Drawing
.
Size
(
486
,
77
);
this
.
ReelControlB2
.
Size
=
new
System
.
Drawing
.
Size
(
88
,
1
);
this
.
ReelControlB2
.
TabIndex
=
3
;
this
.
ReelControlB2
.
TabIndex
=
3
;
//
//
// BoxControl
// BoxControl
...
@@ -263,7 +263,7 @@
...
@@ -263,7 +263,7 @@
this
.
BoxControl
.
Margin
=
new
System
.
Windows
.
Forms
.
Padding
(
4
,
4
,
4
,
4
);
this
.
BoxControl
.
Margin
=
new
System
.
Windows
.
Forms
.
Padding
(
4
,
4
,
4
,
4
);
this
.
BoxControl
.
MoveInfo
=
"暂无出入库"
;
this
.
BoxControl
.
MoveInfo
=
"暂无出入库"
;
this
.
BoxControl
.
Name
=
"BoxControl"
;
this
.
BoxControl
.
Name
=
"BoxControl"
;
this
.
BoxControl
.
Size
=
new
System
.
Drawing
.
Size
(
980
,
192
);
this
.
BoxControl
.
Size
=
new
System
.
Drawing
.
Size
(
184
,
13
);
this
.
BoxControl
.
TabIndex
=
4
;
this
.
BoxControl
.
TabIndex
=
4
;
this
.
BoxControl
.
WorkStatus
=
"暂未启动"
;
this
.
BoxControl
.
WorkStatus
=
"暂未启动"
;
//
//
...
@@ -274,11 +274,11 @@
...
@@ -274,11 +274,11 @@
this
.
ShelfAControl
.
ColorStatus
=
System
.
Drawing
.
Color
.
White
;
this
.
ShelfAControl
.
ColorStatus
=
System
.
Drawing
.
Color
.
White
;
this
.
ShelfAControl
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
ShelfAControl
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
ShelfAControl
.
EquipText
=
"A料口"
;
this
.
ShelfAControl
.
EquipText
=
"A料口"
;
this
.
ShelfAControl
.
Location
=
new
System
.
Drawing
.
Point
(
4
,
488
);
this
.
ShelfAControl
.
Location
=
new
System
.
Drawing
.
Point
(
4
,
55
);
this
.
ShelfAControl
.
Margin
=
new
System
.
Windows
.
Forms
.
Padding
(
4
,
4
,
4
,
4
);
this
.
ShelfAControl
.
Margin
=
new
System
.
Windows
.
Forms
.
Padding
(
4
,
4
,
4
,
4
);
this
.
ShelfAControl
.
MoveInfo
=
"暂无出入库"
;
this
.
ShelfAControl
.
MoveInfo
=
"暂无出入库"
;
this
.
ShelfAControl
.
Name
=
"ShelfAControl"
;
this
.
ShelfAControl
.
Name
=
"ShelfAControl"
;
this
.
ShelfAControl
.
Size
=
new
System
.
Drawing
.
Size
(
486
,
110
);
this
.
ShelfAControl
.
Size
=
new
System
.
Drawing
.
Size
(
88
,
5
);
this
.
ShelfAControl
.
TabIndex
=
6
;
this
.
ShelfAControl
.
TabIndex
=
6
;
this
.
ShelfAControl
.
WorkStatus
=
"暂未启动"
;
this
.
ShelfAControl
.
WorkStatus
=
"暂未启动"
;
//
//
...
@@ -289,20 +289,20 @@
...
@@ -289,20 +289,20 @@
this
.
ShelfBControl
.
ColorStatus
=
System
.
Drawing
.
Color
.
White
;
this
.
ShelfBControl
.
ColorStatus
=
System
.
Drawing
.
Color
.
White
;
this
.
ShelfBControl
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
ShelfBControl
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
ShelfBControl
.
EquipText
=
"B料口"
;
this
.
ShelfBControl
.
EquipText
=
"B料口"
;
this
.
ShelfBControl
.
Location
=
new
System
.
Drawing
.
Point
(
498
,
488
);
this
.
ShelfBControl
.
Location
=
new
System
.
Drawing
.
Point
(
100
,
55
);
this
.
ShelfBControl
.
Margin
=
new
System
.
Windows
.
Forms
.
Padding
(
4
,
4
,
4
,
4
);
this
.
ShelfBControl
.
Margin
=
new
System
.
Windows
.
Forms
.
Padding
(
4
,
4
,
4
,
4
);
this
.
ShelfBControl
.
MoveInfo
=
"暂无出入库"
;
this
.
ShelfBControl
.
MoveInfo
=
"暂无出入库"
;
this
.
ShelfBControl
.
Name
=
"ShelfBControl"
;
this
.
ShelfBControl
.
Name
=
"ShelfBControl"
;
this
.
ShelfBControl
.
Size
=
new
System
.
Drawing
.
Size
(
486
,
110
);
this
.
ShelfBControl
.
Size
=
new
System
.
Drawing
.
Size
(
88
,
5
);
this
.
ShelfBControl
.
TabIndex
=
7
;
this
.
ShelfBControl
.
TabIndex
=
7
;
this
.
ShelfBControl
.
WorkStatus
=
"暂未启动"
;
this
.
ShelfBControl
.
WorkStatus
=
"暂未启动"
;
//
//
// tabPage3
// tabPage3
//
//
this
.
tabPage3
.
Controls
.
Add
(
this
.
panelVideo
);
this
.
tabPage3
.
Controls
.
Add
(
this
.
panelVideo
);
this
.
tabPage3
.
Location
=
new
System
.
Drawing
.
Point
(
4
,
32
);
this
.
tabPage3
.
Location
=
new
System
.
Drawing
.
Point
(
4
,
60
);
this
.
tabPage3
.
Name
=
"tabPage3"
;
this
.
tabPage3
.
Name
=
"tabPage3"
;
this
.
tabPage3
.
Size
=
new
System
.
Drawing
.
Size
(
988
,
602
);
this
.
tabPage3
.
Size
=
new
System
.
Drawing
.
Size
(
192
,
36
);
this
.
tabPage3
.
TabIndex
=
2
;
this
.
tabPage3
.
TabIndex
=
2
;
this
.
tabPage3
.
Text
=
"监控"
;
this
.
tabPage3
.
Text
=
"监控"
;
this
.
tabPage3
.
UseVisualStyleBackColor
=
true
;
this
.
tabPage3
.
UseVisualStyleBackColor
=
true
;
...
@@ -312,7 +312,7 @@
...
@@ -312,7 +312,7 @@
this
.
panelVideo
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
panelVideo
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
panelVideo
.
Location
=
new
System
.
Drawing
.
Point
(
0
,
0
);
this
.
panelVideo
.
Location
=
new
System
.
Drawing
.
Point
(
0
,
0
);
this
.
panelVideo
.
Name
=
"panelVideo"
;
this
.
panelVideo
.
Name
=
"panelVideo"
;
this
.
panelVideo
.
Size
=
new
System
.
Drawing
.
Size
(
988
,
602
);
this
.
panelVideo
.
Size
=
new
System
.
Drawing
.
Size
(
192
,
36
);
this
.
panelVideo
.
TabIndex
=
0
;
this
.
panelVideo
.
TabIndex
=
0
;
//
//
// lblStatus
// lblStatus
...
...
source/XLRStoreClient/boxForm/FrmBoxEquip.Designer.cs
查看文件 @
367d54f
...
@@ -40,7 +40,6 @@
...
@@ -40,7 +40,6 @@
this
.
tabControl1
=
new
System
.
Windows
.
Forms
.
TabControl
();
this
.
tabControl1
=
new
System
.
Windows
.
Forms
.
TabControl
();
this
.
tabPage3
=
new
System
.
Windows
.
Forms
.
TabPage
();
this
.
tabPage3
=
new
System
.
Windows
.
Forms
.
TabPage
();
this
.
groupBox6
=
new
System
.
Windows
.
Forms
.
GroupBox
();
this
.
groupBox6
=
new
System
.
Windows
.
Forms
.
GroupBox
();
this
.
tableLayoutPanel3
=
new
System
.
Windows
.
Forms
.
TableLayoutPanel
();
this
.
lblInoutInfo
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
lblInoutInfo
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
lblMoveInfo
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
lblMoveInfo
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
lblInstoreList
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
lblInstoreList
=
new
System
.
Windows
.
Forms
.
Label
();
...
@@ -54,6 +53,7 @@
...
@@ -54,6 +53,7 @@
this
.
lblStoreStatus
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
lblStoreStatus
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
btnStart
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnStart
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnStop
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnStop
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
tableLayoutPanel3
=
new
System
.
Windows
.
Forms
.
TableLayoutPanel
();
this
.
groupBox1
.
SuspendLayout
();
this
.
groupBox1
.
SuspendLayout
();
this
.
groupBox4
.
SuspendLayout
();
this
.
groupBox4
.
SuspendLayout
();
this
.
groupBox3
.
SuspendLayout
();
this
.
groupBox3
.
SuspendLayout
();
...
@@ -61,9 +61,9 @@
...
@@ -61,9 +61,9 @@
this
.
tabControl1
.
SuspendLayout
();
this
.
tabControl1
.
SuspendLayout
();
this
.
tabPage3
.
SuspendLayout
();
this
.
tabPage3
.
SuspendLayout
();
this
.
groupBox6
.
SuspendLayout
();
this
.
groupBox6
.
SuspendLayout
();
this
.
tableLayoutPanel3
.
SuspendLayout
();
this
.
tabPage1
.
SuspendLayout
();
this
.
tabPage1
.
SuspendLayout
();
this
.
panBase
.
SuspendLayout
();
this
.
panBase
.
SuspendLayout
();
this
.
tableLayoutPanel3
.
SuspendLayout
();
this
.
SuspendLayout
();
this
.
SuspendLayout
();
//
//
// timer1
// timer1
...
@@ -351,23 +351,6 @@
...
@@ -351,23 +351,6 @@
this
.
groupBox6
.
TabStop
=
false
;
this
.
groupBox6
.
TabStop
=
false
;
this
.
groupBox6
.
Text
=
"当前状态"
;
this
.
groupBox6
.
Text
=
"当前状态"
;
//
//
// tableLayoutPanel3
//
this
.
tableLayoutPanel3
.
ColumnCount
=
1
;
this
.
tableLayoutPanel3
.
ColumnStyles
.
Add
(
new
System
.
Windows
.
Forms
.
ColumnStyle
(
System
.
Windows
.
Forms
.
SizeType
.
Percent
,
100F
));
this
.
tableLayoutPanel3
.
Controls
.
Add
(
this
.
lblInoutInfo
,
0
,
0
);
this
.
tableLayoutPanel3
.
Controls
.
Add
(
this
.
lblMoveInfo
,
0
,
1
);
this
.
tableLayoutPanel3
.
Controls
.
Add
(
this
.
lblThisSta
,
0
,
2
);
this
.
tableLayoutPanel3
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
tableLayoutPanel3
.
Location
=
new
System
.
Drawing
.
Point
(
3
,
23
);
this
.
tableLayoutPanel3
.
Name
=
"tableLayoutPanel3"
;
this
.
tableLayoutPanel3
.
RowCount
=
3
;
this
.
tableLayoutPanel3
.
RowStyles
.
Add
(
new
System
.
Windows
.
Forms
.
RowStyle
(
System
.
Windows
.
Forms
.
SizeType
.
Percent
,
33.33333F
));
this
.
tableLayoutPanel3
.
RowStyles
.
Add
(
new
System
.
Windows
.
Forms
.
RowStyle
(
System
.
Windows
.
Forms
.
SizeType
.
Percent
,
33.33333F
));
this
.
tableLayoutPanel3
.
RowStyles
.
Add
(
new
System
.
Windows
.
Forms
.
RowStyle
(
System
.
Windows
.
Forms
.
SizeType
.
Percent
,
33.33333F
));
this
.
tableLayoutPanel3
.
Size
=
new
System
.
Drawing
.
Size
(
979
,
492
);
this
.
tableLayoutPanel3
.
TabIndex
=
282
;
//
// lblInoutInfo
// lblInoutInfo
//
//
this
.
lblInoutInfo
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
lblInoutInfo
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
...
@@ -534,6 +517,23 @@
...
@@ -534,6 +517,23 @@
this
.
btnStop
.
UseVisualStyleBackColor
=
false
;
this
.
btnStop
.
UseVisualStyleBackColor
=
false
;
this
.
btnStop
.
Click
+=
new
System
.
EventHandler
(
this
.
btnStop_Click
);
this
.
btnStop
.
Click
+=
new
System
.
EventHandler
(
this
.
btnStop_Click
);
//
//
// tableLayoutPanel3
//
this
.
tableLayoutPanel3
.
ColumnCount
=
1
;
this
.
tableLayoutPanel3
.
ColumnStyles
.
Add
(
new
System
.
Windows
.
Forms
.
ColumnStyle
(
System
.
Windows
.
Forms
.
SizeType
.
Percent
,
100F
));
this
.
tableLayoutPanel3
.
Controls
.
Add
(
this
.
lblInoutInfo
,
0
,
0
);
this
.
tableLayoutPanel3
.
Controls
.
Add
(
this
.
lblMoveInfo
,
0
,
1
);
this
.
tableLayoutPanel3
.
Controls
.
Add
(
this
.
lblThisSta
,
0
,
2
);
this
.
tableLayoutPanel3
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
tableLayoutPanel3
.
Location
=
new
System
.
Drawing
.
Point
(
3
,
23
);
this
.
tableLayoutPanel3
.
Name
=
"tableLayoutPanel3"
;
this
.
tableLayoutPanel3
.
RowCount
=
3
;
this
.
tableLayoutPanel3
.
RowStyles
.
Add
(
new
System
.
Windows
.
Forms
.
RowStyle
(
System
.
Windows
.
Forms
.
SizeType
.
Percent
,
33.33333F
));
this
.
tableLayoutPanel3
.
RowStyles
.
Add
(
new
System
.
Windows
.
Forms
.
RowStyle
(
System
.
Windows
.
Forms
.
SizeType
.
Percent
,
33.33333F
));
this
.
tableLayoutPanel3
.
RowStyles
.
Add
(
new
System
.
Windows
.
Forms
.
RowStyle
(
System
.
Windows
.
Forms
.
SizeType
.
Percent
,
33.33333F
));
this
.
tableLayoutPanel3
.
Size
=
new
System
.
Drawing
.
Size
(
979
,
492
);
this
.
tableLayoutPanel3
.
TabIndex
=
282
;
//
// FrmBoxEquip
// FrmBoxEquip
//
//
this
.
AutoScaleDimensions
=
new
System
.
Drawing
.
SizeF
(
9F
,
20F
);
this
.
AutoScaleDimensions
=
new
System
.
Drawing
.
SizeF
(
9F
,
20F
);
...
@@ -557,10 +557,10 @@
...
@@ -557,10 +557,10 @@
this
.
tabControl1
.
ResumeLayout
(
false
);
this
.
tabControl1
.
ResumeLayout
(
false
);
this
.
tabPage3
.
ResumeLayout
(
false
);
this
.
tabPage3
.
ResumeLayout
(
false
);
this
.
groupBox6
.
ResumeLayout
(
false
);
this
.
groupBox6
.
ResumeLayout
(
false
);
this
.
tableLayoutPanel3
.
ResumeLayout
(
false
);
this
.
tabPage1
.
ResumeLayout
(
false
);
this
.
tabPage1
.
ResumeLayout
(
false
);
this
.
panBase
.
ResumeLayout
(
false
);
this
.
panBase
.
ResumeLayout
(
false
);
this
.
panBase
.
PerformLayout
();
this
.
panBase
.
PerformLayout
();
this
.
tableLayoutPanel3
.
ResumeLayout
(
false
);
this
.
ResumeLayout
(
false
);
this
.
ResumeLayout
(
false
);
}
}
...
...
source/XLRStoreClient/boxForm/FrmBoxEquip.cs
查看文件 @
367d54f
...
@@ -398,11 +398,6 @@ namespace OnlineStore.XLRStore
...
@@ -398,11 +398,6 @@ namespace OnlineStore.XLRStore
}
}
private
void
btnStart_Click
(
object
sender
,
EventArgs
e
)
private
void
btnStart_Click
(
object
sender
,
EventArgs
e
)
{
{
if
(
boxBean
.
IsDebug
)
{
MessageBox
.
Show
(
"调试模式不允许启动"
);
return
;
}
if
(
boxBean
.
runStatus
.
Equals
(
RunStatus
.
Wait
))
if
(
boxBean
.
runStatus
.
Equals
(
RunStatus
.
Wait
))
{
{
LogUtil
.
info
(
boxBean
.
Name
+
"点击:启用调试"
);
LogUtil
.
info
(
boxBean
.
Name
+
"点击:启用调试"
);
...
@@ -453,25 +448,19 @@ namespace OnlineStore.XLRStore
...
@@ -453,25 +448,19 @@ namespace OnlineStore.XLRStore
{
{
if
(!
boxBean
.
IsDebug
)
if
(!
boxBean
.
IsDebug
)
{
{
if
(!
boxBean
.
runStatus
.
Equals
(
RunStatus
.
Wait
))
DialogResult
result
=
MessageBox
.
Show
(
"是否切换到调试状态?"
,
"是否确认切换"
,
MessageBoxButtons
.
YesNo
,
MessageBoxIcon
.
Question
,
MessageBoxDefaultButton
.
Button1
);
if
(
result
.
Equals
(
DialogResult
.
Yes
))
{
{
MessageBox
.
Show
(
"请先停止设备再切换为调试模式!"
);
boxBean
.
IsDebug
=
true
;
chbDebug
.
Checked
=
false
;
boxBean
.
Config
.
IsDebug
=
1
;
StoreManager
.
SaveBoxConfig
(
boxBean
.
Config
);
boxBean
.
ChangeDebug
(
true
);
LogUtil
.
info
(
boxBean
.
Name
+
"用户切换到调试状态 "
);
}
else
{
chbDebug
.
Checked
=
false
;
}
}
//DialogResult result = MessageBox.Show("是否切换到调试状态?", "是否确认切换", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1);
//if (result.Equals(DialogResult.Yes))
//{
// boxBean.IsDebug = true;
// boxBean.Config.IsDebug = 1;
// StoreManager.SaveBoxConfig(boxBean.Config);
// boxBean.ChangeDebug(true);
// LogUtil.info(boxBean.Name + "用户切换到调试状态 ");
//}
//else
//{
// chbDebug.Checked=false;
//}
}
}
}
}
else
else
...
@@ -570,21 +559,6 @@ namespace OnlineStore.XLRStore
...
@@ -570,21 +559,6 @@ namespace OnlineStore.XLRStore
{
{
boxBean
.
StopRecord
();
boxBean
.
StopRecord
();
}
}
private
void
chbDebug_CheckedChanged_1
(
object
sender
,
EventArgs
e
)
{
}
private
void
chbDebug_CheckedChanged_2
(
object
sender
,
EventArgs
e
)
{
}
private
void
chbDebug_CheckedChanged_3
(
object
sender
,
EventArgs
e
)
{
}
}
}
}
}
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论