Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
李娜
/
SO908-XLRStore
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 050b231d
由
张东亮
编写于
2021-09-22 11:05:00 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
存储机构-出库到缓存区时分两步,先松压紧轴再下降
1 个父辈
ebce9d59
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
24 行增加
和
16 行删除
source/DeviceLibrary/manager/model/DeviceStep.cs
source/DeviceLibrary/storeBean/boxBean/BoxEquip_OutExecute.cs
source/XLRStoreClient/boxForm/FrmAutoFindPos.Designer.cs
source/DeviceLibrary/manager/model/DeviceStep.cs
查看文件 @
050b231
...
@@ -319,9 +319,13 @@ namespace OnlineStore.DeviceLibrary
...
@@ -319,9 +319,13 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
/// </summary>
SO_17_InOutToBuff
,
SO_17_InOutToBuff
,
/// <summary>
/// <summary>
/// 料仓出库:放松料盘
/// 2. A/B面移栽压紧轴到P2压紧前点
/// </summary>
SO_18_ReleaseReel
,
/// <summary>
/// 料仓出库:把料盘放下
/// 料仓出库:把料盘放下
/// 1. 移栽升降轴到A/B下暂存区放料低点
/// 1. 移栽升降轴到A/B下暂存区放料低点
/// 2. A/B面移栽压紧轴到P2压紧前点
/// </summary>
/// </summary>
SO_18_PutReel
,
SO_18_PutReel
,
/// <summary>
/// <summary>
...
...
source/DeviceLibrary/storeBean/boxBean/BoxEquip_OutExecute.cs
查看文件 @
050b231
...
@@ -246,12 +246,16 @@ namespace OnlineStore.DeviceLibrary
...
@@ -246,12 +246,16 @@ namespace OnlineStore.DeviceLibrary
}
}
break
;
break
;
case
StepEnum
.
SO_17_InOutToBuff
:
case
StepEnum
.
SO_17_InOutToBuff
:
MoveInfo
.
NextMoveStep
(
StepEnum
.
SO_18_ReleaseReel
);
LogInfo
(
$
"出库 {MoveInfo.SLog}:松开料盘,移栽压紧轴到压紧前点P2"
);
ComAxis_To_P2
();
break
;
case
StepEnum
.
SO_18_ReleaseReel
:
MoveInfo
.
NextMoveStep
(
StepEnum
.
SO_18_PutReel
);
MoveInfo
.
NextMoveStep
(
StepEnum
.
SO_18_PutReel
);
LogInfo
(
$
"出库 {MoveInfo.SLog}:放料盘,移栽升降轴到下暂存区放料低点P5/P11
,移栽压紧轴到压紧前点P2
"
);
LogInfo
(
$
"出库 {MoveInfo.SLog}:放料盘,移栽升降轴到下暂存区放料低点P5/P11"
);
executeTime
=
(
DateTime
.
Now
-
startTime
).
TotalSeconds
.
ToString
(
"f2"
);
executeTime
=
(
DateTime
.
Now
-
startTime
).
TotalSeconds
.
ToString
(
"f2"
);
SetBoxStatus
(
DeviceStatus
.
OutStoreBoxEnd
,
RunStatus
.
Busy
,
MoveInfo
.
MoveParam
.
PosInfo
.
PosId
);
SetBoxStatus
(
DeviceStatus
.
OutStoreBoxEnd
,
RunStatus
.
Busy
,
MoveInfo
.
MoveParam
.
PosInfo
.
PosId
);
UpdownAxisTo_P5_P11
();
UpdownAxisTo_P5_P11
();
ComAxis_To_P2
();
break
;
break
;
case
StepEnum
.
SO_18_PutReel
:
case
StepEnum
.
SO_18_PutReel
:
MoveInfo
.
NextMoveStep
(
StepEnum
.
SO_19_InOutBackFromBuff
);
MoveInfo
.
NextMoveStep
(
StepEnum
.
SO_19_InOutBackFromBuff
);
...
...
source/XLRStoreClient/boxForm/FrmAutoFindPos.Designer.cs
查看文件 @
050b231
...
@@ -103,6 +103,7 @@
...
@@ -103,6 +103,7 @@
this
.
button10
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
button10
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnStartVision
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnStartVision
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
groupBox1
=
new
System
.
Windows
.
Forms
.
GroupBox
();
this
.
groupBox1
=
new
System
.
Windows
.
Forms
.
GroupBox
();
this
.
chkCloseOutStoreCheck
=
new
System
.
Windows
.
Forms
.
CheckBox
();
this
.
lblResult
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
lblResult
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
chkBoxCloseCam
=
new
System
.
Windows
.
Forms
.
CheckBox
();
this
.
chkBoxCloseCam
=
new
System
.
Windows
.
Forms
.
CheckBox
();
this
.
checkBoxOpenAuto
=
new
System
.
Windows
.
Forms
.
CheckBox
();
this
.
checkBoxOpenAuto
=
new
System
.
Windows
.
Forms
.
CheckBox
();
...
@@ -111,7 +112,6 @@
...
@@ -111,7 +112,6 @@
this
.
radioButton2
=
new
System
.
Windows
.
Forms
.
RadioButton
();
this
.
radioButton2
=
new
System
.
Windows
.
Forms
.
RadioButton
();
this
.
radioButton1
=
new
System
.
Windows
.
Forms
.
RadioButton
();
this
.
radioButton1
=
new
System
.
Windows
.
Forms
.
RadioButton
();
this
.
timer1
=
new
System
.
Windows
.
Forms
.
Timer
(
this
.
components
);
this
.
timer1
=
new
System
.
Windows
.
Forms
.
Timer
(
this
.
components
);
this
.
chkCloseOutStoreCheck
=
new
System
.
Windows
.
Forms
.
CheckBox
();
this
.
tableLayoutPanel1
.
SuspendLayout
();
this
.
tableLayoutPanel1
.
SuspendLayout
();
this
.
tabControl1
.
SuspendLayout
();
this
.
tabControl1
.
SuspendLayout
();
this
.
tabPage1
.
SuspendLayout
();
this
.
tabPage1
.
SuspendLayout
();
...
@@ -890,10 +890,21 @@
...
@@ -890,10 +890,21 @@
this
.
groupBox1
.
TabStop
=
false
;
this
.
groupBox1
.
TabStop
=
false
;
this
.
groupBox1
.
Text
=
"操作"
;
this
.
groupBox1
.
Text
=
"操作"
;
//
//
// chkCloseOutStoreCheck
//
this
.
chkCloseOutStoreCheck
.
AutoSize
=
true
;
this
.
chkCloseOutStoreCheck
.
Location
=
new
System
.
Drawing
.
Point
(
568
,
22
);
this
.
chkCloseOutStoreCheck
.
Name
=
"chkCloseOutStoreCheck"
;
this
.
chkCloseOutStoreCheck
.
Size
=
new
System
.
Drawing
.
Size
(
147
,
21
);
this
.
chkCloseOutStoreCheck
.
TabIndex
=
9
;
this
.
chkCloseOutStoreCheck
.
Text
=
"关闭出库前的碗里检查"
;
this
.
chkCloseOutStoreCheck
.
UseVisualStyleBackColor
=
true
;
this
.
chkCloseOutStoreCheck
.
CheckedChanged
+=
new
System
.
EventHandler
(
this
.
chkCloseOutStoreCheck_CheckedChanged
);
//
// lblResult
// lblResult
//
//
this
.
lblResult
.
AutoSize
=
true
;
this
.
lblResult
.
AutoSize
=
true
;
this
.
lblResult
.
Location
=
new
System
.
Drawing
.
Point
(
56
3
,
49
);
this
.
lblResult
.
Location
=
new
System
.
Drawing
.
Point
(
56
5
,
58
);
this
.
lblResult
.
Name
=
"lblResult"
;
this
.
lblResult
.
Name
=
"lblResult"
;
this
.
lblResult
.
Size
=
new
System
.
Drawing
.
Size
(
0
,
17
);
this
.
lblResult
.
Size
=
new
System
.
Drawing
.
Size
(
0
,
17
);
this
.
lblResult
.
TabIndex
=
8
;
this
.
lblResult
.
TabIndex
=
8
;
...
@@ -974,17 +985,6 @@
...
@@ -974,17 +985,6 @@
this
.
timer1
.
Interval
=
1000
;
this
.
timer1
.
Interval
=
1000
;
this
.
timer1
.
Tick
+=
new
System
.
EventHandler
(
this
.
timer1_Tick
);
this
.
timer1
.
Tick
+=
new
System
.
EventHandler
(
this
.
timer1_Tick
);
//
//
// chkCloseOutStoreCheck
//
this
.
chkCloseOutStoreCheck
.
AutoSize
=
true
;
this
.
chkCloseOutStoreCheck
.
Location
=
new
System
.
Drawing
.
Point
(
569
,
45
);
this
.
chkCloseOutStoreCheck
.
Name
=
"chkCloseOutStoreCheck"
;
this
.
chkCloseOutStoreCheck
.
Size
=
new
System
.
Drawing
.
Size
(
147
,
21
);
this
.
chkCloseOutStoreCheck
.
TabIndex
=
9
;
this
.
chkCloseOutStoreCheck
.
Text
=
"关闭出库前的碗里检查"
;
this
.
chkCloseOutStoreCheck
.
UseVisualStyleBackColor
=
true
;
this
.
chkCloseOutStoreCheck
.
CheckedChanged
+=
new
System
.
EventHandler
(
this
.
chkCloseOutStoreCheck_CheckedChanged
);
//
// FrmAutoFindPos
// FrmAutoFindPos
//
//
this
.
AutoScaleDimensions
=
new
System
.
Drawing
.
SizeF
(
7F
,
17F
);
this
.
AutoScaleDimensions
=
new
System
.
Drawing
.
SizeF
(
7F
,
17F
);
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论