From ae4b32251a515d8c1adfcbbad7a7fc5461cd7150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 30 May 2019 19:42:05 +0800 Subject: [PATCH 1/7] =?UTF-8?q?WMS=E3=80=90=E6=B7=BB=E5=8A=A0=E2=80=9C?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8E=A8=E9=80=81=E6=9C=AA=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=9A=84=E7=A7=BB=E5=8A=A8=E5=8D=95=E5=88=B0=E9=98=9F=E5=88=97?= =?UTF-8?q?=E2=80=9D=E6=8E=A5=E5=8F=A3+BUG=E4=BF=AE=E5=A4=8D=EF=BC=9A?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=A4=84=E7=90=86=E9=94=99=E8=AF=AF=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E5=8D=95=E6=9F=A5=E8=AF=A2=E7=A7=BB=E5=8A=A8=E5=8D=95?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=8A=A0=E4=B8=8A=E5=B7=A5=E5=8E=82=E4=BB=A3?= =?UTF-8?q?=E7=A0=81+QC=E6=8E=A8=E9=80=81=E9=98=9F=E5=88=97=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E6=94=BE=E4=BA=86=E4=B8=80=E6=95=B4=E4=B8=AA=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E5=AF=BC=E8=87=B4=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=B8=BB=E7=A8=8B=E5=BA=8F=E6=97=A0=E6=B3=95=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E3=80=91MES=E3=80=90JIT=E9=98=9F=E5=88=97execute=E6=96=B9?= =?UTF-8?q?=E6=B3=95+=E6=9D=A1=E7=A0=81=E6=A0=A1=E9=AA=8C=E5=B7=A5?= =?UTF-8?q?=E6=AD=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/bean/MesProduceSnTravel.java | 31 +++++++++++++++++++++ .../pojo/mes/pcn/bean/MesQueueOrderDetail.java | 32 ++++++++++++++-------- .../repository/MesProduceSnTravelRepository.java | 17 ++++++++++++ .../pcn/repository/MesWorkCellPointRepository.java | 17 ++++++++++++ .../i3plus/pojo/mes/bean/MesProduceSnTravel.java | 27 ++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 9 ++++++ .../repository/MesProduceSnTravelRepository.java | 16 +++++++++++ .../mes/repository/MesWorkCellPointRepository.java | 16 +++++++++++ 8 files changed, 154 insertions(+), 11 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceSnTravelRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellPointRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java new file mode 100644 index 0000000..71e5b98 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; + +/** +* @Description : 产品条码履历实体类 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2019-05-29 16:22 +* @Modify: +**/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PRODUCE_SN_TRAVEL") +@Api("产品条码履历表") +public class MesProduceSnTravel extends MesProduceSn { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java index d32d1cf..d329bba 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description: @@ -24,48 +25,57 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="MES_QUEUE_ORDER_DETAIL") +@Table(name = "MES_QUEUE_ORDER_DETAIL") @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean { - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("主队列编号") private String orderNo; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") private String partNameRdd; - @Column(name="SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; - @Column(name="SEQ") + @Column(name = "SEQ") @ApiParam("队列明细序号") private Double seq; - @Column(name="QTY") + @Column(name = "QTY") @ApiParam("数量") private Double qty; - @Column(name="STATUS") + @Column(name = "STATUS") @ApiParam("状态") private Integer status; - @Column(name="WORK_TYPE") + @Column(name = "WORK_TYPE") @ApiParam("生产类型") private String workType; - @Column(name="PRODUCE_CATEGORY_CODE") + @Column(name = "PRODUCE_CATEGORY_CODE") @ApiParam("产品类型代码") private String produceCategoryCode; - @Column(name="PRODUCE_CATEGORY_NAME_RDD") + @Column(name = "PRODUCE_CATEGORY_NAME_RDD") @ApiParam("产品类型名称") private String produceCategoryNameRdd; + + @Transient + @ApiParam("队列序号") + private Double queueSeq; + + public double getQueueSeqVal() { + return this.queueSeq == null ? 0.0d : this.queueSeq; + } + public double getSeqVal() { return this.seq == null ? 0.0d : this.seq; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java new file mode 100644 index 0000000..60298a3 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSnTravel; +import org.springframework.stereotype.Repository; + +/** +* @Description : 条码履历Dao层接口 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2019-05-29 16:36 +* @Modify: +**/ +@Repository +public interface MesProduceSnTravelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java new file mode 100644 index 0000000..52319d0 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCell; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellPoint; +import org.springframework.stereotype.Repository; + +/** + * @Description :工站队列Dao层接口 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-29 14:40 + * @Modify: + **/ +@Repository +public interface MesWorkCellPointRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java new file mode 100644 index 0000000..8d6678e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import io.swagger.annotations.Api; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Entity; +import javax.persistence.Table; + +/** +* @Description : 产品条码履历实体类 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2019-05-29 16:22 +* @Modify: +**/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PRODUCE_SN_TRAVEL") +@Api("产品条码履历表") +public class MesProduceSnTravel extends MesProduceSn { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index d8ee647..636f096 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description: @@ -66,6 +67,14 @@ public class MesQueueOrderDetail extends BaseBean { @Column(name="PRODUCE_CATEGORY_NAME_RDD") @ApiParam("产品类型名称") private String produceCategoryNameRdd; + + @Transient + @ApiParam("队列序号") + private Double queueSeq; + + public double getQueueSeqVal() { + return this.queueSeq == null ? 0.0d : this.queueSeq; + } public double getSeqVal() { return this.seq == null ? 0.0d : this.seq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceSnTravelRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceSnTravelRepository.java new file mode 100644 index 0000000..f128b7c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceSnTravelRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProduceSnTravel; +import org.springframework.stereotype.Repository; + +/** +* @Description : 条码履历Dao层接口 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2019-05-29 16:36 +* @Modify: +**/ +@Repository +public interface MesProduceSnTravelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellPointRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellPointRepository.java new file mode 100644 index 0000000..3668ce5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellPointRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellPoint; +import org.springframework.stereotype.Repository; + +/** + * @Description :工站队列Dao层接口 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-29 14:40 + * @Modify: + **/ +@Repository +public interface MesWorkCellPointRepository extends BaseRepository { +} From 5a044130eabe7337a939dedbde78a639ac6415cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 31 May 2019 14:15:34 +0800 Subject: [PATCH 2/7] =?UTF-8?q?MES=E5=92=8CMES-PCN=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=9D=A1=E7=A0=81PRODUCT=5FSN=E5=AF=B9=E8=B1=A1=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E7=BB=9F=E4=B8=80+WMS=E6=B5=81=E7=A8=8B=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=8E=BB=E5=B7=A5=E5=8E=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java index dc7c2ea..b8a308c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -37,6 +37,10 @@ public class MesProduceSn extends BaseBean { @ApiParam("物料号") private String partNo; + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + @Column(name="QTY") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index d0bdab0..f0eaf9e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description: @@ -108,6 +109,10 @@ public class MesProduceSn extends BaseBean { @ApiParam("包装条码") private String packageSn; + @Transient + @ApiParam("返回信息") + private String resultMsg; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From 7ef2eb0c6eb9bbe0ca3ac85ad24488480be4636a Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Fri, 31 May 2019 14:12:55 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=20=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=89=93=E9=80=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockReportEnumUtil.java | 79 ---------------------- 1 file changed, 79 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java index 5e56bd1..6a9c5f6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java @@ -14,85 +14,6 @@ import java.util.List; **/ public class BlockReportEnumUtil { - /** - * 软件类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SOFT_TYPE { - CORE(2, "i3core", "i3业务平台"); - - private int value; - private String code; - private String description; - - private SOFT_TYPE(int value, String code, String description) { - this.value = value; - this.code = code; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getCode() { - return code; - } - - public String getDescription() { - return description; - } - - public static String valueOfCode(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].code; - } - } - return tmp; - } - - public static int codeOfValue(String code) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { - tmp = values()[i].value; - } - } - return tmp; - } - - public static String valueOfDescription(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - - public static SOFT_TYPE valueOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - return values()[i]; - } - } - return null; - } - - public static String codeOfDescription(String code) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { - tmp = values()[i].description; - } - } - return tmp; - } - } /** * 报表元素枚举 From f1e8f07a902ffadeb693f495cb89e3524b99a0ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Fri, 31 May 2019 15:20:25 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9C=80=E6=B1=82?= =?UTF-8?q?=EF=BC=9A=E8=87=AA=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/AndonDisposalCfg.java | 50 +++++++++++++ .../bean/AndonManageQueue.java | 8 +++ .../repository/IAndonDisposalCfgRepository.java | 16 +++++ .../sqlpack/AndonHqlPack.java | 17 +++++ .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 82 +++++++++++++++++++++- 5 files changed, 171 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonDisposalCfg.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonDisposalCfgRepository.java 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 new file mode 100644 index 0000000..8991528 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonDisposalCfg.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; + +/** + * @Description : ANDON_自处理配置 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-31 14:08 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_DISPOSAL_CFG") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_自处理配置") +public class AndonDisposalCfg extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型代码") + private String alarmCode; + + @Column(name = "AC_CODE") + @ApiParam(value = "呼叫原因代码") + private String acCode; + + @Column(name = "APPROVAL_STATUS") + @ApiParam(value = "审批状态") + private String approvalStatus; +} 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 31c9a41..35c7054 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 @@ -263,6 +263,13 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "处理类型") private String disposalType; + /** + * 1 = 是，2 = 否 + */ + @Transient + @ApiParam(value = "是否勾选加入自处理问题库", example = "2") + private Integer isDisposal; + @Column(name = "ALARM_DETAIL_CODE") @ApiParam(value = "安灯子类型代码") private String alarmDetailCode; @@ -283,6 +290,7 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "重要等级名称") private String importanceNameRdd; + // 是否转呼 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/repository/IAndonDisposalCfgRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonDisposalCfgRepository.java new file mode 100644 index 0000000..364abf5 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonDisposalCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalCfg; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : ANDON_自处理配置 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-31 14:14 + * @Modify: + **/ +@Repository +public interface IAndonDisposalCfgRepository extends BaseRepository { +} 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 87cc525..f7fc675 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 @@ -191,6 +191,23 @@ public class AndonHqlPack { } /** + * 按条件查询安灯自处理配置 + * @param andonDisposalCfg + * @return + */ + public static DdlPackBean packHqlAndonDisposalCfg(AndonDisposalCfg andonDisposalCfg){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getWorkCenterCode(),"workCenterCode", result); + DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getWorkCellCode(),"workCellCode", result); + DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAlarmCode(),"alarmCode", result); + DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAcCode(),"acCode", result); + + getStringBuilderPack(andonDisposalCfg, result); + return result; + } + + /** * 按条件查询按灯记录信息 * @param andonManageRecord * @return 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 706378e..1c0f803 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 @@ -11,6 +11,80 @@ import org.apache.commons.lang3.StringUtils; * @Modify: **/ public class AndonEnumUtil { + + /** + * 标准处理 = 10，自处理 = 20 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DISPOSAL_TYPE{ + STANDARD("10","标准处理"), + SELF("20","自处理"); + + private String value; + private String description; + + DISPOSAL_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value,val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 审批状态：10=待审批，20=二级审批，30=三级审批，40=四级审批，100=已审批 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum APPROVAL_STATUS{ + WAIT("10","待审批"), + SECOND_APPROVAL("20","二级审批"), + THIRD_APPROVAL("30","三级审批"), + FOUTH_APPROVAL("40","四级审批"), + FINISH("100","已审批"); + + private String value; + private String description; + + APPROVAL_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value,val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + /** * 按灯状态 * 10-是，20-否 @@ -89,7 +163,9 @@ public class AndonEnumUtil { CALL(1,"10","呼叫"), SIGN(2,"20","响应"), RESOLVE(3,"30","解决"), - CANCEL(4,"40", "撤销"); + CANCEL(4,"40", "撤销"), + COMMIT(5,"50","提交"), + PASS(6,"60","审批"); private int value; private String code; @@ -133,7 +209,9 @@ public class AndonEnumUtil { SIGN_ACTION("20","签到动作"), CANCEL_ACTION("30", "撤销动作"), RESOLVE_ACTION("40", "解决动作"), - SHIFG_CALL_ACTION("50", "转呼动作"); + SHIFG_CALL_ACTION("50", "转呼动作"), + COMMIT_ACTION("60","提交动作"), + PASS_ACTION("70","审批动作"); private String value; private String description; From 24f3b065cf99b7de9527f70f135392190511a737 Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 31 May 2019 15:30:25 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E7=8E=B0=E8=B1=A1=E5=92=8C=E9=87=8D=E8=A6=81=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/AndonEventPhenoMenon.java | 42 ++++++++++++++++++++++ .../bean/AndonImportance.java | 38 ++++++++++++++++++++ .../IAndonEventPhenoMenonRepository.java | 16 +++++++++ .../repository/IAndonImportanceRepository.java | 16 +++++++++ 4 files changed, 112 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonImportance.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventPhenoMenonRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonImportanceRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java new file mode 100644 index 0000000..1c8726d --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; + +/** + * @Description : ANDON_事件现象 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2019-05-31 9:47 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_EVENT_PHENOMENON") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_事件现象") +public class AndonEventPhenoMenon extends BaseBean { + + @Column(name = "EPM_CODE") + @ApiParam(value = "事件现象代码") + private String epmCode; + + @Column(name = "EPM_NAME") + @ApiParam(value = "事件现象描述") + private String epmName; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonImportance.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonImportance.java new file mode 100644 index 0000000..e7d4dc7 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonImportance.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; + +/** + * @Description : ANDON_重要度 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2019-05-31 9:47 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_IMPORTANCE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_事件现象") +public class AndonImportance extends BaseBean { + + @Column(name = "IMPORTANCE_CODE") + @ApiParam(value = "重要等级代码") + private String importanceCode; + + @Column(name = "IMPORTANCE_NAME") + @ApiParam(value = "重要等级名称") + private String importanceName; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventPhenoMenonRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventPhenoMenonRepository.java new file mode 100644 index 0000000..bbc00d3 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventPhenoMenonRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonEventPhenoMenon; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（ANDON_事件现象） + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-31 11:05 + * @Modify: + **/ +@Repository +public interface IAndonEventPhenoMenonRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonImportanceRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonImportanceRepository.java new file mode 100644 index 0000000..e598260 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonImportanceRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonImportance; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（ANDON_重要度） + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-31 11:05 + * @Modify: + **/ +@Repository +public interface IAndonImportanceRepository extends BaseRepository { +} From 4cbc41a95965b65a306308a9162daaf9e4e279b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 31 May 2019 16:52:37 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 83 +++++++++++++++++++++- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 1 + .../pojo/form/bean/BfElementPropertyVirtual.java | 4 +- 3 files changed, 85 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 895a4a9..f68a09e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -335,7 +335,7 @@ public class BlockFormEnumUtil { } } /** - * 元素显示状态信息 + * 元素属性显示状态信息 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ELEMENT_SHOW_STATUS { @@ -2036,4 +2036,85 @@ public class BlockFormEnumUtil { } } + /** + * 元素树方向 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ELEMENT_TREE_DIRECTION { + horizontal(1, "horizontal", "横向"), + vertical(2, "vertical", "竖向"); + + private int value; + private String code; + private String description; + + private ELEMENT_TREE_DIRECTION (int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static ELEMENT_TREE_DIRECTION valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 43adf39..46454dd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -113,6 +113,7 @@ public class CommonEnumUtil { /** * 处理标识 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TRUE_OR_FALSE { TRUE(1, "是"), FALSE(2, "否"); diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java index 01ad207..4e27e99 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java @@ -45,11 +45,11 @@ public class BfElementPropertyVirtual extends BaseBean { private Long dataObjectId; @Column(name="PROPERTY_CODE") - @ApiParam(value ="类属性代码") + @ApiParam(value ="虚拟属性代码") private String propertyCode; @Column(name="PROPERTY_NAME") - @ApiParam(value ="元素名称") + @ApiParam(value ="虚拟属性名称") private String propertyName; @Column(name="PROPERTY_TYPE") From d081c16c613023b494193cdc05075fa9d6df321a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Fri, 31 May 2019 17:07:06 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=AE=89=E7=81=AF=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=8C=E7=8A=B6=E6=80=81=EF=BC=8C=E5=AD=90=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=8C=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlpack/AndonHqlPack.java | 26 ++++++++++++++++++++++ .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 14 ++++++------ 2 files changed, 33 insertions(+), 7 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 f7fc675..32e0d77 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 @@ -399,4 +399,30 @@ public class AndonHqlPack { return result; } + + /** + * 安灯类型查询条件封装 + * @param andonAlarmType + * @return + */ + public static DdlPackBean packAndonAlarmType(AndonAlarmType andonAlarmType) { + DdlPackBean result = new DdlPackBean(); + + getStringBuilderPack(andonAlarmType, result); + + return result; + } + + /** + * 安灯状态查询条件封装 + * @param andonStatus + * @return + */ + public static DdlPackBean packAndonStatus(AndonStatus andonStatus) { + DdlPackBean result = new DdlPackBean(); + + getStringBuilderPack(andonStatus, 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 1c0f803..ca940ea 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 @@ -56,7 +56,7 @@ public class AndonEnumUtil { SECOND_APPROVAL("20","二级审批"), THIRD_APPROVAL("30","三级审批"), FOUTH_APPROVAL("40","四级审批"), - FINISH("100","已审批"); + FINISH("60","已审批"); private String value; private String description; @@ -200,18 +200,18 @@ public class AndonEnumUtil { /** * 按灯动作标志 - * 10 = 呼叫，20 = 签到，30 = 撤销，40 = 解决，50 = 转呼 ,60 = 提交，70 = 审批 + * 10 = 呼叫，20 = 签到，30 = 解决，40 = 撤销，50 = 提交，60 = 审批，70 = 转呼 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ANDON_ACTION_FLAG{ CALL_ACTION("10","呼叫动作"), SIGN_ACTION("20","签到动作"), - CANCEL_ACTION("30", "撤销动作"), - RESOLVE_ACTION("40", "解决动作"), - SHIFG_CALL_ACTION("50", "转呼动作"), - COMMIT_ACTION("60","提交动作"), - PASS_ACTION("70","审批动作"); + RESOLVE_ACTION("30", "解决动作"), + CANCEL_ACTION("40", "撤销动作"), + COMMIT_ACTION("50","提交动作"), + PASS_ACTION("60","审批动作"), + SHIFG_CALL_ACTION("70", "转呼动作"); private String value; private String description;