Merge branch 'dev' into test

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

@@ -47,4 +47,16 @@ public class MesShift extends BaseBean {
     @Column(name = "WORK_TIMES")
     @ApiParam("作业时长")
     private Double workTimes;
+
+    @Column(name="SHIFT_SEQ")
+    @ApiParam("班次顺序")
+    private Integer shiftSeq;
+
+    public int getShiftSeqVal() {
+        return this.shiftSeq == null ? 0 : this.shiftSeq;
+    }
+
+    public double getWorkTimesVal() {
+        return this.workTimes == null ? 0.0d : this.workTimes;
+    }
 }

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

@@ -58,6 +58,10 @@ public class MesEquTaskStandardRecord extends BaseBean {
     @ApiParam("操作指导")
     private String actionGuide;
 
+    @Column(name = "CHECK_VALUE")
+    @ApiParam("检测值")
+    private String checkValue;
+
     @Column(name = "CHECK_RESULT")
     @ApiParam("判定结果")
     private Integer checkResult;

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

@@ -47,4 +47,16 @@ public class MesShift extends BaseBean {
     @Column(name = "WORK_TIMES")
     @ApiParam("作业时长")
     private Double workTimes;
+
+    @Column(name="SHIFT_SEQ")
+    @ApiParam("班次顺序")
+    private Integer shiftSeq;
+
+    public int getShiftSeqVal() {
+        return this.shiftSeq == null ? 0 : this.shiftSeq;
+    }
+
+    public double getWorkTimesVal() {
+        return this.workTimes == null ? 0.0d : this.workTimes;
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java

@@ -32,7 +32,7 @@ import java.util.List;
 public class EquTaskNotifyUserModel extends BaseBean {
 
     @ApiParam(value ="账户ID")
-    private Long userId;
+    private Long userInfoId;
 
     @Column(name="USER_NAME_RDD")
     @ApiParam(value ="用户名称" , access ="账号名称")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java

@@ -0,0 +1,77 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 用于产线运行情况数据
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-10-22
+ * @Modify:
+ **/
+@Data
+public class ProductBiModel {
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
+    @ApiParam("生产区域代码")
+    private String areaCode;
+
+    @ApiParam("运行状态")
+    private Integer runningStatus;
+
+    @ApiParam(value = "物料号")
+    private String partNo;
+
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+    @ApiParam(value = "计划数量")
+    private double planQty;
+
+    @ApiParam(value = "产量")
+    private double outputQty;
+
+    @ApiParam(value = "完成率")
+    private double CompleteRate;
+
+    @ApiParam(value = "合格数量")
+    private double passQty;
+
+    @ApiParam(value = "不良数量")
+    private double ngQty;
+
+    @ApiParam(value = "合格率")
+    private double passRate;
+
+    @ApiParam(value = "不良率")
+    private double ngRate;
+
+    @ApiParam("客户代码")
+    private String customerCode;
+
+    @ApiParam("客户名称")
+    private String customerName;
+
+    @ApiParam("x坐标内容")
+    private List<String> xAxis;
+
+    @ApiParam("图表显示的数据")
+    private List<ProductBiSeriesModel> series;
+
+    public double getCompleteRate() {
+        if(this.planQty != 0) {
+            this.CompleteRate = outputQty / planQty;
+        } else {
+            this.CompleteRate = 0;
+        }
+        return this.CompleteRate;
+    }
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java

@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 用于产线运行情况数据
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-10-22
+ * @Modify:
+ **/
+@Data
+public class ProductBiSeriesModel {
+    @ApiParam("名称")
+    private String name;
+    @ApiParam("类型")
+    private String type;
+    @ApiParam("显示的数据")
+    private List<Double> data;
+}