From e2247b2657b4c17967a757eb9bcb9000da97e8d3 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 29 May 2019 17:11:08 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E5=91=BC=E5=8F=AB=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=92=8C=E5=93=8D=E5=BA=94=E5=8D=87=E7=BA=A7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java | 4 ++++ 1 file changed, 4 insertions(+) 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 0d568d9..a7a8359 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 @@ -245,6 +245,10 @@ public class AndonManageQueue extends BaseBean { private Double proportion; @Transient + @ApiParam(value = "当前比例（累加）", example = "0") + private Double currentProportion; + + @Transient @ApiParam(value = "总次数（用于报表统计）", example = "0") private Integer sumCount; From 045921bebae3f3c8a73936a86c9cb257af3263ad Mon Sep 17 00:00:00 2001 From: jiajack Date: Wed, 29 May 2019 19:13:22 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E8=B0=83=E5=BA=A6=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E7=BC=96=E5=86=99=E4=B8=8B=E7=BA=BF=E5=B7=A5=E6=AD=A5=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesRouteProcess.java | 61 ++++++++++++++++++++++ .../pcn/repository/MesRouteProcessRepository.java | 16 ++++++ 2 files changed, 77 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java new file mode 100644 index 0000000..6dd7933 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java @@ -0,0 +1,61 @@ +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; + +/** + * @Description :流程工序关系 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ROUTE_PROCESS") +@Api("流程工序关系") +public class MesRouteProcess extends BaseBean { + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "NEXT_PROCESS") + @ApiParam("下一工序") + private String nextProcess; + + @Column(name = "REPAIR_PROCESS") + @ApiParam("维修工序") + private String repairProcess; + + @Column(name = "SEQ") + @ApiParam("顺序") + private Integer seq; + + @Column(name = "IS_NECESSARY") + @ApiParam("是否必须") + private Integer isNecessary; + + public int getSeqVal() { + return this.seq == null ? 0 : this.seq; + } + + public int getIsNecessaryVal() { + return this.isNecessary == null ? 0 : this.isNecessary; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java new file mode 100644 index 0000000..5749bbd --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java @@ -0,0 +1,16 @@ +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.MesRouteProcess; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteProcessRepository extends BaseRepository { +} From 1efd33975d3725163be7abddcdce2d1ed1eb1e9a Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 30 May 2019 09:14:48 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=98=9F=E5=88=97?= =?UTF-8?q?=EF=BC=8C=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=EF=BC=8C=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E5=B7=A5=E5=8D=95=E4=BC=98=E5=8C=96=E5=92=8Cbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) 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 b600f3a..8769a6c 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 @@ -681,4 +681,33 @@ public class MesEnumUtil { return tmp; } } + + /** + * 通用条码枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum COMMON_SN { + QUEUE_SN("QUEUE_SN", "队列条码"); + + private String code; + private String description; + int value; + + COMMON_SN(String code, String description) { + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } } From 701430066e4652ca46e5a625546fdb15086c5a99 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 30 May 2019 12:10:11 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 43 ++++++++++------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 04141fd..5477b66 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1415,12 +1415,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep Query query = entityManager.createQuery(sb.toString()); setParameter(query,paramName,paramValue); - double sumResult = 0.0; - List objList = query.getResultList(); - if(objList.size() > 0){ - sumResult = Double.parseDouble(objList.iterator().next().toString()); - } - return sumResult; + return getNumberByResultList(query.getResultList()); }else{ throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); } @@ -1444,12 +1439,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep Query query = entityManager.createQuery(sb.toString()); setParameter(query,paramName,paramValue); - double sumResult = 0.0; - List objList = query.getResultList(); - if(objList.size() > 0){ - sumResult = Double.parseDouble(objList.iterator().next().toString()); - } - return sumResult; + return getNumberByResultList(query.getResultList()); }else{ throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); } @@ -1472,12 +1462,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep Query query = entityManager.createQuery(sb.toString()); setParameter(query,paramName,paramValue); - double sumResult = 0.0; - List objList = query.getResultList(); - if(objList.size() > 0){ - sumResult = Double.parseDouble(objList.iterator().next().toString()); - } - return sumResult; + return getNumberByResultList(query.getResultList()); }else{ throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); } @@ -1501,14 +1486,24 @@ public class BaseRepositoryImpl extends SimpleJpaRep Query query = entityManager.createQuery(sb.toString()); setParameter(query,paramName,paramValue); - double sumResult = 0.0; - List objList = query.getResultList(); - if(objList.size() > 0){ - sumResult = Double.parseDouble(objList.iterator().next().toString()); - } - return sumResult; + return getNumberByResultList(query.getResultList()); }else{ throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue); } } + + //从结果集中获取数字转换 + public double getNumberByResultList(List objList){ + double num = 0.0; + if(objList != null && objList.size() > 0){ + if(objList.get(0) != null){ + try { + num = Double.parseDouble(objList.get(0).toString()); + }catch(NumberFormatException ne){ + LOGGER.error("数字转换出错!",ne); + } + } + } + return num; + } } From 9b51768cb240c0b78b4976a55a8694930c990c9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 29 May 2019 18:57:27 +0800 Subject: [PATCH 05/25] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=A1=8C=E5=88=97=E6=95=B0=E9=87=8F=E4=B8=8D?= =?UTF-8?q?=E5=87=86=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9f58432..01ad207 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,7 +45,7 @@ public class BfElementPropertyVirtual extends BaseBean { private Long dataObjectId; @Column(name="PROPERTY_CODE") - @ApiParam(value ="类属性名称") + @ApiParam(value ="类属性代码") private String propertyCode; @Column(name="PROPERTY_NAME") From b89e5c5fb9cc80de9f89f4e102a7cdbf17acc74f Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 30 May 2019 13:12:00 +0800 Subject: [PATCH 06/25] =?UTF-8?q?=E5=91=BC=E5=8F=AB=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=92=8C=E5=93=8D=E5=BA=94=E5=8D=87=E7=BA=A7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/AndonAlarmDetailType.java | 42 ++++++++++++++++++++++ .../bean/AndonAlarmResponseCfg.java | 8 +++++ ...{AndonStopLineConfig.java => AndonHaltCfg.java} | 4 +-- ...epository.java => IAndonHaltCfgRepository.java} | 4 +-- .../sqlpack/AndonHqlPack.java | 8 ++--- 5 files changed, 58 insertions(+), 8 deletions(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmDetailType.java rename modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/{AndonStopLineConfig.java => AndonHaltCfg.java} (94%) rename modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/{IAndonStopLineCfgRepository.java => IAndonHaltCfgRepository.java} (68%) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmDetailType.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmDetailType.java new file mode 100644 index 0000000..b217ba9 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmDetailType.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 : 安灯子类型 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_ALARM_DETAIL_TYPE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯子类型") +public class AndonAlarmDetailType extends BaseBean { + + @Column(name = "ALARM_DETAIL_CODE") + @ApiParam(value = "安灯类型代码") + private String alarmDetailCode; + + @Column(name = "ALARM_DETAIL_NAME") + @ApiParam(value = "安灯类型名称") + private String alarmDetailName; + + @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/AndonAlarmResponseCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java index 091ddec..2a816ce 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java @@ -51,4 +51,12 @@ public class AndonAlarmResponseCfg extends BaseBean { @Column(name = "RP_LEVEL") @ApiParam(value = "通知级别") private String rpLevel; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME_RDD") + @ApiParam(value = "工作中心名称") + private String workCenterNameRdd; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStopLineConfig.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltCfg.java similarity index 94% rename from modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStopLineConfig.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltCfg.java index 9cd1a6f..b1718d0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStopLineConfig.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltCfg.java @@ -22,7 +22,7 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="ANDON_STOP_LINE_CFG", indexes = { +@Table(name="ANDON_HALT_CFG", indexes = { @Index(columnList = "WORK_CENTER_CODE", name = "ANDON_INDEX_WORK_CENTER_CODE"), @Index(columnList = "WORK_CELL_CODE", name = "ANDON_INDEX_WORK_CELL_CODE"), @Index(columnList = "ORGANIZE_CODE", name = "ANDON_INDEX_ORGANIZE_CODE"), @@ -32,7 +32,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯队列") -public class AndonStopLineConfig extends BaseBean { +public class AndonHaltCfg extends BaseBean { @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStopLineCfgRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltCfgRepository.java similarity index 68% rename from modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStopLineCfgRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltCfgRepository.java index 4042df9..134006a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStopLineCfgRepository.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltCfgRepository.java @@ -1,6 +1,6 @@ package cn.estsh.i3plus.pojo.andon.repository; -import cn.estsh.i3plus.pojo.andon.bean.AndonStopLineConfig; +import cn.estsh.i3plus.pojo.andon.bean.AndonHaltCfg; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import org.springframework.stereotype.Repository; @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface IAndonStopLineCfgRepository extends BaseRepository { +public interface IAndonHaltCfgRepository 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 3a8daf1..2566f56 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,7 +3,6 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; import cn.estsh.i3plus.pojo.andon.bean.*; 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; @@ -341,8 +340,9 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(responseCfg.getAlarmCode(), "alarmCode", result); DdlPreparedPack.getStringEqualPack(responseCfg.getAndonStatus(), "andonStatus", result); - DdlPreparedPack.getNumNOEqualPack(String.valueOf(AndonEnumUtil.ALARM_PRIORITY.FIRST.getValue()), - "rpLevel", result); + DdlPreparedPack.getStringEqualPack(responseCfg.getRpLevel(), "rpLevel", result); + DdlPreparedPack.getStringEqualPack(responseCfg.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(responseCfg.getRpObjectCode(), "rpObjectCode", result); getStringBuilderPack(responseCfg, result); @@ -354,7 +354,7 @@ public class AndonHqlPack { * @param stopLineConfig * @return */ - public static DdlPackBean packAndonStopLineCfg(AndonStopLineConfig stopLineConfig) { + public static DdlPackBean packAndonHaltCfg(AndonHaltCfg stopLineConfig) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(stopLineConfig.getAlarmCode(), "alarmCode", result); From 0b186e1317c89dbc479a4484b9a03b9710f5251a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 30 May 2019 17:55:13 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E7=89=A9=E6=B5=81=E8=B7=AF=E7=BA=BF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 74de1b5..f416723 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -170,10 +170,25 @@ public class WmsHqlPack { /** * 物流路线子表查询条件封装 + * @param wmsRoutingDetail + * @return + */ + public static DdlPackBean packHqlWmsRoutingDetail(WmsRoutingDetail wmsRoutingDetail) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(wmsRoutingDetail.getRoutingCode(), "routingCode", result); + + getStringBuilderPack(wmsRoutingDetail, result); + return result; + } + + /** + * 物流路线子表查询条件封装 * * @param routingCode * @return */ + @Deprecated public static DdlPackBean packHqlWmsRoutingChildren(String routingCode) { DdlPackBean result = new DdlPackBean(); @@ -184,6 +199,19 @@ public class WmsHqlPack { return result; } + /** + * 物流路线子表查询条件封装 + * @param wmsRoutingAssign + * @return + */ + public static DdlPackBean packHqlWmsRoutingAssign(WmsRoutingAssign wmsRoutingAssign) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(wmsRoutingAssign.getRoutingCode(), "routingCode", result); + + getStringBuilderPack(wmsRoutingAssign, result); + return result; + } /** * 物流路线主表查询条件封装 From 27b32626b3b2a1b0445240309b8e53537f0e0110 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 30 May 2019 17:55:58 +0800 Subject: [PATCH 08/25] =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=B8=BB=E5=8A=A8?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=92=8C=E5=90=AF=E5=8A=A8=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/AndonManageQueue.java | 27 +++++++++++++++++++ .../bean/AndonManageRecord.java | 31 ++++++++++++++++++++++ .../IAndonAlarmDetailTypeRepository.java | 16 +++++++++++ .../sqlpack/AndonHqlPack.java | 16 +++++++++++ .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 14 +++++++++- 5 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmDetailTypeRepository.java 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 a7a8359..31c9a41 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 @@ -256,6 +256,33 @@ public class AndonManageQueue extends BaseBean { @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; + + @Column(name = "EPM_NAME_RDD") + @ApiParam(value = "事件现象描述") + private String epmNameRdd; + + @Column(name = "IMPORTANCE_CODE") + @ApiParam(value = "重要等级代码") + private String importanceCode; + + @Column(name = "IMPORTANCE_NAME_RDD") + @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/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java index eb0887c..2ddb970 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 @@ -225,6 +225,37 @@ public class AndonManageRecord extends BaseBean { @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; + + @Column(name = "EPM_NAME_RDD") + @ApiParam(value = "事件现象描述") + private String epmNameRdd; + + @Column(name = "IMPORTANCE_CODE") + @ApiParam(value = "重要等级代码") + private String importanceCode; + + @Column(name = "IMPORTANCE_NAME_RDD") + @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/IAndonAlarmDetailTypeRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmDetailTypeRepository.java new file mode 100644 index 0000000..bdd6bab --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmDetailTypeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmDetailType; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（ANDON_子类型数据操作层） + * @Reference : + * @Author : sililter.yuan + * @CreateDate : 2019-05-30 11:05 + * @Modify: + **/ +@Repository +public interface IAndonAlarmDetailTypeRepository 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 2566f56..cf21486 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 @@ -365,4 +365,20 @@ public class AndonHqlPack { return result; } + + /** + * 安灯子类型信息封装 + * @param andonAlarmDetailType + * @return + */ + public static DdlPackBean packAndonAlarmDetailType(AndonAlarmDetailType andonAlarmDetailType) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmDetailCode(), "alarmDetailCode", result); + + getStringBuilderPack(andonAlarmDetailType, 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 7a0e241..6b92130 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.StringUtils; /** * @Description : @@ -57,7 +58,8 @@ public class AndonEnumUtil { ALARM_FLAG("10","安灯呼叫标识"), USER_CODE("20","用户工号"), READ_FLAG("30", "安灯读取状态"), - STOP_FLAG("40", "停线状态"); + STOP_FLAG("40", "停线状态"), + DETAIL_TYPE("50", "安灯子类型"); private String value; private String description; @@ -214,6 +216,16 @@ public class AndonEnumUtil { 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; + } } /** From 9d9f5a2cc25c95c4e9223254e0ff28fb680ce7e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 30 May 2019 18:03:55 +0800 Subject: [PATCH 09/25] =?UTF-8?q?=E6=8A=BD=E7=82=B9=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 02f9b9f..3fb1a51 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -540,6 +540,10 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result); //供应商编号 DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result); + //关联单号 + DdlPreparedPack.getStringLikerPack(wmsCheckFactRecord.getRefSrc(), "refSrc", result); + //关联单单据类型 + DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getRefType(), "refType", result); getStringBuilderPack(wmsCheckFactRecord, result); From 8e7b3d61e7bf0276b9293ec1d5d7251c92adc038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 30 May 2019 18:04:29 +0800 Subject: [PATCH 10/25] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 912baec..0a3be6b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1464,7 +1464,7 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum COMPONENT_TYPE { - PROCESS_HANDLING(10, "流程处理组件,"), + PROCESS_HANDLING(10, "流程处理组件"), PROCESS_INITIALIZATION(20, "流程初始化组件"), PROCESS_COMMIT(30, "流程提交组件"), DETAIL_PROCESS(40, "明细处理组件"), From d2fd8b428cab1fcbf0eaa97a51f51fd2ce533ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 30 May 2019 18:10:01 +0800 Subject: [PATCH 11/25] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=A4=8D=E6=9D=82=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=8C=BA=E9=97=B4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java index 09b1731..f4c744c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java @@ -32,6 +32,17 @@ public class WmsBsonPack { bson = BsonPackTool.getStringEqualPack(actionLog.getOrganizeCode(), "organizeCode", bson); bson = BsonPackTool.getNumEqualPack(actionLog.getIsValid(), "isValid", bson); bson = BsonPackTool.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", bson); + + if((actionLog.getStartTimeStart() != null&&actionLog.getStartTimeStart() !="") + || (actionLog.getStartTimeEnd() != null&&actionLog.getStartTimeEnd() != "")){ + bson = BsonPackTool.timeBuilder(actionLog.getStartTimeStart(), actionLog.getStartTimeEnd(), "startTime", bson, true); + } + + if((actionLog.getEndTimeStart() != null&&actionLog.getEndTimeStart() != "") + || (actionLog.getEndTimeEnd() != null&&actionLog.getEndTimeEnd() != "")){ + bson = BsonPackTool.timeBuilder(actionLog.getEndTimeStart(), actionLog.getEndTimeEnd(), "endTime", bson, true); + } + return bson; } From c9243ccad0d6518b77313d0083451af0a277e01c Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 30 May 2019 18:32:41 +0800 Subject: [PATCH 12/25] =?UTF-8?q?=E5=91=BC=E5=8F=AB=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=92=8C=E5=93=8D=E5=BA=94=E5=8D=87=E7=BA=A7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 6b92130..3e679f5 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 @@ -50,7 +50,7 @@ public class AndonEnumUtil { /** * 按灯业务状态 - * 安灯状态=10，工号 =20 ，读取状态=30, 停线=40 + * 安灯状态=10，工号 =20 ，读取状态=30, 停线=40, 安灯子类型=50, 原因代码=60 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_BUSI_FLAG{ @@ -59,7 +59,8 @@ public class AndonEnumUtil { USER_CODE("20","用户工号"), READ_FLAG("30", "安灯读取状态"), STOP_FLAG("40", "停线状态"), - DETAIL_TYPE("50", "安灯子类型"); + DETAIL_TYPE("50", "安灯子类型"), + AC_CODE("60", "原因代码"); private String value; private String description; From 5e02ce9c67163310396de4ee1dc8f6b798c57c8e Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 30 May 2019 18:55:07 +0800 Subject: [PATCH 13/25] =?UTF-8?q?=E5=91=BC=E5=8F=AB=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=92=8C=E5=93=8D=E5=BA=94=E5=8D=87=E7=BA=A7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java | 8 -------- .../java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java | 1 + 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java index 8bccd4e..220d4a5 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java @@ -32,18 +32,10 @@ public class AndonPLC extends BaseBean { @ApiParam(value = "工作中心代码") private String workCenterCode; - @Column(name = "WORK_CENTER_NAME") - @ApiParam(value = "工作中心名称") - private String workCenterName; - @Column(name = "WORK_CELL_CODE") @ApiParam(value = "工作单元代码") private String workCellCode; - @Column(name = "WORK_CELL_NAME") - @ApiParam(value = "工作单元名称") - private String workCellName; - @Column(name = "NODE_CODE") @ApiParam(value = "控制节点代码") private String nodeCode; 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 cf21486..87cc525 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 @@ -69,6 +69,7 @@ public class AndonHqlPack { public static DdlPackBean packHqlMesWorkCenter(MesWorkCenter mesWorkCenter){ DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", result); getStringBuilderPack(mesWorkCenter, result); return result; 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 14/25] =?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 4c8c550ba158e1bc7d4958ba403055ffca83a0a7 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 30 May 2019 20:59:05 +0800 Subject: [PATCH 15/25] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95=E6=89=93=E9=80=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java index d6d796b..ffbebed 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java @@ -57,6 +57,10 @@ public class BfCascadeDetail extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long parentId; + @Column(name = "PARENT_DEFAULT_VALUE") + @ApiParam(value = "父级默认值") + private String parentDefaultValue; + @Column(name = "PARENT_NAME_RDD") @ApiParam(value = "父级名称") private String parentNameRdd; From 47baf16e0f4171602393de5315b18245fd64c512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Fri, 31 May 2019 10:55:54 +0800 Subject: [PATCH 16/25] =?UTF-8?q?ANDON=E5=8A=A8=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3e679f5..bd4493f 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 @@ -124,7 +124,7 @@ public class AndonEnumUtil { /** * 按灯动作标志 - * 呼叫=10，签到 =20 ，撤销=30，40-解决，50-转呼 + * 10 = 呼叫，20 = 签到，30 = 撤销，40 = 解决，50 = 转呼 ,60 = 提交，70 = 审批 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ANDON_ACTION_FLAG{ From 1adcd23c6faf59425f6c905658dd1aa4e3b436cc Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 31 May 2019 13:00:50 +0800 Subject: [PATCH 17/25] =?UTF-8?q?=E5=91=BC=E5=8F=AB=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=92=8C=E5=93=8D=E5=BA=94=E5=8D=87=E7=BA=A7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 27 ++++++++++++++++++++++ 1 file changed, 27 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 bd4493f..706378e 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 @@ -293,4 +293,31 @@ public class AndonEnumUtil { return description; } } + + /** + * 按灯通知方式 + * 10-短信，20-邮箱 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum NOTICE_WAYS{ + + SMS("10","短信"), + EMAIL("20","邮箱"); + + private String value; + private String description; + + NOTICE_WAYS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } 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 18/25] =?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 19/25] =?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 20/25] =?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 21/25] =?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 22/25] =?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 23/25] =?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; From 93fa0d1aaaa16e275cdb93c34952f45feb9d2ad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 31 May 2019 18:41:18 +0800 Subject: [PATCH 24/25] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=B8=8Epdm=E6=AF=94=E5=AF=B9=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 28ddb48..cf9215a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -56,6 +56,10 @@ public class WmsMoveSn extends BaseBean { @ApiParam("条码") public String sn; + @Column(name="CSN") + @ApiParam("客户条码") + public String csn; + /** * 状态:1=创建,10=待处理,20=已处理 */ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index 0704421..55e0b3f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -44,6 +44,10 @@ public class WmsZones extends BaseBean { @ApiParam(value = "存储区名称") private String zoneName; + @Column(name = "PARENT_ZONE_NO") + @ApiParam(value = "上层存储区") + private String parentZoneNo; + @Column(name = "IS_PM") @ApiParam(value = "零件级管控" , example = "2") private Integer isPm; From c8008c80635b43310d1659e3026e1c2da710162b 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 19:00:44 +0800 Subject: [PATCH 25/25] =?UTF-8?q?=E8=B6=85=E5=A4=A7=E7=9A=84=E4=B8=80?= =?UTF-8?q?=E4=B8=AABUG=EF=BC=88=E5=A5=BD=E6=83=A8=E4=B8=80=E5=A5=B3?= =?UTF-8?q?=E7=9A=84=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 27 ++++++ .../pojo/mes/pcn/bean/MesProduceSnTravel.java | 105 ++++++++++++++++++++- 2 files changed, 131 insertions(+), 1 deletion(-) 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 b8a308c..8a7fdfc 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 @@ -132,4 +132,31 @@ public class MesProduceSn extends BaseBean { public int getPrintStatusVal() { return this.printStatus == null ? 0 : this.printStatus; } + + @Override + public String toString() { + return "MesProduceSn{" + + "serialNumber='" + serialNumber + '\'' + + ", partNo='" + partNo + '\'' + + ", partNameRdd='" + partNameRdd + '\'' + + ", qty=" + qty + + ", qcStatus=" + qcStatus + + ", snStatus=" + snStatus + + ", printCount=" + printCount + + ", printStatus=" + printStatus + + ", workCenterCode='" + workCenterCode + '\'' + + ", workCellCode='" + workCellCode + '\'' + + ", routeCode='" + routeCode + '\'' + + ", processCode='" + processCode + '\'' + + ", nextProcessCode='" + nextProcessCode + '\'' + + ", inWorkCenterTime='" + inWorkCenterTime + '\'' + + ", outWorkCenterTime='" + outWorkCenterTime + '\'' + + ", shippingTime='" + shippingTime + '\'' + + ", workOrderNo='" + workOrderNo + '\'' + + ", custSn='" + custSn + '\'' + + ", custPartNo='" + custPartNo + '\'' + + ", packageSn='" + packageSn + '\'' + + ", resultMsg='" + resultMsg + '\'' + + '}'; + } } 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 index 71e5b98..e5b4ee2 100644 --- 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 @@ -27,5 +27,108 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name="MES_PRODUCE_SN_TRAVEL") @Api("产品条码履历表") -public class MesProduceSnTravel extends MesProduceSn { +public class MesProduceSnTravel extends BaseBean { + @Column(name="SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name="PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name="QTY") + @ApiParam("数量") + private Double qty; + + @Column(name="QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus; + + @Column(name="SN_STATUS") + @ApiParam("条码状态") + private Integer snStatus; + + @Column(name="PRINT_COUNT") + @ApiParam("打印次数") + private Integer printCount; + + @Column(name="PRINT_STATUS") + @ApiParam("打印状态") + private Integer printStatus; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name="ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name="PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name="NEXT_PROCESS_CODE") + @ApiParam("下一工序代码") + private String nextProcessCode; + + @Column(name="IN_WC_TIME") + @ApiParam("进产线时间") + private String inWorkCenterTime; + + @Column(name="OUT_WC_TIME") + @ApiParam("出产线时间") + private String outWorkCenterTime; + + @Column(name="SHIPPING_TIME") + @ApiParam("发运时间") + private String shippingTime; + + @Column(name="WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name="CUST_SN") + @ApiParam("客户条码") + private String custSn; + + @Column(name="CUST_PART_NO") + @ApiParam("客户零件号") + private String custPartNo; + + @Column(name="PACKAGE_SN") + @ApiParam("包装条码") + private String packageSn; + + @Transient + @ApiParam("返回信息") + private String resultMsg; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public int getQcStatusVal() { + return this.qcStatus == null ? 0 : this.qcStatus; + } + + public int getSnStatusVal() { + return this.snStatus == null ? 0 : this.snStatus; + } + + public int getPrintCountVal() { + return this.printCount == null ? 0 : this.printCount; + } + + public int getPrintStatusVal() { + return this.printStatus == null ? 0 : this.printStatus; + } }