From 97763d6b53bde16632643e39e98133937f140dd9 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 17 Oct 2019 16:06:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=B9=BF=E6=92=AD=EF=BC=8C?= =?UTF-8?q?=20=E5=AE=89=E7=81=AF=E7=AE=A1=E7=90=86=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E7=95=8C=E9=9D=A2=EF=BC=8C=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=93=8D=E4=BD=9C=E6=9D=A5=E6=BA=90=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonManageQueue.java | 56 ++++++++++++++++++++-- .../i3plus/pojo/andon/bean/AndonManageRecord.java | 49 +++++++++++++++++++ .../i3plus/pojo/andon/bean/AndonQueueAttach.java | 55 +++++++++++++++++++-- .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 14 ++++++ .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 4 +- 5 files changed, 171 insertions(+), 7 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 dbdc07e..ae634b1 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 @@ -353,6 +353,59 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "事件统计报表该事件描述的总次数") private int acCodeTime; + @ApiParam(value = "操作来源") + @Transient + private String operationFlag; + + // 安灯附属表 + @Transient + @ApiParam(value ="临时/纠正措施") + private String tempCorrectMethod; + + @Transient + @ApiParam(value ="预防/纠正措施") + private String preCorrectMethod; + + @Transient + @ApiParam(value ="客户") + private String customer; + + @Transient + @ApiParam(value ="零件号") + private String partNo; + + @Transient + @ApiParam(value ="零件名称") + private String partName; + + @Transient + @ApiParam(value ="报废数量") + private Double scrapNum; + + @Transient + @ApiParam(value ="批次") + private String lot; + + @Transient + @ApiParam(value ="零件数量") + private Double partNum; + + @Transient + @ApiParam(value ="设备名称") + private String deviceName; + + @Transient + @ApiParam(value ="是否更换备件") + private Integer isChangeBackup; + + @Transient + @ApiParam(value ="备件名称") + private String backupPartName; + + @Transient + @ApiParam(value ="规格型号") + private String scale; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; @@ -474,9 +527,6 @@ public class AndonManageQueue extends BaseBean { try { List ds = new ArrayList(); ds.add(new AndonManageQueue()); - - - System.out.println(BeanUtils.describe(ds)); } catch (IllegalAccessException e) { e.printStackTrace(); 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 d66158f..f47728f 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 @@ -272,6 +272,55 @@ public class AndonManageRecord extends BaseBean { @ApiParam(value = "响应已通知标识") private String signSendFlag; + // 安灯附属表 + @Transient + @ApiParam(value ="临时/纠正措施") + private String tempCorrectMethod; + + @Transient + @ApiParam(value ="预防/纠正措施") + private String preCorrectMethod; + + @Transient + @ApiParam(value ="客户") + private String customer; + + @Transient + @ApiParam(value ="零件号") + private String partNo; + + @Transient + @ApiParam(value ="零件名称") + private String partName; + + @Transient + @ApiParam(value ="报废数量") + private Double scrapNum; + + @Transient + @ApiParam(value ="批次") + private String lot; + + @Transient + @ApiParam(value ="零件数量") + private Double partNum; + + @Transient + @ApiParam(value ="设备名称") + private String deviceName; + + @Transient + @ApiParam(value ="是否更换备件") + private Integer isChangeBackup; + + @Transient + @ApiParam(value ="备件名称") + private String backupPartName; + + @Transient + @ApiParam(value ="规格型号") + private String scale; + // 是否转呼 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 aaf5666..739613c 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 @@ -40,7 +40,56 @@ public class AndonQueueAttach extends BaseBean { @ApiParam(value ="安灯任务编号") private String andonOrderNo; - @Column(name="STATUS_CODE") - @ApiParam(value ="安灯状态") - private String statusCode; +// @Column(name="STATUS_CODE") +// @ApiParam(value ="安灯状态") +// private String statusCode; + + @Column(name="TEMP_CORT_METHOD") + @ApiParam(value ="临时/纠正措施") + private String tempCorrectMethod; + + @Column(name="PRE_CORT_METHOD") + @ApiParam(value ="预防/纠正措施") + private String preCorrectMethod; + + @Column(name="CUSTOMER") + @ApiParam(value ="客户") + private String customer; + + @Column(name="PART_NO") + @ApiParam(value ="零件号") + private String partNo; + + @Column(name="PART_NAME") + @ApiParam(value ="零件名称") + private String partName; + + @Column(name="SCRAP_NUM") + @ApiParam(value ="报废数量") + private Double scrapNum; + + @Column(name="LOT") + @ApiParam(value ="批次") + private String lot; + + @Column(name="PART_NUM") + @ApiParam(value ="零件数量") + private Double partNum; + + @Column(name="DEVICE_NAME") + @ApiParam(value ="设备名称") + private String deviceName; + + @Column(name="IS_CHANGE_BACKUP") + @ApiParam(value ="是否更换备件") + private Integer isChangeBackup; + + @Column(name="BACKUP_PART_NAME") + @ApiParam(value ="备件名称") + private String backupPartName; + + @Column(name="SCALE") + @ApiParam(value ="规格型号") + private String scale; + } 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 ad97b67..044f313 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 @@ -111,6 +111,20 @@ public class AndonHqlPack { DdlPreparedPack.getNumEqualPack(andonBroadCastCfg.getIsValid(),"isValid",packBean); return packBean; } + + /** + * 安灯附属表 + * @param andonQueueAttach + * @return + */ + public static DdlPackBean getAndonQueueAttach(AndonQueueAttach andonQueueAttach) { + 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; + } /***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 End ************/ diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 2193643..ce28bb4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -462,7 +462,9 @@ public class AndonEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_OPERATION_SOURCE{ PHYSICAL("10","物理操作"), - SOFT("20","软件操作"); + SOFT("20","软件操作"), + SCHEDULE("30","队列，定时操作"), + INSERT("40","插入动作"); private String value; private String description;