Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
RC1250-ACPackingStore
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit b07881a1
由
LN
编写于
2020-01-05 14:14:38 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
1
1 个父辈
5f25134d
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
108 行增加
和
123 行删除
source/ACPackingStore/FrmIOStatus.Designer.cs
source/ACPackingStore/FrmIOStatus.cs
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean.cs
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Partial.cs
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Shelf.cs
source/DeviceLibrary/ACPackingStore/PackingStoreBean.cs
source/DeviceLibrary/ACPackingStore/StoreManager.cs
source/DeviceLibrary/DeviceLibrary.csproj
source/DeviceLibrary/store/StoreStep.cs
source/ACPackingStore/FrmIOStatus.Designer.cs
查看文件 @
b07881a
...
@@ -19,6 +19,8 @@
...
@@ -19,6 +19,8 @@
this
.
timer1
=
new
System
.
Windows
.
Forms
.
Timer
(
this
.
components
);
this
.
timer1
=
new
System
.
Windows
.
Forms
.
Timer
(
this
.
components
);
this
.
button1
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
button1
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
groupBox1
=
new
System
.
Windows
.
Forms
.
GroupBox
();
this
.
groupBox1
=
new
System
.
Windows
.
Forms
.
GroupBox
();
this
.
btnNGlineStop
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnNgLine
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnDoorStop
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnDoorStop
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnBlow
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnBlow
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnStoreOn
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnStoreOn
=
new
System
.
Windows
.
Forms
.
Button
();
...
@@ -48,8 +50,7 @@
...
@@ -48,8 +50,7 @@
this
.
tableLayoutPanel2
=
new
System
.
Windows
.
Forms
.
TableLayoutPanel
();
this
.
tableLayoutPanel2
=
new
System
.
Windows
.
Forms
.
TableLayoutPanel
();
this
.
groupBox3
=
new
System
.
Windows
.
Forms
.
GroupBox
();
this
.
groupBox3
=
new
System
.
Windows
.
Forms
.
GroupBox
();
this
.
tableLayoutPanel1
=
new
System
.
Windows
.
Forms
.
TableLayoutPanel
();
this
.
tableLayoutPanel1
=
new
System
.
Windows
.
Forms
.
TableLayoutPanel
();
this
.
btnNGlineStop
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnLineBack
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnNgLine
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
groupBox1
.
SuspendLayout
();
this
.
groupBox1
.
SuspendLayout
();
this
.
groupBox4
.
SuspendLayout
();
this
.
groupBox4
.
SuspendLayout
();
this
.
groupBox3
.
SuspendLayout
();
this
.
groupBox3
.
SuspendLayout
();
...
@@ -75,6 +76,7 @@
...
@@ -75,6 +76,7 @@
//
//
this
.
groupBox1
.
Anchor
=
((
System
.
Windows
.
Forms
.
AnchorStyles
)(((
System
.
Windows
.
Forms
.
AnchorStyles
.
Top
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Bottom
)
this
.
groupBox1
.
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
.
groupBox1
.
Controls
.
Add
(
this
.
btnLineBack
);
this
.
groupBox1
.
Controls
.
Add
(
this
.
btnNGlineStop
);
this
.
groupBox1
.
Controls
.
Add
(
this
.
btnNGlineStop
);
this
.
groupBox1
.
Controls
.
Add
(
this
.
btnNgLine
);
this
.
groupBox1
.
Controls
.
Add
(
this
.
btnNgLine
);
this
.
groupBox1
.
Controls
.
Add
(
this
.
btnDoorStop
);
this
.
groupBox1
.
Controls
.
Add
(
this
.
btnDoorStop
);
...
@@ -110,6 +112,30 @@
...
@@ -110,6 +112,30 @@
this
.
groupBox1
.
TabStop
=
false
;
this
.
groupBox1
.
TabStop
=
false
;
this
.
groupBox1
.
Text
=
"DO写入"
;
this
.
groupBox1
.
Text
=
"DO写入"
;
//
//
// btnNGlineStop
//
this
.
btnNGlineStop
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
this
.
btnNGlineStop
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnNGlineStop
.
Location
=
new
System
.
Drawing
.
Point
(
175
,
210
);
this
.
btnNGlineStop
.
Name
=
"btnNGlineStop"
;
this
.
btnNGlineStop
.
Size
=
new
System
.
Drawing
.
Size
(
125
,
34
);
this
.
btnNGlineStop
.
TabIndex
=
298
;
this
.
btnNGlineStop
.
Text
=
"NG线体停止"
;
this
.
btnNGlineStop
.
UseVisualStyleBackColor
=
false
;
this
.
btnNGlineStop
.
Click
+=
new
System
.
EventHandler
(
this
.
btnNGlineStop_Click
);
//
// btnNgLine
//
this
.
btnNgLine
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
this
.
btnNgLine
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnNgLine
.
Location
=
new
System
.
Drawing
.
Point
(
12
,
210
);
this
.
btnNgLine
.
Name
=
"btnNgLine"
;
this
.
btnNgLine
.
Size
=
new
System
.
Drawing
.
Size
(
125
,
34
);
this
.
btnNgLine
.
TabIndex
=
297
;
this
.
btnNgLine
.
Text
=
"NG线体运转"
;
this
.
btnNgLine
.
UseVisualStyleBackColor
=
false
;
this
.
btnNgLine
.
Click
+=
new
System
.
EventHandler
(
this
.
btnNgLine_Click
);
//
// btnDoorStop
// btnDoorStop
//
//
this
.
btnDoorStop
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
this
.
btnDoorStop
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
...
@@ -150,11 +176,11 @@
...
@@ -150,11 +176,11 @@
//
//
this
.
btnStopMove
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
this
.
btnStopMove
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
this
.
btnStopMove
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnStopMove
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnStopMove
.
Location
=
new
System
.
Drawing
.
Point
(
175
,
429
);
this
.
btnStopMove
.
Location
=
new
System
.
Drawing
.
Point
(
208
,
428
);
this
.
btnStopMove
.
Name
=
"btnStopMove"
;
this
.
btnStopMove
.
Name
=
"btnStopMove"
;
this
.
btnStopMove
.
Size
=
new
System
.
Drawing
.
Size
(
125
,
34
);
this
.
btnStopMove
.
Size
=
new
System
.
Drawing
.
Size
(
92
,
34
);
this
.
btnStopMove
.
TabIndex
=
292
;
this
.
btnStopMove
.
TabIndex
=
292
;
this
.
btnStopMove
.
Text
=
"线体停止
转动
"
;
this
.
btnStopMove
.
Text
=
"线体停止"
;
this
.
btnStopMove
.
UseVisualStyleBackColor
=
false
;
this
.
btnStopMove
.
UseVisualStyleBackColor
=
false
;
this
.
btnStopMove
.
Click
+=
new
System
.
EventHandler
(
this
.
btnStopMove_Click
);
this
.
btnStopMove
.
Click
+=
new
System
.
EventHandler
(
this
.
btnStopMove_Click
);
//
//
...
@@ -162,9 +188,9 @@
...
@@ -162,9 +188,9 @@
//
//
this
.
button4
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
this
.
button4
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
this
.
button4
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
button4
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
button4
.
Location
=
new
System
.
Drawing
.
Point
(
12
,
42
9
);
this
.
button4
.
Location
=
new
System
.
Drawing
.
Point
(
12
,
42
8
);
this
.
button4
.
Name
=
"button4"
;
this
.
button4
.
Name
=
"button4"
;
this
.
button4
.
Size
=
new
System
.
Drawing
.
Size
(
125
,
34
);
this
.
button4
.
Size
=
new
System
.
Drawing
.
Size
(
92
,
34
);
this
.
button4
.
TabIndex
=
291
;
this
.
button4
.
TabIndex
=
291
;
this
.
button4
.
Text
=
"线体正转"
;
this
.
button4
.
Text
=
"线体正转"
;
this
.
button4
.
UseVisualStyleBackColor
=
false
;
this
.
button4
.
UseVisualStyleBackColor
=
false
;
...
@@ -463,29 +489,17 @@
...
@@ -463,29 +489,17 @@
this
.
tableLayoutPanel1
.
Size
=
new
System
.
Drawing
.
Size
(
218
,
570
);
this
.
tableLayoutPanel1
.
Size
=
new
System
.
Drawing
.
Size
(
218
,
570
);
this
.
tableLayoutPanel1
.
TabIndex
=
102
;
this
.
tableLayoutPanel1
.
TabIndex
=
102
;
//
//
// btn
NGlineStop
// btn
LineBack
//
//
this
.
btnNGlineStop
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
this
.
btnLineBack
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
this
.
btnNGlineStop
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnLineBack
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnNGlineStop
.
Location
=
new
System
.
Drawing
.
Point
(
175
,
210
);
this
.
btnLineBack
.
Location
=
new
System
.
Drawing
.
Point
(
110
,
428
);
this
.
btnNGlineStop
.
Name
=
"btnNGlineStop"
;
this
.
btnLineBack
.
Name
=
"btnLineBack"
;
this
.
btnNGlineStop
.
Size
=
new
System
.
Drawing
.
Size
(
125
,
34
);
this
.
btnLineBack
.
Size
=
new
System
.
Drawing
.
Size
(
92
,
34
);
this
.
btnNGlineStop
.
TabIndex
=
298
;
this
.
btnLineBack
.
TabIndex
=
299
;
this
.
btnNGlineStop
.
Text
=
"NG线体停止"
;
this
.
btnLineBack
.
Text
=
"线体反转"
;
this
.
btnNGlineStop
.
UseVisualStyleBackColor
=
false
;
this
.
btnLineBack
.
UseVisualStyleBackColor
=
false
;
this
.
btnNGlineStop
.
Click
+=
new
System
.
EventHandler
(
this
.
btnNGlineStop_Click
);
this
.
btnLineBack
.
Click
+=
new
System
.
EventHandler
(
this
.
btnLineBack_Click
);
//
// btnNgLine
//
this
.
btnNgLine
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
this
.
btnNgLine
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnNgLine
.
Location
=
new
System
.
Drawing
.
Point
(
12
,
210
);
this
.
btnNgLine
.
Name
=
"btnNgLine"
;
this
.
btnNgLine
.
Size
=
new
System
.
Drawing
.
Size
(
125
,
34
);
this
.
btnNgLine
.
TabIndex
=
297
;
this
.
btnNgLine
.
Text
=
"NG线体运转"
;
this
.
btnNgLine
.
UseVisualStyleBackColor
=
false
;
this
.
btnNgLine
.
Click
+=
new
System
.
EventHandler
(
this
.
btnNgLine_Click
);
//
//
// FrmIOStatus
// FrmIOStatus
//
//
...
@@ -547,6 +561,7 @@
...
@@ -547,6 +561,7 @@
private
System
.
Windows
.
Forms
.
Button
btnDoorStop
;
private
System
.
Windows
.
Forms
.
Button
btnDoorStop
;
private
System
.
Windows
.
Forms
.
Button
btnNGlineStop
;
private
System
.
Windows
.
Forms
.
Button
btnNGlineStop
;
private
System
.
Windows
.
Forms
.
Button
btnNgLine
;
private
System
.
Windows
.
Forms
.
Button
btnNgLine
;
private
System
.
Windows
.
Forms
.
Button
btnLineBack
;
}
}
}
}
source/ACPackingStore/FrmIOStatus.cs
查看文件 @
b07881a
...
@@ -296,13 +296,15 @@ namespace OnlineStore.ACPackingStore
...
@@ -296,13 +296,15 @@ namespace OnlineStore.ACPackingStore
private
void
button4_Click
(
object
sender
,
EventArgs
e
)
private
void
button4_Click
(
object
sender
,
EventArgs
e
)
{
{
BtnMove
(
button4
,
"线体正转"
,
"线体反转"
,
IO_Type
.
Line_Run
,
IO_Type
.
Line_BackRun
);
//BtnMove(button4, "线体正转", "线体反转", IO_Type.Line_Run, IO_Type.Line_BackRun);
boxBean
.
LineRun
();
}
}
private
void
btnStopMove_Click
(
object
sender
,
EventArgs
e
)
private
void
btnStopMove_Click
(
object
sender
,
EventArgs
e
)
{
{
boxBean
.
IOMove
(
IO_Type
.
Line_Run
,
IO_VALUE
.
LOW
);
//boxBean.IOMove(IO_Type.Line_Run, IO_VALUE.LOW);
boxBean
.
IOMove
(
IO_Type
.
Line_BackRun
,
IO_VALUE
.
LOW
);
//boxBean.IOMove(IO_Type.Line_BackRun, IO_VALUE.LOW);
boxBean
.
LineStop
();
}
}
private
void
btnStoreOn_Click
(
object
sender
,
EventArgs
e
)
private
void
btnStoreOn_Click
(
object
sender
,
EventArgs
e
)
...
@@ -358,5 +360,10 @@ namespace OnlineStore.ACPackingStore
...
@@ -358,5 +360,10 @@ namespace OnlineStore.ACPackingStore
{
{
boxBean
.
IOMove
(
IO_Type
.
NGLine_Run
,
IO_VALUE
.
LOW
);
boxBean
.
IOMove
(
IO_Type
.
NGLine_Run
,
IO_VALUE
.
LOW
);
}
}
private
void
btnLineBack_Click
(
object
sender
,
EventArgs
e
)
{
boxBean
.
LineBackRun
();
}
}
}
}
}
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean.cs
查看文件 @
b07881a
此文件的差异被折叠,
点击展开。
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Partial.cs
查看文件 @
b07881a
此文件的差异被折叠,
点击展开。
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Shelf.cs
0 → 100644
查看文件 @
b07881a
此文件的差异被折叠,
点击展开。
source/DeviceLibrary/ACPackingStore/PackingStoreBean.cs
查看文件 @
b07881a
...
@@ -18,13 +18,11 @@ namespace OnlineStore.DeviceLibrary
...
@@ -18,13 +18,11 @@ namespace OnlineStore.DeviceLibrary
/// 流水线自动料仓-流水线类
/// 流水线自动料仓-流水线类
/// </summary>
/// </summary>
public
partial
class
PackingStoreBean
:
KTK_Store
public
partial
class
PackingStoreBean
:
KTK_Store
{
{
/// <summary>
/// <summary>
/// 灯闪烁定时器
/// 灯闪烁定时器
/// </summary>
/// </summary>
private
System
.
Timers
.
Timer
ledProcessTimer
=
null
;
private
System
.
Timers
.
Timer
ledProcessTimer
=
null
;
public
Dictionary
<
int
,
AC_BOX_Config
>
BoxConfigMap
{
get
;
set
;
}
public
Dictionary
<
int
,
AC_BOX_Config
>
BoxConfigMap
{
get
;
set
;
}
public
Dictionary
<
int
,
AC_BOX_Bean
>
BoxMap
=
new
Dictionary
<
int
,
AC_BOX_Bean
>();
public
Dictionary
<
int
,
AC_BOX_Bean
>
BoxMap
=
new
Dictionary
<
int
,
AC_BOX_Bean
>();
...
@@ -62,12 +60,10 @@ namespace OnlineStore.DeviceLibrary
...
@@ -62,12 +60,10 @@ namespace OnlineStore.DeviceLibrary
//增加站号名称
//增加站号名称
AgvClient
.
NodeList
.
Add
(
config
.
AgvNodeName
);
AgvClient
.
NodeList
.
Add
(
config
.
AgvNodeName
);
AddDeviceName
(
ioList
,
config
.
DIODeviceNameList
);
AddDeviceName
(
ioList
,
config
.
DIODeviceNameList
);
BoxMap
.
Add
(
config
.
DeviceID
,
equip
);
BoxMap
.
Add
(
config
.
DeviceID
,
equip
);
BoxConfigMap
.
Add
(
config
.
DeviceID
,
config
);
BoxConfigMap
.
Add
(
config
.
DeviceID
,
config
);
rfidList
.
Add
(
config
.
RFID_IP
);
rfidList
.
Add
(
config
.
RFID_IP
);
}
}
IOManager
.
Init
();
IOManager
.
Init
();
...
@@ -86,14 +82,11 @@ namespace OnlineStore.DeviceLibrary
...
@@ -86,14 +82,11 @@ namespace OnlineStore.DeviceLibrary
IOMove
(
IO_Type
.
Alarm_HddLed
,
IO_VALUE
.
LOW
);
IOMove
(
IO_Type
.
Alarm_HddLed
,
IO_VALUE
.
LOW
);
IOMove
(
IO_Type
.
AutoRun_HddLed
,
IO_VALUE
.
LOW
);
IOMove
(
IO_Type
.
AutoRun_HddLed
,
IO_VALUE
.
LOW
);
IOMove
(
IO_Type
.
RunSign_HddLed
,
IO_VALUE
.
LOW
);
IOMove
(
IO_Type
.
RunSign_HddLed
,
IO_VALUE
.
LOW
);
mainTimer
.
Enabled
=
true
;
mainTimer
.
Enabled
=
true
;
canStart
=
true
;
canStart
=
true
;
});
});
}
}
private
void
AddDeviceName
(
List
<
string
>
targetList
,
List
<
string
>
list
)
private
void
AddDeviceName
(
List
<
string
>
targetList
,
List
<
string
>
list
)
{
{
foreach
(
string
str
in
list
)
foreach
(
string
str
in
list
)
...
@@ -106,21 +99,16 @@ namespace OnlineStore.DeviceLibrary
...
@@ -106,21 +99,16 @@ namespace OnlineStore.DeviceLibrary
}
}
public
void
InitTimer
()
public
void
InitTimer
()
{
{
ledProcessTimer
=
new
System
.
Timers
.
Timer
();
ledProcessTimer
=
new
System
.
Timers
.
Timer
();
ledProcessTimer
.
Interval
=
1000
;
ledProcessTimer
.
Interval
=
1000
;
ledProcessTimer
.
Elapsed
+=
LedProcess
;
ledProcessTimer
.
Elapsed
+=
LedProcess
;
ledProcessTimer
.
AutoReset
=
true
;
ledProcessTimer
.
AutoReset
=
true
;
ledProcessTimer
.
Enabled
=
false
;
ledProcessTimer
.
Enabled
=
false
;
}
}
private
void
IoCheckTimerProcess
(
object
sender
,
ElapsedEventArgs
e
)
private
void
IoCheckTimerProcess
(
object
sender
,
ElapsedEventArgs
e
)
{
{
}
}
#
endregion
#
endregion
public
override
bool
StartRun
(
bool
isDebug
=
false
)
public
override
bool
StartRun
(
bool
isDebug
=
false
)
...
@@ -204,8 +192,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -204,8 +192,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil
.
info
(
Name
+
"收到复位信号,"
+
equip
.
Name
+
" 正常无报警,不需要复位"
);
LogUtil
.
info
(
Name
+
"收到复位信号,"
+
equip
.
Name
+
" 正常无报警,不需要复位"
);
}
}
}
}
}
}
mainTimer
.
Enabled
=
true
;
mainTimer
.
Enabled
=
true
;
}
}
...
@@ -250,10 +237,8 @@ namespace OnlineStore.DeviceLibrary
...
@@ -250,10 +237,8 @@ namespace OnlineStore.DeviceLibrary
if
(
box
.
storeRunStatus
>
runs
)
if
(
box
.
storeRunStatus
>
runs
)
{
{
runs
=
box
.
storeRunStatus
;
runs
=
box
.
storeRunStatus
;
}
}
}
}
//黄灯
//黄灯
if
(
runs
.
Equals
(
StoreRunStatus
.
HomeMoving
)
||
runs
.
Equals
(
StoreRunStatus
.
Reset
))
if
(
runs
.
Equals
(
StoreRunStatus
.
HomeMoving
)
||
runs
.
Equals
(
StoreRunStatus
.
Reset
))
...
@@ -267,24 +252,18 @@ namespace OnlineStore.DeviceLibrary
...
@@ -267,24 +252,18 @@ namespace OnlineStore.DeviceLibrary
{
{
IOMove
(
IO_Type
.
RunSign_HddLed
,
IO_VALUE
.
HIGH
);
IOMove
(
IO_Type
.
RunSign_HddLed
,
IO_VALUE
.
HIGH
);
}
}
}
}
else
else
{
{
if
(
IsDoValue
(
IO_Type
.
RunSign_HddLed
,
IO_VALUE
.
HIGH
))
if
(
IsDoValue
(
IO_Type
.
RunSign_HddLed
,
IO_VALUE
.
HIGH
))
{
{
IOMove
(
IO_Type
.
RunSign_HddLed
,
IO_VALUE
.
LOW
);
IOMove
(
IO_Type
.
RunSign_HddLed
,
IO_VALUE
.
LOW
);
}
}
}
}
if
(
alarmType
.
Equals
(
StoreAlarmType
.
None
).
Equals
(
false
)
||
isNoAirCheck
||
isInSuddenDown
)
if
(
alarmType
.
Equals
(
StoreAlarmType
.
None
).
Equals
(
false
)
||
isNoAirCheck
||
isInSuddenDown
)
{
{
isNeedAlarmLed
=
true
;
isNeedAlarmLed
=
true
;
}
}
//忙碌中,判断是否有移栽在出入库执行,绿灯闪烁
//忙碌中,判断是否有移栽在出入库执行,绿灯闪烁
if
(
isInOut
)
if
(
isInOut
)
{
{
...
@@ -331,64 +310,16 @@ namespace OnlineStore.DeviceLibrary
...
@@ -331,64 +310,16 @@ namespace OnlineStore.DeviceLibrary
{
{
return
IOValue
(
ioType
).
Equals
(
ioValue
);
return
IOValue
(
ioType
).
Equals
(
ioValue
);
}
}
#
endregion
#
endregion
/// <summary>
/// <summary>
/// 定时处理,监听信号,监听IO
/// 定时处理,监听信号,监听IO
/// </summary>
/// </summary>
protected
override
void
timersTimer_Elapsed
(
object
sender
,
ElapsedEventArgs
e
)
protected
override
void
timersTimer_Elapsed
(
object
sender
,
ElapsedEventArgs
e
)
{
{
//try
BusyMoveProcess
();
//{
}
// DateTime time = DateTime.Now;
// if (storeRunStatus.Equals(StoreRunStatus.Wait))
// {
// //取新的Io状态
// IO_VALUE fuweiValue = IOValue(IO_Type.Reset_BTN);
// IO_VALUE lastFuwei = DILastValueMap[IO_Type.Reset_BTN];
// addLastDI(IO_Type.Reset_BTN, fuweiValue);
// bool isAutoStart = ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun) == 1;
// //收到复位信号后启动
// if (isAutoStart && fuweiValue.Equals(IO_VALUE.HIGH) && lastFuwei.Equals(IO_VALUE.LOW))
// {
// //没有启动时收到复位按钮,相当于启动按钮
// LogUtil.info( Name + "没有启动时收到复位按钮,相当于启动按钮,开始调用启动方法!");
// bool isOk = StartRun();
// if (!isOk)
// {
// LogUtil.error("启动失败,等待下次启动");
// mainTimer.Enabled = true;
// }
// }
// return;
// }
// //判断急停
// else if (this.storeRunStatus >= StoreRunStatus.HomeMoving)
// {
// foreach (AC_BOX_Bean box in this.BoxMap.Values)
// {
// if (!box.IsDebug)
// {
// box.TimerProcess();
// }
// }
// }
//}
//catch (Exception ex)
//{
// LogUtil.error(Name + "主定时器出错:" + ex.ToString());
//}
//Thread.Sleep(1);
BusyMoveProcess
();
}
public
override
void
StopMove
()
public
override
void
StopMove
()
{
{
foreach
(
AC_BOX_Bean
equip
in
this
.
BoxMap
.
Values
)
foreach
(
AC_BOX_Bean
equip
in
this
.
BoxMap
.
Values
)
{
{
// if (!equip.IsDebug)
// if (!equip.IsDebug)
...
@@ -396,8 +327,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -396,8 +327,7 @@ namespace OnlineStore.DeviceLibrary
equip
.
StopMove
();
equip
.
StopMove
();
}
}
}
}
MoveInfo
.
EndMove
();
MoveInfo
.
EndMove
();
}
}
protected
override
void
ResetProcess
()
protected
override
void
ResetProcess
()
...
...
source/DeviceLibrary/ACPackingStore/StoreManager.cs
查看文件 @
b07881a
...
@@ -323,6 +323,26 @@ namespace OnlineStore.DeviceLibrary
...
@@ -323,6 +323,26 @@ namespace OnlineStore.DeviceLibrary
}
}
return
""
;
return
""
;
}
}
public
static
string
ProcessCode
(
int
LastWidth
,
int
LastHeight
,
List
<
string
>
LastScanCodes
)
{
string
message
=
""
;
string
spiltStr
=
"##"
;
string
codeSize
=
LastWidth
+
"x"
+
LastHeight
;
foreach
(
string
str
in
LastScanCodes
)
{
if
(
str
.
Trim
().
Equals
(
""
))
{
continue
;
}
string
code
=
"=1+0x0-"
+
codeSize
+
"="
+
str
.
Trim
();
if
(!
String
.
IsNullOrEmpty
(
code
))
{
message
=
message
+
code
+
spiltStr
;
}
}
return
message
;
}
}
}
public
class
ServerData
public
class
ServerData
{
{
...
...
source/DeviceLibrary/DeviceLibrary.csproj
查看文件 @
b07881a
...
@@ -68,6 +68,7 @@
...
@@ -68,6 +68,7 @@
<ItemGroup>
<ItemGroup>
<Compile Include="ACPackingStore\AC_BOX_Bean.cs" />
<Compile Include="ACPackingStore\AC_BOX_Bean.cs" />
<Compile Include="ACPackingStore\AC_BOX_Bean_Partial.cs" />
<Compile Include="ACPackingStore\AC_BOX_Bean_Partial.cs" />
<Compile Include="ACPackingStore\AC_BOX_Bean_Shelf.cs" />
<Compile Include="ACPackingStore\EnteryDoorBean.cs" />
<Compile Include="ACPackingStore\EnteryDoorBean.cs" />
<Compile Include="ACPackingStore\HumitureBean.cs" />
<Compile Include="ACPackingStore\HumitureBean.cs" />
<Compile Include="ACPackingStore\PackingStoreBean.cs" />
<Compile Include="ACPackingStore\PackingStoreBean.cs" />
...
...
source/DeviceLibrary/store/StoreStep.cs
查看文件 @
b07881a
...
@@ -423,17 +423,29 @@ namespace OnlineStore.DeviceLibrary
...
@@ -423,17 +423,29 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
/// </summary>
BS_03_DoorOpen
=
4003
,
BS_03_DoorOpen
=
4003
,
/// <summary>
/// <summary>
/// 通知AGV准备空车
/// </summary>
BS_04_ReadyEmpty
=
4004
,
/// <summary>
/// 送出空料架:线体反转
/// 送出空料架:线体反转
/// </summary>
/// </summary>
BS_0
4_LineBack
=
4004
,
BS_0
5_LineBackRun
=
4005
,
/// <summary>
/// <summary>
/// 送出空料架:等待取料工位无信号,入料口有信号
/// 送出空料架:等待取料工位无信号,入料口有信号
/// </summary>
/// </summary>
BS_05_WaitInLineSingle
=
4005
,
BS_06_WaitInLineSingle
=
4006
,
/// <summary>
/// 送出空料架:再转动3000时间
/// </summary>
BS_07_WaitTime
=
4007
,
/// <summary>
/// 送出空料架:等待AGV离开后关闭仓门
/// </summary>
BS_08_WaitAGVLeave
=
4008
,
/// <summary>
/// <summary>
/// 送出空料架:
再转动300时间
/// 送出空料架:
关闭仓门
/// </summary>
/// </summary>
BS_0
6_WaitTime
=
4006
,
BS_0
9_CloseDoor
=
4009
,
///// <summary>
///// <summary>
///// 送出空料架:停止转动
///// 送出空料架:停止转动
///// </summary>
///// </summary>
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论