Commit ce261dff LN

增加posID

1 个父辈 a3425e6f
...@@ -153,6 +153,7 @@ public class TMSApis { ...@@ -153,6 +153,7 @@ public class TMSApis {
TMSRackStatus item = new TMSRackStatus(); TMSRackStatus item = new TMSRackStatus();
item.setRackID (getMapValue(map, "RackID")) ; item.setRackID (getMapValue(map, "RackID")) ;
item.setRowID (getMapValue(map, "RowID")) ; item.setRowID (getMapValue(map, "RowID")) ;
item.setPosId(getMapValue(map,"PosId"));
item.setColID (getMapValue(map, "ColID")) ; item.setColID (getMapValue(map, "ColID")) ;
item.setIndate (getMapValue(map, "Indate")); item.setIndate (getMapValue(map, "Indate"));
item.setOutdate (getMapValue(map, "Outdate")); item.setOutdate (getMapValue(map, "Outdate"));
......
...@@ -67,6 +67,7 @@ public class TMSPart extends TMSPos implements Serializable { ...@@ -67,6 +67,7 @@ public class TMSPart extends TMSPos implements Serializable {
dataMap.put("RackID", getRackID()); dataMap.put("RackID", getRackID());
dataMap.put("RowID", getRowID()); dataMap.put("RowID", getRowID());
dataMap.put("ColID", getColID()); dataMap.put("ColID", getColID());
dataMap.put("PosId", getPosId());
return dataMap; return dataMap;
} }
} }
...@@ -51,6 +51,7 @@ public class TMSPartReelPos extends TMSPos implements Serializable { ...@@ -51,6 +51,7 @@ public class TMSPartReelPos extends TMSPos implements Serializable {
map.put("Count", getCount()); map.put("Count", getCount());
map.put("RowID", getRowID()); map.put("RowID", getRowID());
map.put("ColID", getColID()); map.put("ColID", getColID());
map.put("PosId", getPosId());
map.put("Flag", getFlag()); map.put("Flag", getFlag());
map.put("Indate", getIndate()); map.put("Indate", getIndate());
map.put("Outdate", getOutdate()); map.put("Outdate", getOutdate());
......
...@@ -33,6 +33,7 @@ public class TMSPartReelStatus extends TMSPart implements Serializable { ...@@ -33,6 +33,7 @@ public class TMSPartReelStatus extends TMSPart implements Serializable {
map.put("RackID", getRackID()); map.put("RackID", getRackID());
map.put("RowID", getRowID()); map.put("RowID", getRowID());
map.put("ColID", getColID()); map.put("ColID", getColID());
map.put("PosId", getPosId());
map.put("ResultCode", getResultCode()); map.put("ResultCode", getResultCode());
map.put("TowerLamp", isTowerLamp()); map.put("TowerLamp", isTowerLamp());
return map; return map;
......
...@@ -20,12 +20,15 @@ public class TMSPos implements Serializable { ...@@ -20,12 +20,15 @@ public class TMSPos implements Serializable {
private String ColID; private String ColID;
private String PosId;
public Map<String,Object> getJson() public Map<String,Object> getJson()
{ {
Map<String,Object> jObject = new HashMap<>(); Map<String,Object> jObject = new HashMap<>();
jObject.put("RackID", RackID); jObject.put("RackID", RackID);
jObject.put("RowID", RowID); jObject.put("RowID", RowID);
jObject.put("ColID", ColID); jObject.put("ColID", ColID);
jObject.put("PosId", PosId);
return jObject; return jObject;
} }
public static TMSPos ToBean(Map<String,Object> map) { public static TMSPos ToBean(Map<String,Object> map) {
...@@ -34,6 +37,7 @@ public class TMSPos implements Serializable { ...@@ -34,6 +37,7 @@ public class TMSPos implements Serializable {
obj.setRackID(getMapValue(map,"RackID")); obj.setRackID(getMapValue(map,"RackID"));
obj.setRowID(getMapValue(map,"RowID")); obj.setRowID(getMapValue(map,"RowID"));
obj.setColID(getMapValue(map,"ColID")); obj.setColID(getMapValue(map,"ColID"));
obj.setPosId(getMapValue(map,"PosId"));
return obj; return obj;
} catch (Exception ex) { } catch (Exception ex) {
log.error("转换为TMSPos出错:" + ex.toString()); log.error("转换为TMSPos出错:" + ex.toString());
...@@ -58,6 +62,7 @@ public class TMSPos implements Serializable { ...@@ -58,6 +62,7 @@ public class TMSPos implements Serializable {
} }
public void setPosName(String posName) { public void setPosName(String posName) {
setPosId(posName);
if (ObjectUtil.isEmpty(posName)) { if (ObjectUtil.isEmpty(posName)) {
setColID(""); setColID("");
setRowID(""); setRowID("");
......
...@@ -42,6 +42,7 @@ public class TMSRackStatus extends TMSPos implements Serializable { ...@@ -42,6 +42,7 @@ public class TMSRackStatus extends TMSPos implements Serializable {
jObject.put("RackID", getRackID()); jObject.put("RackID", getRackID());
jObject.put("RowID", getRowID()); jObject.put("RowID", getRowID());
jObject.put("ColID", getColID()); jObject.put("ColID", getColID());
jObject.put("PosId", getPosId());
jObject.put("Flag", Flag); jObject.put("Flag", Flag);
jObject.put("Indate", Indate); jObject.put("Indate", Indate);
jObject.put("Outdate", Outdate); jObject.put("Outdate", Outdate);
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!