Browse Source

补充点位名称的赋值和传输

Frankensteinly 10 months ago
parent
commit
a2c42d87c8

+ 4 - 0
app/src/main/java/com/grkj/iscs/model/WorkTicketBean.kt

@@ -49,6 +49,10 @@ class WorkTicketBean {
              * 工作点位RFID号
              */
             var equipRfidNo: String? = null
+            /**
+             * 工作点位名称
+             */
+            var equipName: String? = null
             /**
              * 锁RFID号(只在创建的时候有)
              */

+ 2 - 1
app/src/main/java/com/grkj/iscs/presentation/PresentationManager.kt

@@ -287,7 +287,7 @@ object PresentationManager {
             "${ctx.getString(R.string.simple_workshop_assemble)}-${ctx.getString(R.string.simple_line)}-${ctx.getString(R.string.simple_sop_type)}",
             "SOP001",
             ctx.getString(R.string.simple_sop_type),
-            mutableListOf(PPointBean("E-1", "04568E123D7080"), PPointBean("E-2", "045A8E123D7080"))
+            mutableListOf(PPointBean("#1 High voltage isolation contactor", "04568E123D7080"), PPointBean("#2 High voltage isolation contactor", "045A8E123D7080"))
         )
 
         val ticket = WorkTicketBean()
@@ -305,6 +305,7 @@ object PresentationManager {
         for (i in sop.pointList.indices) {
             val dataListDTO = WorkTicketBean.DataDTO.DataListDTO()
             dataListDTO.dataId = i
+            dataListDTO.equipName = sop.pointList[i].name
             dataListDTO.equipRfidNo = sop.pointList[i].rfid
             dataListDTO.target = 0
             if (i != 0) {