Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
RC30-AutoInOutStore
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 7b6ce92d
由
几米阳光
编写于
2019-04-16 15:39:39 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
排队中的出库信息需要保存是否是批量出库
1 个父辈
e023b281
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
13 行增加
和
8 行删除
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
source/DeviceLibrary/store/model/FixtureCodeInfo.cs
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
查看文件 @
7b6ce92
...
@@ -1168,7 +1168,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -1168,7 +1168,7 @@ namespace OnlineStore.DeviceLibrary
if
(
currInOutFixture
.
WareNum
.
Equals
(
""
))
if
(
currInOutFixture
.
WareNum
.
Equals
(
""
))
{
{
LogUtil
.
info
(
LOGGER
,
StoreName
+
"开始执行排队中的出库【"
+
currInOutFixture
.
ToStr
()
+
"】"
);
LogUtil
.
info
(
LOGGER
,
StoreName
+
"开始执行排队中的出库【"
+
currInOutFixture
.
ToStr
()
+
"】"
);
bool
result
=
StartOutStoreMove
(
new
InOutStoreParam
(
""
,
currInOutFixture
.
PosId
,
currInOutFixture
.
plateH
,
currInOutFixture
.
plateW
),
true
);
bool
result
=
StartOutStoreMove
(
new
InOutStoreParam
(
""
,
currInOutFixture
.
PosId
,
currInOutFixture
.
plateH
,
currInOutFixture
.
plateW
),
currInOutFixture
.
BatchInOut
);
if
(!
result
)
if
(!
result
)
{
{
LogUtil
.
info
(
LOGGER
,
StoreName
+
" 执行排队中的出库【"
+
currInOutFixture
.
ToStr
()
+
"】失败,重新加入等待队列"
);
LogUtil
.
info
(
LOGGER
,
StoreName
+
" 执行排队中的出库【"
+
currInOutFixture
.
ToStr
()
+
"】失败,重新加入等待队列"
);
...
@@ -1746,7 +1746,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -1746,7 +1746,7 @@ namespace OnlineStore.DeviceLibrary
}
}
else
else
{
{
FixtureCodeInfo
currInOutFixture
=
new
FixtureCodeInfo
(
0
,
""
,
posId
,
plateW
,
plateH
);
FixtureCodeInfo
currInOutFixture
=
new
FixtureCodeInfo
(
0
,
""
,
posId
,
plateW
,
plateH
,!
isSingleOut
);
if
(
CanStarInOut
())
if
(
CanStarInOut
())
{
{
bool
result
=
StartOutStoreMove
(
new
InOutStoreParam
(
""
,
posId
,
plateH
,
plateW
),
!
isSingleOut
);
bool
result
=
StartOutStoreMove
(
new
InOutStoreParam
(
""
,
posId
,
plateH
,
plateW
),
!
isSingleOut
);
...
...
source/DeviceLibrary/store/model/FixtureCodeInfo.cs
查看文件 @
7b6ce92
...
@@ -3,7 +3,7 @@ using System;
...
@@ -3,7 +3,7 @@ using System;
using
System.Collections.Generic
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Linq
;
using
System.Text
;
using
System.Text
;
namespace
OnlineStore.DeviceLibrary
namespace
OnlineStore.DeviceLibrary
{
{
...
@@ -13,16 +13,18 @@ namespace OnlineStore.DeviceLibrary
...
@@ -13,16 +13,18 @@ namespace OnlineStore.DeviceLibrary
public
class
FixtureCodeInfo
public
class
FixtureCodeInfo
{
{
public
FixtureCodeInfo
(
int
trayCode
,
string
wareNum
,
string
posId
)
public
FixtureCodeInfo
(
int
trayCode
,
string
wareNum
,
string
posId
,
bool
batchInOut
=
true
)
{
{
this
.
BatchInOut
=
batchInOut
;
this
.
TrayCode
=
trayCode
;
this
.
TrayCode
=
trayCode
;
this
.
WareNum
=
wareNum
;
this
.
WareNum
=
wareNum
;
this
.
PosId
=
posId
;
this
.
PosId
=
posId
;
SetSize
();
SetSize
();
}
}
public
FixtureCodeInfo
(
int
trayCode
,
string
wareNum
,
string
posId
,
int
platew
,
int
plateh
)
public
FixtureCodeInfo
(
int
trayCode
,
string
wareNum
,
string
posId
,
int
platew
,
int
plateh
,
bool
batchInOut
=
true
)
{
{
this
.
BatchInOut
=
batchInOut
;
this
.
TrayCode
=
trayCode
;
this
.
TrayCode
=
trayCode
;
this
.
WareNum
=
wareNum
;
this
.
WareNum
=
wareNum
;
this
.
PosId
=
posId
;
this
.
PosId
=
posId
;
...
@@ -65,7 +67,10 @@ namespace OnlineStore.DeviceLibrary
...
@@ -65,7 +67,10 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
/// </summary>
public
int
plateH
{
get
;
set
;
}
public
int
plateH
{
get
;
set
;
}
/// <summary>
/// 是否是批量出入库
/// </summary>
public
bool
BatchInOut
{
get
;
set
;
}
public
string
ToStr
()
public
string
ToStr
()
{
{
return
"TrayCode【"
+
TrayCode
+
"】,WareNum=【"
+
WareNum
+
"】,PosId=【"
+
PosId
+
"】,plateW=【"
+
plateW
+
"】,plateH=【"
+
plateH
+
"】"
;
return
"TrayCode【"
+
TrayCode
+
"】,WareNum=【"
+
WareNum
+
"】,PosId=【"
+
PosId
+
"】,plateW=【"
+
plateW
+
"】,plateH=【"
+
plateH
+
"】"
;
...
@@ -87,9 +92,9 @@ namespace OnlineStore.DeviceLibrary
...
@@ -87,9 +92,9 @@ namespace OnlineStore.DeviceLibrary
}
}
catch
(
Exception
ex
)
catch
(
Exception
ex
)
{
{
}
}
}
}
}
}
return
-
1
;
return
-
1
;
}
}
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论