【1693-设备状态监控看板】

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java

@@ -42,9 +42,11 @@ public class MesBoardEquDetail extends BaseBean implements Serializable {
     @ApiParam("设备名称")
     private String equName;
 
+    @Column(name = "X_AXES")
     @ApiParam(value = "横坐标")
-    private Float horizontalAxis = 0f;
+    private Double xAxes = 0d;
 
+    @Column(name = "Y_AXES")
     @ApiParam(value = "纵坐标")
-    private Float verticalAxis = 0f;
+    private Double yAxes = 0d;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java

@@ -36,7 +36,7 @@ public class MesBoardEquStatus extends BaseBean implements Serializable {
 
     @Column(name = "EQU_CODE")
     @ApiParam("设备代码")
-    private String equCOde;
+    private String equCode;
 
     @Column(name = "EQU_STATUS_CODE")
     @ApiParam("状态代码")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java

@@ -158,6 +158,18 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam(value = "乐观锁", example = "1")
     public Integer lockVersion;
 
+    @Column(name = "CATEGORY_CODE1")
+    @ApiParam("类型1")
+    private String categoryCode1;
+
+    @Column(name = "CATEGORY_CODE2")
+    @ApiParam("类型2")
+    private String categoryCode2;
+
+    @Column(name = "CATEGORY_CODE3")
+    @ApiParam("类型3")
+    private String categoryCode3;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value = "工作中心名称")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -2494,4 +2494,18 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getMesBoardEquDetail(MesBoardEquDetail mesBoardEquDetail) {
+        DdlPackBean packBean = getAllBaseData(mesBoardEquDetail.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesBoardEquDetail.getBoardCode(), "boardCode", packBean);
+        DdlPreparedPack.getNumEqualPack(mesBoardEquDetail.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getMesBoardEquStatus(MesBoardEquStatus mesBoardEquStatus) {
+        DdlPackBean packBean = getAllBaseData(mesBoardEquStatus.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesBoardEquStatus.getBoardCode(), "boardCode", packBean);
+        DdlPreparedPack.getNumEqualPack(mesBoardEquStatus.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
 }