Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
李娜
/
SO908-XLRStore
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit df7955bc
由
LN
编写于
2021-05-24 10:39:53 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
增加暂存区料盘信息
1 个父辈
560d4c2f
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
84 行增加
和
43 行删除
source/DeviceLibrary/DeviceLibrary.csproj
source/DeviceLibrary/manager/BufferDataManager.cs
source/DeviceLibrary/manager/StoreManager.cs
source/LoadCVSLibrary/storeConfig/config/DeviceConfig.cs
source/XLRStoreClient/FrmXLRStore.Designer.cs
source/XLRStoreClient/FrmXLRStore.cs
source/DeviceLibrary/DeviceLibrary.csproj
查看文件 @
df7955b
...
@@ -75,6 +75,7 @@
...
@@ -75,6 +75,7 @@
</ItemGroup>
</ItemGroup>
<ItemGroup>
<ItemGroup>
<Compile Include="manager\agvClient\AgvClient.cs" />
<Compile Include="manager\agvClient\AgvClient.cs" />
<Compile Include="manager\BufferDataManager.cs" />
<Compile Include="manager\StoreManager.cs" />
<Compile Include="manager\StoreManager.cs" />
<Compile Include="deviceLibrary\RFID\RFIDManagercs.cs" />
<Compile Include="deviceLibrary\RFID\RFIDManagercs.cs" />
<Compile Include="manager\SServerManager.cs" />
<Compile Include="manager\SServerManager.cs" />
...
...
source/DeviceLibrary/manager/BufferDataManager.cs
0 → 100644
查看文件 @
df7955b
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
using
System.Threading.Tasks
;
namespace
OnlineStore.DeviceLibrary
{
public
class
BufferDataManager
{
/// <summary>
/// A进料上暂存区料盘信息,null时无料
/// </summary>
public
static
InOutPosInfo
AInStoreInfo
=
null
;
/// <summary>
/// A出料下暂存区料盘信息,null时无料
/// </summary>
public
static
InOutPosInfo
AOutStoreInfo
=
null
;
/// <summary>
/// B进料上暂存区料盘信息,null时无料
/// </summary>
public
static
InOutPosInfo
BInStoreInfo
=
null
;
/// <summary>
/// B出料下暂存区料盘信息,null时无料
/// </summary>
public
static
InOutPosInfo
BOutStoreInfo
=
null
;
}
}
source/DeviceLibrary/manager/StoreManager.cs
查看文件 @
df7955b
...
@@ -94,18 +94,19 @@ namespace OnlineStore.DeviceLibrary
...
@@ -94,18 +94,19 @@ namespace OnlineStore.DeviceLibrary
Config
=
CSVConfigReader
.
LoadBoxConfig
(
0
,
CID
,
DeviceType
.
Store
,
storeConfigPath
);
Config
=
CSVConfigReader
.
LoadBoxConfig
(
0
,
CID
,
DeviceType
.
Store
,
storeConfigPath
);
allConfigMap
.
Add
(
0
,
Config
);
allConfigMap
.
Add
(
0
,
Config
);
string
inputConfigPath
=
appPath
+
ConfigAppSettings
.
GetValue
(
Setting_Init
.
ConfigPath_Input
);
string
inputConfigPath
=
appPath
+
ConfigAppSettings
.
GetValue
(
Setting_Init
.
ConfigPath_Input
);
InputEquip_Config
inputConfig
=
CSVConfigReader
.
LoadInputConfig
(
1
,
DeviceType
.
InputEquip
,
inputConfigPath
);
InputEquip_Config
inputConfig
=
CSVConfigReader
.
LoadInputConfig
(
1
,
DeviceType
.
InputEquip
,
inputConfigPath
);
inputConfig
.
SetIO
(
1
);
inputConfig
.
SetIO
(
1
);
allConfigMap
.
Add
(
1
,
inputConfig
);
string
boxPath
=
appPath
+
ConfigAppSettings
.
GetValue
(
Setting_Init
.
ConfigPath_Box
);
string
boxPath
=
appPath
+
ConfigAppSettings
.
GetValue
(
Setting_Init
.
ConfigPath_Box
);
BoxEquip_Config
boxConfig
=
CSVConfigReader
.
LoadBoxConfig
(
2
,
DeviceType
.
BoxEquip
,
boxPath
);
BoxEquip_Config
boxConfig
=
CSVConfigReader
.
LoadBoxConfig
(
2
,
DeviceType
.
BoxEquip
,
boxPath
);
boxConfig
.
SetIO
(
2
);
boxConfig
.
SetIO
(
2
);
allConfigMap
.
Add
(
2
,
boxConfig
);
XLRStore
=
new
XLRStoreBean
(
Config
,
inputConfig
,
boxConfig
);
XLRStore
=
new
XLRStoreBean
(
Config
,
inputConfig
,
boxConfig
);
LogUtil
.
info
(
"加载 完成!"
);
LogUtil
.
info
(
"加载 完成!"
);
return
true
;
return
true
;
...
...
source/LoadCVSLibrary/storeConfig/config/DeviceConfig.cs
查看文件 @
df7955b
...
@@ -83,7 +83,7 @@ namespace OnlineStore.LoadCSVLibrary
...
@@ -83,7 +83,7 @@ namespace OnlineStore.LoadCSVLibrary
public
virtual
void
LoadConfig
(
List
<
ConfigBase
>
configList
)
public
virtual
void
LoadConfig
(
List
<
ConfigBase
>
configList
)
{
{
List
<
string
>
ioTypeList
=
IO_Type
.
GetTypeList
();
List
<
string
>
ioTypeList
=
IO_Type
.
GetTypeList
();
ioTypeList
=
new
List
<
string
>();
//
ioTypeList = new List<string>();
StringBuilder
builder
=
new
StringBuilder
(
"\r\n"
);
StringBuilder
builder
=
new
StringBuilder
(
"\r\n"
);
StringBuilder
proBuilder
=
new
StringBuilder
(
"\r\n"
);
StringBuilder
proBuilder
=
new
StringBuilder
(
"\r\n"
);
DIList
=
new
Dictionary
<
string
,
ConfigIO
>();
DIList
=
new
Dictionary
<
string
,
ConfigIO
>();
...
@@ -143,10 +143,10 @@ namespace OnlineStore.LoadCSVLibrary
...
@@ -143,10 +143,10 @@ namespace OnlineStore.LoadCSVLibrary
}
}
else
else
{
{
//
AddProBuffer(con, proBuilder);
AddProBuffer
(
con
,
proBuilder
);
LogUtil
.
error
(
"配置文件:"
+
this
.
ConfigFilePath
+
",属性名="
+
con
.
ProName
+
"的属性未找到匹配字段!"
);
LogUtil
.
error
(
"配置文件:"
+
this
.
ConfigFilePath
+
",属性名="
+
con
.
ProName
+
"的属性未找到匹配字段!"
);
}
}
AddProBuffer
(
con
,
proBuilder
);
//
AddProBuffer(con, proBuilder);
}
}
else
if
(
con
.
ProType
==
ConfigItemType
.
DI
)
else
if
(
con
.
ProType
==
ConfigItemType
.
DI
)
...
...
source/XLRStoreClient/FrmXLRStore.Designer.cs
查看文件 @
df7955b
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +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
.
lbl
CardMsg
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
lbl
BufferInfo
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
logBox
=
new
System
.
Windows
.
Forms
.
RichTextBox
();
this
.
logBox
=
new
System
.
Windows
.
Forms
.
RichTextBox
();
this
.
lblStatus
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
lblStatus
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
lblWarnMsg
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
lblWarnMsg
=
new
System
.
Windows
.
Forms
.
Label
();
...
@@ -104,29 +104,28 @@
...
@@ -104,29 +104,28 @@
this
.
tabPage1
.
Name
=
"tabPage1"
;
this
.
tabPage1
.
Name
=
"tabPage1"
;
this
.
tabPage1
.
Size
=
new
System
.
Drawing
.
Size
(
982
,
601
);
this
.
tabPage1
.
Size
=
new
System
.
Drawing
.
Size
(
982
,
601
);
this
.
tabPage1
.
TabIndex
=
0
;
this
.
tabPage1
.
TabIndex
=
0
;
this
.
tabPage1
.
Text
=
" 运行
日志
"
;
this
.
tabPage1
.
Text
=
" 运行
状态
"
;
this
.
tabPage1
.
UseVisualStyleBackColor
=
true
;
this
.
tabPage1
.
UseVisualStyleBackColor
=
true
;
//
//
// groupBox2
// groupBox2
//
//
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
.
Left
)
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Lef
t
)));
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Righ
t
)));
this
.
groupBox2
.
Controls
.
Add
(
this
.
lbl
CardMsg
);
this
.
groupBox2
.
Controls
.
Add
(
this
.
lbl
BufferInfo
);
this
.
groupBox2
.
Location
=
new
System
.
Drawing
.
Point
(
5
,
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
(
292
,
420
);
this
.
groupBox2
.
Size
=
new
System
.
Drawing
.
Size
(
971
,
184
);
this
.
groupBox2
.
TabIndex
=
200
;
this
.
groupBox2
.
TabIndex
=
200
;
this
.
groupBox2
.
TabStop
=
false
;
this
.
groupBox2
.
TabStop
=
false
;
//
//
// lbl
CardMsg
// lbl
BufferInfo
//
//
this
.
lblCardMsg
.
Anchor
=
((
System
.
Windows
.
Forms
.
AnchorStyles
)((((
System
.
Windows
.
Forms
.
AnchorStyles
.
Top
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Bottom
)
this
.
lblBufferInfo
.
AutoSize
=
true
;
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Left
)
this
.
lblBufferInfo
.
Location
=
new
System
.
Drawing
.
Point
(
7
,
17
);
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Right
)));
this
.
lblBufferInfo
.
Name
=
"lblBufferInfo"
;
this
.
lblCardMsg
.
Location
=
new
System
.
Drawing
.
Point
(
5
,
135
);
this
.
lblBufferInfo
.
Size
=
new
System
.
Drawing
.
Size
(
107
,
20
);
this
.
lblCardMsg
.
Name
=
"lblCardMsg"
;
this
.
lblBufferInfo
.
TabIndex
=
0
;
this
.
lblCardMsg
.
Size
=
new
System
.
Drawing
.
Size
(
279
,
268
);
this
.
lblBufferInfo
.
Text
=
"暂存区料盘信息"
;
this
.
lblCardMsg
.
TabIndex
=
198
;
//
//
// logBox
// logBox
//
//
...
@@ -134,9 +133,9 @@
...
@@ -134,9 +133,9 @@
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Left
)
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Left
)
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Right
)));
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Right
)));
this
.
logBox
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
logBox
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
logBox
.
Location
=
new
System
.
Drawing
.
Point
(
302
,
3
);
this
.
logBox
.
Location
=
new
System
.
Drawing
.
Point
(
5
,
19
3
);
this
.
logBox
.
Name
=
"logBox"
;
this
.
logBox
.
Name
=
"logBox"
;
this
.
logBox
.
Size
=
new
System
.
Drawing
.
Size
(
674
,
59
0
);
this
.
logBox
.
Size
=
new
System
.
Drawing
.
Size
(
971
,
40
0
);
this
.
logBox
.
TabIndex
=
106
;
this
.
logBox
.
TabIndex
=
106
;
this
.
logBox
.
Text
=
""
;
this
.
logBox
.
Text
=
""
;
this
.
logBox
.
VisibleChanged
+=
new
System
.
EventHandler
(
this
.
logBox_VisibleChanged
);
this
.
logBox
.
VisibleChanged
+=
new
System
.
EventHandler
(
this
.
logBox_VisibleChanged
);
...
@@ -226,54 +225,54 @@
...
@@ -226,54 +225,54 @@
// toolStripSeparator1
// toolStripSeparator1
//
//
this
.
toolStripSeparator1
.
Name
=
"toolStripSeparator1"
;
this
.
toolStripSeparator1
.
Name
=
"toolStripSeparator1"
;
this
.
toolStripSeparator1
.
Size
=
new
System
.
Drawing
.
Size
(
1
77
,
6
);
this
.
toolStripSeparator1
.
Size
=
new
System
.
Drawing
.
Size
(
1
14
,
6
);
//
//
// 启动AToolStripMenuItem
// 启动AToolStripMenuItem
//
//
this
.
启动
AToolStripMenuItem
.
Name
=
"启动AToolStripMenuItem"
;
this
.
启动
AToolStripMenuItem
.
Name
=
"启动AToolStripMenuItem"
;
this
.
启动
AToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
80
,
26
);
this
.
启动
AToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
17
,
26
);
this
.
启动
AToolStripMenuItem
.
Text
=
"启动 "
;
this
.
启动
AToolStripMenuItem
.
Text
=
"启动 "
;
this
.
启动
AToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
启动所有料仓
AToolStripMenuItem_Click
);
this
.
启动
AToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
启动所有料仓
AToolStripMenuItem_Click
);
//
//
// toolStripSeparator4
// toolStripSeparator4
//
//
this
.
toolStripSeparator4
.
Name
=
"toolStripSeparator4"
;
this
.
toolStripSeparator4
.
Name
=
"toolStripSeparator4"
;
this
.
toolStripSeparator4
.
Size
=
new
System
.
Drawing
.
Size
(
1
77
,
6
);
this
.
toolStripSeparator4
.
Size
=
new
System
.
Drawing
.
Size
(
1
14
,
6
);
//
//
// 复位RToolStripMenuItem
// 复位RToolStripMenuItem
//
//
this
.
复位
RToolStripMenuItem
.
Name
=
"复位RToolStripMenuItem"
;
this
.
复位
RToolStripMenuItem
.
Name
=
"复位RToolStripMenuItem"
;
this
.
复位
RToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
80
,
26
);
this
.
复位
RToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
17
,
26
);
this
.
复位
RToolStripMenuItem
.
Text
=
"复位"
;
this
.
复位
RToolStripMenuItem
.
Text
=
"复位"
;
this
.
复位
RToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
复位
RToolStripMenuItem_Click
);
this
.
复位
RToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
复位
RToolStripMenuItem_Click
);
//
//
// toolStripSeparator3
// toolStripSeparator3
//
//
this
.
toolStripSeparator3
.
Name
=
"toolStripSeparator3"
;
this
.
toolStripSeparator3
.
Name
=
"toolStripSeparator3"
;
this
.
toolStripSeparator3
.
Size
=
new
System
.
Drawing
.
Size
(
1
77
,
6
);
this
.
toolStripSeparator3
.
Size
=
new
System
.
Drawing
.
Size
(
1
14
,
6
);
//
//
// 停止TToolStripMenuItem
// 停止TToolStripMenuItem
//
//
this
.
停止
TToolStripMenuItem
.
Name
=
"停止TToolStripMenuItem"
;
this
.
停止
TToolStripMenuItem
.
Name
=
"停止TToolStripMenuItem"
;
this
.
停止
TToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
80
,
26
);
this
.
停止
TToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
17
,
26
);
this
.
停止
TToolStripMenuItem
.
Text
=
"停止"
;
this
.
停止
TToolStripMenuItem
.
Text
=
"停止"
;
this
.
停止
TToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
停止所有料仓
TToolStripMenuItem_Click
);
this
.
停止
TToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
停止所有料仓
TToolStripMenuItem_Click
);
//
//
// toolStripSeparator5
// toolStripSeparator5
//
//
this
.
toolStripSeparator5
.
Name
=
"toolStripSeparator5"
;
this
.
toolStripSeparator5
.
Name
=
"toolStripSeparator5"
;
this
.
toolStripSeparator5
.
Size
=
new
System
.
Drawing
.
Size
(
1
77
,
6
);
this
.
toolStripSeparator5
.
Size
=
new
System
.
Drawing
.
Size
(
1
14
,
6
);
//
//
// toolStripSeparator2
// toolStripSeparator2
//
//
this
.
toolStripSeparator2
.
Name
=
"toolStripSeparator2"
;
this
.
toolStripSeparator2
.
Name
=
"toolStripSeparator2"
;
this
.
toolStripSeparator2
.
Size
=
new
System
.
Drawing
.
Size
(
1
77
,
6
);
this
.
toolStripSeparator2
.
Size
=
new
System
.
Drawing
.
Size
(
1
14
,
6
);
this
.
toolStripSeparator2
.
Visible
=
false
;
this
.
toolStripSeparator2
.
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
17
,
26
);
this
.
退出
ToolStripMenuItem
.
Text
=
"退出"
;
this
.
退出
ToolStripMenuItem
.
Text
=
"退出"
;
this
.
退出
ToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
退出
ToolStripMenuItem_Click_1
);
this
.
退出
ToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
退出
ToolStripMenuItem_Click_1
);
//
//
...
@@ -293,36 +292,36 @@
...
@@ -293,36 +292,36 @@
// 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
=
"托盘编码"
;
//
//
// toolStripSeparator16
// toolStripSeparator16
//
//
this
.
toolStripSeparator16
.
Name
=
"toolStripSeparator16"
;
this
.
toolStripSeparator16
.
Name
=
"toolStripSeparator16"
;
this
.
toolStripSeparator16
.
Size
=
new
System
.
Drawing
.
Size
(
17
7
,
6
);
this
.
toolStripSeparator16
.
Size
=
new
System
.
Drawing
.
Size
(
17
3
,
6
);
//
//
// toolStripMenuItem3
// toolStripMenuItem3
//
//
this
.
toolStripMenuItem3
.
Name
=
"toolStripMenuItem3"
;
this
.
toolStripMenuItem3
.
Name
=
"toolStripMenuItem3"
;
this
.
toolStripMenuItem3
.
Size
=
new
System
.
Drawing
.
Size
(
1
80
,
26
);
this
.
toolStripMenuItem3
.
Size
=
new
System
.
Drawing
.
Size
(
1
76
,
26
);
this
.
toolStripMenuItem3
.
Text
=
"脆盘料号配置"
;
this
.
toolStripMenuItem3
.
Text
=
"脆盘料号配置"
;
this
.
toolStripMenuItem3
.
Click
+=
new
System
.
EventHandler
(
this
.
toolStripMenuItem3_Click
);
this
.
toolStripMenuItem3
.
Click
+=
new
System
.
EventHandler
(
this
.
toolStripMenuItem3_Click
);
//
//
...
@@ -341,31 +340,31 @@
...
@@ -341,31 +340,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
);
//
//
...
@@ -458,6 +457,7 @@
...
@@ -458,6 +457,7 @@
this
.
tabControl1
.
ResumeLayout
(
false
);
this
.
tabControl1
.
ResumeLayout
(
false
);
this
.
tabPage1
.
ResumeLayout
(
false
);
this
.
tabPage1
.
ResumeLayout
(
false
);
this
.
groupBox2
.
ResumeLayout
(
false
);
this
.
groupBox2
.
ResumeLayout
(
false
);
this
.
groupBox2
.
PerformLayout
();
this
.
contextMenuStrip1
.
ResumeLayout
(
false
);
this
.
contextMenuStrip1
.
ResumeLayout
(
false
);
this
.
menuStrip1
.
ResumeLayout
(
false
);
this
.
menuStrip1
.
ResumeLayout
(
false
);
this
.
menuStrip1
.
PerformLayout
();
this
.
menuStrip1
.
PerformLayout
();
...
@@ -508,10 +508,10 @@
...
@@ -508,10 +508,10 @@
private
System
.
Windows
.
Forms
.
ToolStripMenuItem
aGVCancelStateToolStripMenuItem
;
private
System
.
Windows
.
Forms
.
ToolStripMenuItem
aGVCancelStateToolStripMenuItem
;
private
System
.
Windows
.
Forms
.
ToolStripSeparator
toolStripSeparator17
;
private
System
.
Windows
.
Forms
.
ToolStripSeparator
toolStripSeparator17
;
private
System
.
Windows
.
Forms
.
ToolStripSeparator
toolStripSeparator25
;
private
System
.
Windows
.
Forms
.
ToolStripSeparator
toolStripSeparator25
;
private
System
.
Windows
.
Forms
.
Label
lblCardMsg
;
private
System
.
Windows
.
Forms
.
GroupBox
groupBox2
;
private
System
.
Windows
.
Forms
.
GroupBox
groupBox2
;
private
System
.
Windows
.
Forms
.
ToolStripMenuItem
toolStripMenuItem3
;
private
System
.
Windows
.
Forms
.
ToolStripMenuItem
toolStripMenuItem3
;
private
System
.
Windows
.
Forms
.
ToolStripSeparator
toolStripSeparator16
;
private
System
.
Windows
.
Forms
.
ToolStripSeparator
toolStripSeparator16
;
private
System
.
Windows
.
Forms
.
Label
lblBufferInfo
;
}
}
}
}
source/XLRStoreClient/FrmXLRStore.cs
查看文件 @
df7955b
...
@@ -372,7 +372,16 @@ namespace OnlineStore.XLRStore
...
@@ -372,7 +372,16 @@ namespace OnlineStore.XLRStore
lblWarnMsg
.
Text
=
warnMsg
;
lblWarnMsg
.
Text
=
warnMsg
;
lblCardMsg
.
Text
=
HuichuanLibrary
.
HCBoardManager
.
CardMsg
;
string
bufStr
=
""
;
bufStr
+=
"A进料暂存料盘:"
+
BufferDataManager
.
AInStoreInfo
?.
ToStr
()+
"\r\n"
;
bufStr
+=
"A出料暂存料盘:"
+
BufferDataManager
.
AOutStoreInfo
?.
ToStr
()
+
"\r\n"
;
bufStr
+=
"A进料暂存料盘:"
+
BufferDataManager
.
BInStoreInfo
?.
ToStr
()
+
"\r\n"
;
bufStr
+=
"A出料暂存料盘:"
+
BufferDataManager
.
BOutStoreInfo
?.
ToStr
()
+
""
;
lblBufferInfo
.
Text
=
bufStr
;
if
(
StoreBean
.
runStatus
>
RunStatus
.
Wait
)
if
(
StoreBean
.
runStatus
>
RunStatus
.
Wait
)
{
{
if
(
启动
AToolStripMenuItem
.
Enabled
.
Equals
(
true
))
if
(
启动
AToolStripMenuItem
.
Enabled
.
Equals
(
true
))
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论