From bdb818930bfb6002e57703ba59652e005c24fe3f Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Mon, 21 Oct 2019 19:20:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=B9=BF=E6=92=AD=EF=BC=8C?= =?UTF-8?q?=E8=87=AA=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonDisposalCfg.java | 8 ++ .../pojo/andon/bean/AndonDisposalMaintenCfg.java | 15 --- .../i3plus/pojo/andon/bean/AndonManageQueue.java | 8 ++ .../i3plus/pojo/andon/bean/AndonManageRecord.java | 148 ++------------------- .../i3plus/pojo/andon/bean/AndonQueueAttach.java | 8 ++ .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 7 +- 6 files changed, 35 insertions(+), 159 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java index 96463f0..2c61463 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java @@ -51,6 +51,14 @@ public class AndonDisposalCfg extends BaseBean { @ApiParam(value = "呼叫原因描述") private String acNameRdd; + @Column(name = "EC_CODE") + @ApiParam(value = "事件方法代码") + private String ecCode; + + @Column(name = "EC_NAME_RDD") + @ApiParam(value = "事件方法描述") + private String ecNameRdd; + @AnnoOutputColumn(refClass = AndonEnumUtil.KNOWLEDGE_AUDIT_STATUS.class,refForeignKey = "value",value = "description") @Column(name = "FLOW_STATUS") @ApiParam(value = "审批状态") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java index a0b4eed..83e1572 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java @@ -30,27 +30,12 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Api("Andon自处理维护配置") public class AndonDisposalMaintenCfg extends BaseBean { - @Column(name = "WORK_CENTER_CODE") - @ApiParam(value = "工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元代码") - private String workCellCode; @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型代码") private String alarmCode; - @Column(name = "AC_CODE") - @ApiParam(value = "呼叫原因代码") - private String acCode; - - @Column(name = "EM_CODE") - @ApiParam(value = "处理措施代码") - private String emCode; - @Column(name = "RP_WHERE") @ApiParam(value = "有效时长") private Integer rpWhere; 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 573ca3e..6f0f112 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 @@ -250,6 +250,14 @@ public class AndonManageQueue extends BaseManageQueue { @ApiParam(value ="规格型号") private String scale; + @Transient + @ApiParam(value ="当前件数") + private Integer currentProdNum; + + @Transient + @ApiParam(value ="生产累计件数") + private Integer totalProdNum; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java index f47728f..a5d557a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.andon.model.BaseManageQueue; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonFormat; @@ -35,116 +36,38 @@ import javax.persistence.*; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯记录") -public class AndonManageRecord extends BaseBean { - - @Column(name = "ANDON_ORDER_NO") - @ApiParam(value = "安灯队列编号") - private String andonOrderNo; - - @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型") - private String alarmCode; - - @Column(name = "ACTION_CODE") - @ApiParam(value = "安灯动作代码") - private String actionCode; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam(value = "工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CENTER_NAME_RDD") - @ApiParam(value = "工作中心名称") - private String workCenterNameRdd; - - @Column(name = "WORK_CELL_NAME_RDD") - @ApiParam(value = "工作单元名称") - private String workCellNameRdd; - - @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元代码") - private String workCellCode; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam(value = "设备代码") - private String equipmentCode; - - @Column(name = "EQUIPMENT_NAME_RDD") - @ApiParam(value = "设备名称") - private String equipmentNameRdd; - - @Column(name = "SHIFT_CODE") - @ApiParam(value = "班次代码") - private String shiftCode; - - @Column(name = "SHIFT_NAME_RDD") - @ApiParam(value = "班次名称") - private String shiftNameRdd; - - @Column(name = "STATUS_CODE") - @ApiParam(value = "安灯状态代码") - private String statusCode; +public class AndonManageRecord extends BaseManageQueue { @Column(name = "SEQ") @ApiParam(value = "序号", example = "1") private Double seq; - @Column(name = "PRIORITY_LEVEL") - @ApiParam(value = "优先级别", example = "1") - private Integer priorityLevel; - - @Column(name="CALL_TIME",updatable = false) - @ApiParam(value = "呼叫时间") - @AnnoOutputColumn(hidden = true) - public String callTime; - @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="呼叫时间",example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) public String callTimeStr; - @Column(name="CONFIRM_TIME",updatable = false) - @ApiParam(value = "响应时间") - @AnnoOutputColumn(hidden = true) - public String confirmTime; - @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="响应时间",example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) public String confirmTimeStr; - @Column(name="RESET_TIME",updatable = false) - @ApiParam(value = "解决时间") - @AnnoOutputColumn(hidden = true) - public String resetTime; - @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="解决时间",example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) public String resetTimeStr; - @Column(name = "CALL_USER") - @ApiParam(value = "呼叫人") - private String callUser; - @Transient @ApiParam(value = "呼叫人名字") private String callUserName; - @Column(name = "CONFIRM_USER") - @ApiParam(value = "响应人") - private String confirmUser; - @Transient @ApiParam(value = "响应人名字") private String confirmUserName; - @Column(name = "RESET_USER") - @ApiParam(value = "解决人") - private String resetUser; @Transient @ApiParam(value = "解决人名字") @@ -177,69 +100,10 @@ public class AndonManageRecord extends BaseBean { @ApiParam(value = "转呼通知等级") private String scRpLevel; - @Column(name = "AC_CODE") - @ApiParam(value = "呼叫原因代码") - private String acCode; - - @Column(name = "AC_NAME_RDD") - @ApiParam(value = "呼叫原因描述") - private String acNameRdd; - - @Column(name = "AC_DESC") - @ApiParam(value = "呼叫具体原因") - private String acDesc; - - @Column(name = "EC_CODE") - @ApiParam(value = "事件原因代码") - private String ecCode; - - @Column(name = "EC_NAME_RDD") - @ApiParam(value = "事件原因描述") - private String ecNameRdd; - - @Column(name = "EC_DESC") - @ApiParam(value = "事件具体原因") - private String ecDesc; - - @Column(name = "EM_CODE") - @ApiParam(value = "事件方法代码") - private String emCode; - - @Column(name = "EM_NAME_RDD") - @ApiParam(value = "事件方法描述") - private String emNameRdd; - - @Column(name = "EM_DESC") - @ApiParam(value = "事件具体方法") - private String emDesc; - - @Column(name = "IS_HALT") - @ApiParam(value = "是否停机", example = "1") - private Integer isHalt; - - @Column(name = "HALT_CODE") - @ApiParam(value = "停机类型") - private String haltCode; - - @Column(name = "HALT_DESC") - @ApiParam(value = "停机具体原因") - private String haltDesc; - @Column(name = "SEND_FLAG") @ApiParam(value = "发送标志") private String sendFlag; - /** - * 处理类型：10=标准处理，20=自处理 - */ - @Column(name = "DISPOSAL_TYPE") - @ApiParam(value = "处理类型") - private String disposalType; - - @Column(name = "ALARM_DETAIL_CODE") - @ApiParam(value = "安灯子类型代码") - private String alarmDetailCode; - @Column(name = "EPM_CODE") @ApiParam(value = "事件现象代码") private String epmCode; @@ -321,6 +185,14 @@ public class AndonManageRecord extends BaseBean { @ApiParam(value ="规格型号") private String scale; + @Transient + @ApiParam(value ="当前件数") + private Integer currentProdNum; + + @Transient + @ApiParam(value ="生产累计件数") + private Integer totalProdNum; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java index 739613c..31fda6a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java @@ -92,4 +92,12 @@ public class AndonQueueAttach extends BaseBean { @ApiParam(value ="规格型号") private String scale; + @Column(name="CURRENT_PROD_NUM") + @ApiParam(value ="当前件数") + private Integer currentProdNum; + + @Column(name="TOTAL_PROD_NUM") + @ApiParam(value ="生产累计件数") + private Integer totalProdNum; + } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index f46add5..833ebed 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -90,7 +90,7 @@ public class AndonHqlPack { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(andonBroadCast.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getStringEqualPack(andonBroadCast.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getStringEqualPack(andonBroadCast.getTargetIds(), "targetIds", packBean); + DdlPreparedPack.getStringLikerPack(andonBroadCast.getTargetIds(), "targetIds", packBean); DdlPreparedPack.getStringEqualPack(andonBroadCast.getGroupNo(), "groupNo", packBean); DdlPreparedPack.getStringEqualPack(andonBroadCast.getDeviceDec(), "deviceDec", packBean); DdlPreparedPack.getNumEqualPack(andonBroadCast.getIsValid(),"isValid",packBean); @@ -120,11 +120,7 @@ public class AndonHqlPack { public static DdlPackBean getAndonDisposalMaintenCfg(AndonDisposalMaintenCfg andonDisposalMaintenCfg) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getOrganizeCode(), "organizeCode", packBean); - DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getAlarmCode(), "alarmCode", packBean); - DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getWorkCellCode(), "workCellCode", packBean); - DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getEmCode(), "emCode", packBean); - DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getAcCode(), "acCode", packBean); DdlPreparedPack.getNumEqualPack(andonDisposalMaintenCfg.getIsValid(),"isValid",packBean); return packBean; } @@ -138,7 +134,6 @@ public class AndonHqlPack { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(andonQueueAttach.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getStringEqualPack(andonQueueAttach.getAndonOrderNo(), "andonOrderNo", packBean); - DdlPreparedPack.getStringEqualPack(andonQueueAttach.getPartNo(), "partNo", packBean); DdlPreparedPack.getNumEqualPack(andonQueueAttach.getIsValid(),"isValid",packBean); return packBean; }