|
@@ -2557,7 +2557,6 @@ object EquipUtil {
|
|
|
} catch (e: Exception) {
|
|
|
e.printStackTrace()
|
|
|
}
|
|
|
-
|
|
|
return equipment
|
|
|
}
|
|
|
|
|
@@ -2576,6 +2575,9 @@ object EquipUtil {
|
|
|
hashMap["projectId"] = projectId
|
|
|
hashMap["objType"] = "equipment"
|
|
|
hashMap["classCode"] = equipment.classCode
|
|
|
+ if (!equipment.wdCode.isNullOrEmpty()){
|
|
|
+ hashMap["wdCode"] = equipment.wdCode
|
|
|
+ }
|
|
|
if (!equipment.localName.isNullOrEmpty()){
|
|
|
hashMap["localName"] = equipment.localName
|
|
|
}
|
|
@@ -2613,7 +2615,6 @@ object EquipUtil {
|
|
|
if (equipment.equipSerial!=null&&equipment.equipSerial!=0.0){
|
|
|
hashMap["equipSerial"] = equipment.equipSerial
|
|
|
}
|
|
|
-
|
|
|
if (!equipment.infos.isNullOrEmpty()){
|
|
|
for (key in equipment.infos!!.keys){
|
|
|
hashMap[key] = equipment.infos!![key]
|