Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -82,8 +82,7 @@ public abstract class BaseBean implements Serializable {
     @Column(name="CREATE_USER",updatable = false)
     @ApiParam(value = "创建用户")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "/wms/inner-order/query/user-list",
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
-            listColumnName = "name", explicitColumnName = "name")
     public String createUser;
 
     @Indexed(direction = IndexDirection.DESCENDING)
@@ -95,8 +94,7 @@ public abstract class BaseBean implements Serializable {
     @Column(name="MODIFY_USER")
     @ApiParam(value = "修改人")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "/wms/inner-order/query/user-list",
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
-            listColumnName = "name", explicitColumnName = "name")
     public String modifyUser;
 
     @Column(name="MODIFY_DATE_TIME")

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -11,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -49,4 +51,38 @@ public class MesBoardEquDetail extends BaseBean implements Serializable {
     @Column(name = "Y_AXES")
     @ApiParam(value = "纵坐标")
     private Double yAxes = 0d;
+
+    @Transient
+    @ApiParam("设备状态")
+    private Integer equStatus;
+
+    @Transient
+    @ApiParam("颜色")
+    private String color;
+
+    @JsonProperty("xAxes")
+    public Double getxAxes() {
+        return xAxes;
+    }
+
+    public void setxAxes(Double xAxes) {
+        this.xAxes = xAxes;
+    }
+
+    @JsonProperty("yAxes")
+    public Double getyAxes() {
+        return yAxes;
+    }
+
+    public void setyAxes(Double yAxes) {
+        this.yAxes = yAxes;
+    }
+
+    public double getXAxes() {
+        return this.xAxes == null ? 0.0d : this.xAxes;
+    }
+
+    public double getYAxes() {
+        return this.yAxes == null ? 0.0d : this.yAxes;
+    }
 }

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

@@ -34,10 +34,6 @@ public class MesBoardEquStatus extends BaseBean implements Serializable {
     @ApiParam("看板代码")
     private String boardCode;
 
-    @Column(name = "EQU_CODE")
-    @ApiParam("设备代码")
-    private String equCode;
-
     @Column(name = "EQU_STATUS_CODE")
     @ApiParam("状态代码")
     private Integer equStatusCode;