From 00086912bc9621fdf62f391be18e06385ff8d65e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Wed, 22 May 2019 17:22:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?ANDON=E5=AE=9E=E4=BD=93=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/AndonManageQueue.java | 87 +++++++++++++++++++++- 1 file changed, 84 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java index 26f776b..933464b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java @@ -226,15 +226,15 @@ public class AndonManageQueue extends BaseBean { @Transient @ApiParam(value = "ANDON次数（用于报表统计）", example = "0") - private Integer andonCount; + private Long andonCount; @Transient @ApiParam(value = "平均响应时长", example = "0") - private Long avgSignTime; + private Double avgSignTime; @Transient @ApiParam(value = "平均解决时长", example = "0") - private Long avgResolveTime; + private Double avgResolveTime; @Transient @ApiParam(value = "查询条件：ANDON状态") @@ -257,4 +257,85 @@ public class AndonManageQueue extends BaseBean { public Integer getPriorityLevel() { return this.priorityLevel == null ? 0 : this.priorityLevel; } + + /** + * 工位统计 构造函数 + * @param workCenterCode + * @param workCellCode + * @param equipmentCode + * @param shiftCode + * @param alarmCode + * @param andonCount + */ + public AndonManageQueue(String workCenterCode, String workCellCode, String equipmentCode, String shiftCode, String alarmCode, Long andonCount) { + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.equipmentCode = equipmentCode; + this.shiftCode = shiftCode; + this.alarmCode = alarmCode; + this.andonCount = andonCount; + } + + /** + * 原因统计 构造函数 + * @param workCenterCode + * @param workCellCode + * @param alarmCode + * @param ecCode + * @param ecNameRdd + * @param emCode + * @param emNameRdd + * @param avgSignTime + * @param avgResolveTime + * @param andonCount + */ + public AndonManageQueue(String workCenterCode, String workCellCode, String alarmCode, String ecCode, String ecNameRdd, String emCode, String emNameRdd, Double avgSignTime, Double avgResolveTime, Long andonCount) { + this.alarmCode = alarmCode; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.ecCode = ecCode; + this.ecNameRdd = ecNameRdd; + this.emCode = emCode; + this.emNameRdd = emNameRdd; + this.andonCount = andonCount; + this.avgSignTime = avgSignTime; + this.avgResolveTime = avgResolveTime; + } + + /** + * 人员统计 构造函数 + * @param resetUser + * @param alarmCode + * @param andonCount + * @param proportion + * @param avgSignTime + * @param avgResolveTime + */ + public AndonManageQueue(String resetUser, String alarmCode, Long andonCount, Double proportion, Double avgSignTime, Double avgResolveTime) { + this.alarmCode = alarmCode; + this.resetUser = resetUser; + this.andonCount = andonCount; + this.avgSignTime = avgSignTime; + this.avgResolveTime = avgResolveTime; + this.proportion = proportion; + } + + /** + * 柏拉图统计 构造函数 + * @param alarmCode + * @param ecCode + * @param ecNameRdd + * @param proportion + * @param andonCount + */ + public AndonManageQueue(String alarmCode, String ecCode, String ecNameRdd, Double proportion, Long andonCount) { + this.alarmCode = alarmCode; + this.ecCode = ecCode; + this.ecNameRdd = ecNameRdd; + this.andonCount = andonCount; + this.proportion = proportion; + } + + public AndonManageQueue() { + } } From 76e553234e594492363262412bb8f119d89ef512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 22 May 2019 18:03:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?MES-JIT=E9=98=9F=E5=88=97=E7=BB=84=E4=BB=B6?= =?UTF-8?q?+WMS-GOJS=E4=BD=8D=E7=BD=AE=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?@Lob=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesWorkCellPoint.java | 45 +++++++++++++++++++++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 46 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 6 +-- 3 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java new file mode 100644 index 0000000..603ff15 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description : 工站队列 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-22 17:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_POINT") +@Api("工站队列") +public class MesWorkCellPoint extends BaseBean { + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "QUEUE_SEQ") + @ApiParam("队列主表序号") + private String queueSeq; + + @Column(name = "QUEUE_DETAIL_SEQ") + @ApiParam("队列明细表序号") + private String queueDetailSeq; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java new file mode 100644 index 0000000..c3e984f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : JIT队列列表Model + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-22 16:34 + * @Modify: + **/ +@Data +@Api("JIT队列列表Model") +public class QueueOrderModel implements Serializable { + @ApiParam("队列ID") + public Long queueId; + @ApiParam("队列明细ID") + public Long queueDetailId; + @ApiParam("队列序号") + public Integer queueSeq; + @ApiParam("队列明细序号") + public Integer queDetailSeq; + @ApiParam("客户标识号") + public String custFlagNo; + @ApiParam("产品配置名称") + public String prodCfgName; + @ApiParam("产品类型名称") + public String categoryName; + @ApiParam("产品条码") + public String serialNumber; + @ApiParam("物料号") + public String partNo; + @ApiParam("物料ID") + public Long partId; + @ApiParam("条码状态") + public Integer snStatus; + @ApiParam("生产类型") + public String workType; + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 28139af..48c1efe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -10,10 +10,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : 作业流程 @@ -67,6 +64,7 @@ public class WmsActionGroup extends BaseBean { @ApiParam(value = "任务自动初始化", example = "0") private Integer autoInit; + @Lob @Column(name = "POSITION") @ApiParam(value = "GOJS位置") private String position;