From d87d81e34ab8c8b30fb57942f02bb3966f3f8e78 Mon Sep 17 00:00:00 2001 From: jiajack Date: Sat, 26 Oct 2019 11:14:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E4=BA=A7=E7=BA=BF=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E6=83=85=E5=86=B5=E3=80=91-BI=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/ProductBiModel.java | 77 ++++++++++++++++++++++ .../pojo/mes/model/ProductBiSeriesModel.java | 24 +++++++ 2 files changed, 101 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java new file mode 100644 index 0000000..a7a613f --- /dev/null +++ b/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 xAxis; + + @ApiParam("图表显示的数据") + private List series; + + public double getCompleteRate() { + if(this.planQty != 0) { + this.CompleteRate = outputQty / planQty; + } else { + this.CompleteRate = 0; + } + return this.CompleteRate; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java new file mode 100644 index 0000000..d7b15f8 --- /dev/null +++ b/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 data; +} From aef7f7a9480c2e50d749162d9a0efb82c2dc7a5d Mon Sep 17 00:00:00 2001 From: jiajack Date: Sat, 26 Oct 2019 11:15:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8F=AD=E6=AC=A1?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java | 12 ++++++++++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java index 37adc09..577fa77 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java +++ b/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; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java index 9c4f50a..0eb9772 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java +++ b/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; + } } From 9bdae2ad135507ef26bd453793e75844d0afd0b3 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 26 Oct 2019 13:35:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1086?= =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E5=A4=87=E7=82=B9=E6=A3=80=E4=BF=9D=E5=85=BB?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java index 651fd4d..82bb4aa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java +++ b/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; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java index e26b0c3..49202fa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java +++ b/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 ="账号名称")