From d3deaa60815c710eb81c262342cd803c4271d44b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 2 Jul 2019 21:24:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E7=81=AFbug=E8=A7=A3=E5=86=B3=201.?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AF=A6=E6=83=85=E4=B8=AD=E4=B8=80=E7=9B=B4?= =?UTF-8?q?=E5=90=8C=E4=B8=80=E4=B8=AA=E5=B7=A5=E4=BD=8D=E5=90=8C=E7=A7=8D?= =?UTF-8?q?=E5=91=BC=E5=8F=AB=E5=90=8C=E4=B8=80=E4=B8=AA=E5=91=BC=E5=8F=AB?= =?UTF-8?q?=E5=8D=95=E4=BB=BB=E5=8A=A1=E6=9C=89=E5=A4=9A=E6=9D=A1=202.PLC?= =?UTF-8?q?=EF=BC=9A=E5=AE=89=E7=81=AF=E7=B1=BB=E5=9E=8B=E3=80=81=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=9C=B0=E5=9D=80=E3=80=81=E6=A0=87=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=E5=AD=97=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E5=A4=B1=E6=95=88?= =?UTF-8?q?=203.=E9=80=9A=E7=9F=A5=E5=AF=B9=E8=B1=A1=EF=BC=9A=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=AF=B9=E8=B1=A1=E5=80=BC=E4=B8=8D=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=204.=E9=80=9A=E7=9F=A5=E9=85=8D=E7=BD=AE=EF=BC=9A?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E5=85=A8=E3=80=82=205.=E4=BA=8B=E4=BB=B6=E5=8E=9F=E5=9B=A0?= =?UTF-8?q?=EF=BC=9A=E5=AE=89=E7=81=AF=E7=B1=BB=E5=9E=8B=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlpack/AndonHqlPack.java | 46 +++++++++++++++++++++- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 22 +++++++---- 2 files changed, 58 insertions(+), 10 deletions(-) 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 1575b05..902b0bc 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 @@ -120,7 +120,7 @@ public class AndonHqlPack { } /** - * 按条件查询ANDON呼叫原因 + * 按条件查询ANDON呼叫原因,== * @param andonAlarmCause * @return */ @@ -134,6 +134,22 @@ public class AndonHqlPack { return result; } + /** + * 按条件模糊查询ANDON呼叫原因, + * @param andonAlarmCause + * @return + */ + public static DdlPackBean packHqlAndonAlarmCauseLike(AndonAlarmCause andonAlarmCause){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcCode(),"acCode", result); + DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcName(),"acName", result); + + getStringBuilderPack(andonAlarmCause, result); + + return result; + } /** * 按条件查询ANDON事件处理方法 @@ -439,6 +455,11 @@ public class AndonHqlPack { */ public static DdlPackBean packAndonEventCause(AndonEventCause andonEventCause) { DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringLikerPack(andonEventCause.getEcCode(), "ecCode", result); + DdlPreparedPack.getStringLikerPack(andonEventCause.getEcName(), "ecName", result); + getStringBuilderPack(andonEventCause, result); return result; @@ -487,8 +508,29 @@ public class AndonHqlPack { */ public static DdlPackBean packAndonPLC(AndonPLC plc) { DdlPackBean result = new DdlPackBean(); - getStringBuilderPack(plc, result); + DdlPreparedPack.getStringEqualPack(plc.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringLikerPack(plc.getTagAddress(),"tagAddress",result); + DdlPreparedPack.getStringLikerPack(plc.getTagName(),"tagName",result); + + getStringBuilderPack(plc, result); return result; } + + /** + * 检查安灯记录是否以存在 + * @param andonManageRecord + * @return + */ + public static DdlPackBean packHqlAndonManageRecordIsExist(AndonManageRecord andonManageRecord){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonManageRecord.getAndonOrderNo(),"andonOrderNo", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getStatusCode(),"statusCode", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getAlarmCode(),"alarmCode", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getActionCode(),"actionCode", result); + + getStringBuilderPack(andonManageRecord, result); + return result; + } } 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 6dc423e..9788e06 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 @@ -242,25 +242,31 @@ public class AndonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_TYPE { - PART("PART_ALARM","物料"), - QUALITY("QUALITY_ALARM","质量"), - EQUIP("EQUMENT_ALARM","设备"), - PROCESS("ROUTING_ALARM","工艺"), - CHECK("OTHER_ALARM","其他"), - FIX_ERROR("FIX_ERROR", "自动报警"); + PART("PART_ALARM", 111020005, "物料"), + QUALITY("QUALITY_ALARM", 111020006, "质量"), + EQUIP("EQUMENT_ALARM", 111020007, "设备"), + PROCESS("ROUTING_ALARM", 111020008, "工艺"), + CHECK("OTHER_ALARM", 111020009, "其他"), + FIX_ERROR("FIX_ERROR", 111020010, "自动报警"); private String value; + private Integer code; private String description; - ALARM_TYPE(String value, String description) { + ALARM_TYPE(String value, Integer code, String description) { this.value = value; + this.code = code; this.description = description; } - public String getValue() { + public String getValue() { return value; } + public Integer getCode() { + return code; + } + public String getDescription() { return description; }