From c7e5fc732e8c923c366c4fbfa8a03020879246ec Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Tue, 14 May 2019 11:03:03 +0800 Subject: [PATCH 01/10] =?UTF-8?q?mes=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AD=89=E7=BA=A7=E6=9E=9A=E4=B8=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 84e4777..437d602 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -578,9 +578,9 @@ public class MesEnumUtil { public enum PROD_ORG_LEVEL{ LEVEL_ONE(1,"一级目录"), - LEVEL_TWO(1,"二级目录"), - LEVEL_THREE(1,"三级目录"), - LEVEL_FOUR(1,"四级目录"); + LEVEL_TWO(2,"二级目录"), + LEVEL_THREE(3,"三级目录"), + LEVEL_FOUR(4,"四级目录"); private int value; private String description; From 95789ab615a9e86955d18a152e3b7f5efd516e2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 14 May 2019 11:28:55 +0800 Subject: [PATCH 02/10] =?UTF-8?q?ANDON=E5=AE=9E=E4=BD=93=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java | 2 +- .../java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java | 2 +- .../java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 9 ++++----- 3 files changed, 6 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 b241d49..7928693 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 @@ -181,7 +181,7 @@ public class AndonManageQueue extends BaseBean { @Column(name = "EC_DESC") @ApiParam(value = "事件具体原因") - private String ec_desc; + private String ecDesc; @Column(name = "EM_CODE") @ApiParam(value = "事件方法代码") 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 38e3bbd..bdc2403 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 @@ -181,7 +181,7 @@ public class AndonManageRecord extends BaseBean { @Column(name = "EC_DESC") @ApiParam(value = "事件具体原因") - private String ec_desc; + private String ecDesc; @Column(name = "EM_CODE") @ApiParam(value = "事件方法代码") 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 e1e7d77..da0802d 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 @@ -150,15 +150,14 @@ public class AndonEnumUtil { /** * 优先级别 - * 1 - 一级，2 - 二级，3 - 三级，4 - 四级 + * 10 - 一级，20 - 二级，30 - 三级 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_PRIORITY{ - FIRST(1,"一级"), - SECOND(2,"二级"), - THIRD(3,"三级"), - FOURTH(4,"四级"); + FIRST(10,"一级"), + SECOND(20,"二级"), + THIRD(30,"三级"); private int value; private String description; From cca408fcf023a09d7f0f7befcedf3c819fa32ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 14 May 2019 11:54:54 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=8F=B0=EF=BC=9A?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0=E8=B4=9F=E5=BA=93=E5=AD=98?= =?UTF-8?q?+=E6=B5=81=E7=A8=8B=E9=85=8D=E7=BD=AE=EF=BC=9A=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=B7=BB=E5=8A=A0POSITION=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 25 ++++------------------ .../pojo/wms/bean/WmsActionGroupDetails.java | 2 +- 2 files changed, 5 insertions(+), 22 deletions(-) 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 df3f6d5..28139af 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 @@ -52,42 +52,25 @@ public class WmsActionGroup extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long initAmId; -// @Transient -// @ApiParam(value = "初始化组件名称") -// private String initAmName; - @Column(name = "DETAILS_AM_ID") @ApiParam(value = "明细处理组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long detailsAmId; -// @Transient -// @ApiParam(value = "明细处理组件名称") -// private String detailsAmName; - - @Column(name = "SUBMIT_AM_ID") - @ApiParam(value = "提交组件编号", example = "0") - @JsonSerialize(using = ToStringSerializer.class) - private Long submitAmId; - -// @Transient -// @ApiParam(value = "提交组件名称") -// private String submitAmName; - @Column(name = "END_AM_ID") @ApiParam(value = "结束组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long endAmId; -// -// @Transient -// @ApiParam(value = "结束组件名称") -// private String endAmName; // 1=true, 2 = false @Column(name = "AUTO_INIT") @ApiParam(value = "任务自动初始化", example = "0") private Integer autoInit; + @Column(name = "POSITION") + @ApiParam(value = "GOJS位置") + private String position; + public Long getInitAmId() { if (initAmId != null) { return initAmId.longValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index 54a9528..beb6129 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -27,7 +27,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_ACTION_GROUP_DETAILS") +@Table(name = "WMS_ACTION_GROUP_DETAILS") @Api("作业流程明细") public class WmsActionGroupDetails extends BaseBean { From dfba307e43191a7f9b996f8529de28e3cd2e2169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 14 May 2019 11:58:45 +0800 Subject: [PATCH 04/10] =?UTF-8?q?ANDON=5FHQLPACK=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 c612f1d..e31b84d 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 @@ -137,6 +137,20 @@ public class AndonHqlPack { } /** + * 按条件查询ANDON事件处理方法 + * @param andonEventMethod + * @return + */ + public static DdlPackBean packHqlAndonAlarmEventMethod(AndonEventMethod andonEventMethod){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonEventMethod.getAlarmCode(), "alarmCode", result); + getStringBuilderPack(andonEventMethod, result); + + return result; + } + + /** * 按条件查询ANDON事件原因 * @param andonEventCause * @return From 8c5970d500653d82e39eeda88ab02260e74fc176 Mon Sep 17 00:00:00 2001 From: Silliter Date: Tue, 14 May 2019 13:05:41 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E7=89=A9=E7=90=86=E6=8C=89=E7=81=AF?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 c612f1d..6e11721 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 @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; import cn.estsh.i3plus.pojo.andon.bean.AndonPLC; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import org.apache.commons.lang3.StringUtils; @@ -155,13 +156,15 @@ public class AndonHqlPack { * @param andonManageQueue * @return */ - public static DdlPackBean packHqlAndonManageQueue(AndonManageQueue andonManageQueue){ + public static DdlPackBean packHqlAndonManageQueue(AndonManageQueue andonManageQueue, Object[] obj){ DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getInPackArray(obj, "statusCode", result); + getStringBuilderPack(andonManageQueue, result); return result; From b56994fcca4dc8b5dd6e9e24036e4974f36054b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 14 May 2019 13:16:13 +0800 Subject: [PATCH 06/10] =?UTF-8?q?ANDON=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/IAndonEventMethodRepository.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventMethodRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventMethodRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventMethodRepository.java new file mode 100644 index 0000000..78273af --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventMethodRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonEventMethod; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（ANDON_事件处理方法） + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-14 11:34 + * @Modify: + **/ +@Repository +public interface IAndonEventMethodRepository extends BaseRepository { +} From dbfae39ea6055ff7bfb3d4b776e7c99672122303 Mon Sep 17 00:00:00 2001 From: Silliter Date: Tue, 14 May 2019 14:08:34 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=AE=89=E7=81=AF=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java index 8455e8e..984c8a4 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java @@ -14,17 +14,4 @@ public class AndonResultBean { @ApiParam("处理结果") private String result; - - public AndonResultBean(boolean success, String msg) { - super(); - this.success = success; - this.msg = msg; - } - - public AndonResultBean(boolean success, String msg, String result) { - super(); - this.success = success; - this.msg = msg; - this.result = result; - } } From e2ce7c5ce9dd82a99e4cf6a87ff77490b267accb Mon Sep 17 00:00:00 2001 From: Silliter Date: Tue, 14 May 2019 16:26:02 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E7=89=A9=E7=90=86=E6=8C=89=E7=81=AF?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 033dbdb..60667d8 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 @@ -54,7 +54,7 @@ public class AndonHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(andonPLC.getWorkCellCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(andonPLC.getWorkCellCode(), "workCellCode", result); DdlPreparedPack.getStringEqualPack(andonPLC.getNodeIP(), "nodeIP", result); DdlPreparedPack.getStringEqualPack(andonPLC.getChannelName(), "channelName", result); @@ -62,6 +62,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonPLC.getTagAddress(), "tagAddress", result); DdlPreparedPack.getStringEqualPack(andonPLC.getTagType(), "tagType", result); DdlPreparedPack.getStringEqualPack(andonPLC.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getGroupNo(), "groupNo", result); getStringBuilderPack(andonPLC, result); return result; From b4f07905e5910c0eba7f2841d1de18a815208c57 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Tue, 14 May 2019 17:34:48 +0800 Subject: [PATCH 09/10] =?UTF-8?q?sweb=20=E5=8F=91=E5=B8=83=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=8C=89=E5=A4=A9=E5=8F=91?= =?UTF-8?q?=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java | 5 +---- .../src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index eb78593..d075fdf 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -66,11 +66,8 @@ public class SwebPurchaseOrderDetails extends BaseBean { @Column(name = "UNIT") private String unit; - /** - * 不冗余主表数据 - */ @ApiParam(value = "行项目状态", example = "1") - @Transient + @Column(name = "ITEM_STATUS") private Integer itemStatus; @Column(name = "BOX_QTY") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 93f65f4..80c33a0 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -115,16 +115,15 @@ public class SwebHqlPack { DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result); DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); - DdlPreparedPack.getStringEqualPack(details.getExpectedTime(), "expectedTime", result); return buildHql(details, result); } public static DdlPackBean getPurchaseOrderDetailsPublishListStatusWhereHql(SwebPurchaseOrderDetails details) { DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); - DdlPreparedPack.getStringEqualPack(details.getExpectedTime(), "expectedTime", result); return buildHql(details, result); } } From 72ac3490e4f1beee269e8ce0e664f327618c1035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 14 May 2019 18:01:45 +0800 Subject: [PATCH 10/10] =?UTF-8?q?ANDON=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) 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 da0802d..a80a65a 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 @@ -185,4 +185,33 @@ public class AndonEnumUtil { return tmp; } } + + /** + * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ALARM_CODE{ + + PART("MM","物料"), + QUALITY("QM","质量"), + EQUIP("EQ","设备"), + PROCESS("GY","工艺"), + CHECK("JC","检测"); + + private String value; + private String description; + + ALARM_CODE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } }