Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
smf-core
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit ce261dff
由
LN
编写于
2024-12-12 10:08:17 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
增加posID
1 个父辈
a3425e6f
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
10 行增加
和
0 行删除
src/main/java/com/neotel/smfcore/custom/hanwha/handler/TMSApis.java
src/main/java/com/neotel/smfcore/custom/hanwha/handler/bean/TMSPart.java
src/main/java/com/neotel/smfcore/custom/hanwha/handler/bean/TMSPartReelPos.java
src/main/java/com/neotel/smfcore/custom/hanwha/handler/bean/TMSPartReelStatus.java
src/main/java/com/neotel/smfcore/custom/hanwha/handler/bean/TMSPos.java
src/main/java/com/neotel/smfcore/custom/hanwha/handler/bean/TMSRackStatus.java
src/main/java/com/neotel/smfcore/custom/hanwha/handler/TMSApis.java
查看文件 @
ce261df
...
...
@@ -153,6 +153,7 @@ public class TMSApis {
TMSRackStatus
item
=
new
TMSRackStatus
();
item
.
setRackID
(
getMapValue
(
map
,
"RackID"
))
;
item
.
setRowID
(
getMapValue
(
map
,
"RowID"
))
;
item
.
setPosId
(
getMapValue
(
map
,
"PosId"
));
item
.
setColID
(
getMapValue
(
map
,
"ColID"
))
;
item
.
setIndate
(
getMapValue
(
map
,
"Indate"
));
item
.
setOutdate
(
getMapValue
(
map
,
"Outdate"
));
...
...
src/main/java/com/neotel/smfcore/custom/hanwha/handler/bean/TMSPart.java
查看文件 @
ce261df
...
...
@@ -67,6 +67,7 @@ public class TMSPart extends TMSPos implements Serializable {
dataMap
.
put
(
"RackID"
,
getRackID
());
dataMap
.
put
(
"RowID"
,
getRowID
());
dataMap
.
put
(
"ColID"
,
getColID
());
dataMap
.
put
(
"PosId"
,
getPosId
());
return
dataMap
;
}
}
src/main/java/com/neotel/smfcore/custom/hanwha/handler/bean/TMSPartReelPos.java
查看文件 @
ce261df
...
...
@@ -51,6 +51,7 @@ public class TMSPartReelPos extends TMSPos implements Serializable {
map
.
put
(
"Count"
,
getCount
());
map
.
put
(
"RowID"
,
getRowID
());
map
.
put
(
"ColID"
,
getColID
());
map
.
put
(
"PosId"
,
getPosId
());
map
.
put
(
"Flag"
,
getFlag
());
map
.
put
(
"Indate"
,
getIndate
());
map
.
put
(
"Outdate"
,
getOutdate
());
...
...
src/main/java/com/neotel/smfcore/custom/hanwha/handler/bean/TMSPartReelStatus.java
查看文件 @
ce261df
...
...
@@ -33,6 +33,7 @@ public class TMSPartReelStatus extends TMSPart implements Serializable {
map
.
put
(
"RackID"
,
getRackID
());
map
.
put
(
"RowID"
,
getRowID
());
map
.
put
(
"ColID"
,
getColID
());
map
.
put
(
"PosId"
,
getPosId
());
map
.
put
(
"ResultCode"
,
getResultCode
());
map
.
put
(
"TowerLamp"
,
isTowerLamp
());
return
map
;
...
...
src/main/java/com/neotel/smfcore/custom/hanwha/handler/bean/TMSPos.java
查看文件 @
ce261df
...
...
@@ -20,12 +20,15 @@ public class TMSPos implements Serializable {
private
String
ColID
;
private
String
PosId
;
public
Map
<
String
,
Object
>
getJson
()
{
Map
<
String
,
Object
>
jObject
=
new
HashMap
<>();
jObject
.
put
(
"RackID"
,
RackID
);
jObject
.
put
(
"RowID"
,
RowID
);
jObject
.
put
(
"ColID"
,
ColID
);
jObject
.
put
(
"PosId"
,
PosId
);
return
jObject
;
}
public
static
TMSPos
ToBean
(
Map
<
String
,
Object
>
map
)
{
...
...
@@ -34,6 +37,7 @@ public class TMSPos implements Serializable {
obj
.
setRackID
(
getMapValue
(
map
,
"RackID"
));
obj
.
setRowID
(
getMapValue
(
map
,
"RowID"
));
obj
.
setColID
(
getMapValue
(
map
,
"ColID"
));
obj
.
setPosId
(
getMapValue
(
map
,
"PosId"
));
return
obj
;
}
catch
(
Exception
ex
)
{
log
.
error
(
"转换为TMSPos出错:"
+
ex
.
toString
());
...
...
@@ -58,6 +62,7 @@ public class TMSPos implements Serializable {
}
public
void
setPosName
(
String
posName
)
{
setPosId
(
posName
);
if
(
ObjectUtil
.
isEmpty
(
posName
))
{
setColID
(
""
);
setRowID
(
""
);
...
...
src/main/java/com/neotel/smfcore/custom/hanwha/handler/bean/TMSRackStatus.java
查看文件 @
ce261df
...
...
@@ -42,6 +42,7 @@ public class TMSRackStatus extends TMSPos implements Serializable {
jObject
.
put
(
"RackID"
,
getRackID
());
jObject
.
put
(
"RowID"
,
getRowID
());
jObject
.
put
(
"ColID"
,
getColID
());
jObject
.
put
(
"PosId"
,
getPosId
());
jObject
.
put
(
"Flag"
,
Flag
);
jObject
.
put
(
"Indate"
,
Indate
);
jObject
.
put
(
"Outdate"
,
Outdate
);
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论