Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
李娜
/
SO908-XLRStore
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit ee4c219c
由
张东亮
编写于
2023-07-12 09:44:39 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
出库前关闭碗里检查
1 个父辈
429ebc0b
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
1 行增加
和
20 行删除
source/DeviceLibrary/storeBean/boxBean/BoxEquip_Partial.cs
source/XLRStoreClient/boxForm/FrmAutoFindPos.Designer.cs
source/XLRStoreClient/boxForm/FrmAutoFindPos.cs
source/DeviceLibrary/storeBean/boxBean/BoxEquip_Partial.cs
查看文件 @
ee4c219
...
@@ -1141,7 +1141,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -1141,7 +1141,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// <summary>
/// 关闭出库前的碗里检查
/// 关闭出库前的碗里检查
/// </summary>
/// </summary>
public
bool
CloseOutStoreCheck
=
false
;
public
bool
CloseOutStoreCheck
=
ConfigAppSettings
.
GetBoolValue
(
"CloseOutStoreCheck"
,
true
)
;
public
override
bool
StartOutstore
(
InOutParam
param
)
public
override
bool
StartOutstore
(
InOutParam
param
)
{
{
if
(
InDoorSigCheck
())
if
(
InDoorSigCheck
())
...
...
source/XLRStoreClient/boxForm/FrmAutoFindPos.Designer.cs
查看文件 @
ee4c219
...
@@ -105,7 +105,6 @@
...
@@ -105,7 +105,6 @@
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
();
...
@@ -906,7 +905,6 @@
...
@@ -906,7 +905,6 @@
//
//
// groupBox1
// groupBox1
//
//
this
.
groupBox1
.
Controls
.
Add
(
this
.
chkCloseOutStoreCheck
);
this
.
groupBox1
.
Controls
.
Add
(
this
.
lblResult
);
this
.
groupBox1
.
Controls
.
Add
(
this
.
lblResult
);
this
.
groupBox1
.
Controls
.
Add
(
this
.
chkBoxCloseCam
);
this
.
groupBox1
.
Controls
.
Add
(
this
.
chkBoxCloseCam
);
this
.
groupBox1
.
Controls
.
Add
(
this
.
checkBoxOpenAuto
);
this
.
groupBox1
.
Controls
.
Add
(
this
.
checkBoxOpenAuto
);
...
@@ -920,18 +918,6 @@
...
@@ -920,18 +918,6 @@
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
(
181
,
24
);
this
.
chkCloseOutStoreCheck
.
TabIndex
=
9
;
this
.
chkCloseOutStoreCheck
.
Text
=
"关闭出库前的碗里检查"
;
this
.
chkCloseOutStoreCheck
.
UseVisualStyleBackColor
=
true
;
this
.
chkCloseOutStoreCheck
.
Visible
=
false
;
this
.
chkCloseOutStoreCheck
.
CheckedChanged
+=
new
System
.
EventHandler
(
this
.
chkCloseOutStoreCheck_CheckedChanged
);
//
// lblResult
// lblResult
//
//
this
.
lblResult
.
AutoSize
=
true
;
this
.
lblResult
.
AutoSize
=
true
;
...
@@ -1136,7 +1122,6 @@
...
@@ -1136,7 +1122,6 @@
private
System
.
Windows
.
Forms
.
PictureBox
pictureBox2
;
private
System
.
Windows
.
Forms
.
PictureBox
pictureBox2
;
private
System
.
Windows
.
Forms
.
Label
lblResult
;
private
System
.
Windows
.
Forms
.
Label
lblResult
;
private
System
.
Windows
.
Forms
.
ListBox
listBox1
;
private
System
.
Windows
.
Forms
.
ListBox
listBox1
;
private
System
.
Windows
.
Forms
.
CheckBox
chkCloseOutStoreCheck
;
private
System
.
Windows
.
Forms
.
ComboBox
cmbColor
;
private
System
.
Windows
.
Forms
.
ComboBox
cmbColor
;
private
System
.
Windows
.
Forms
.
Button
btnOpenImg
;
private
System
.
Windows
.
Forms
.
Button
btnOpenImg
;
}
}
...
...
source/XLRStoreClient/boxForm/FrmAutoFindPos.cs
查看文件 @
ee4c219
...
@@ -449,10 +449,6 @@ namespace OnlineStore.XLRStore
...
@@ -449,10 +449,6 @@ namespace OnlineStore.XLRStore
LogUtil
.
info
(
$
"抽屉升降轴到位"
);
LogUtil
.
info
(
$
"抽屉升降轴到位"
);
}
}
private
void
chkCloseOutStoreCheck_CheckedChanged
(
object
sender
,
EventArgs
e
)
{
boxEquip
.
CloseOutStoreCheck
=
chkCloseOutStoreCheck
.
Checked
;
}
private
void
btnOpenImg_Click
(
object
sender
,
EventArgs
e
)
private
void
btnOpenImg_Click
(
object
sender
,
EventArgs
e
)
{
{
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论