From fe72dc26d94f2602bd2c31ee4be9ac9055136355 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 4 Mar 2020 08:53:23 +0100 Subject: [PATCH 01/27] =?UTF-8?q?=E3=80=90=09bug=207581=201.=E5=9C=A8?= =?UTF-8?q?=E5=90=8C=E6=89=B9=E6=AC=A1=E6=9D=A1=E7=A0=81=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E3=80=822.=E5=90=8C=E6=89=B9=E6=AC=A1=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=81=9A=E5=85=A8=E5=B1=80=E5=8F=98=E9=87=8F=E5=B1=9E=E6=80=A7?= =?UTF-8?q?'=E5=8D=95=E5=BA=93=E4=BD=8D'=EF=BC=8C'=E5=8D=95=E4=BA=BA'?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E4=B8=BA'=E5=8D=95=E5=BA=93?= =?UTF-8?q?=E4=BD=8D'=E4=BF=9D=E6=8C=81=E7=8E=B0=E5=9C=A8=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=B8=8D=E5=8F=98=EF=BC=8C=E5=A6=82=E6=9E=9C=E4=B8=BA?= =?UTF-8?q?'=E5=8D=95=E4=BA=BA'=E5=88=99=E6=98=BE=E7=A4=BA=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E7=94=A8=E6=88=B7=E8=B4=A3=E4=BB=BB=E5=8C=BA=E4=B8=8B?= =?UTF-8?q?=E6=89=80=E6=9C=89=E5=90=8C=E6=89=B9=E6=AC=A1=E6=9D=A1=E7=A0=81?= =?UTF-8?q?(=E4=B8=8D=E9=99=90=E5=88=B6=E5=BA=93=E4=BD=8D)=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) 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 e0a78cc..e7b8cd0 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 @@ -5030,4 +5030,39 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * 同批次条码-查询范围 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUERY_RANGE_TYPE { + LOCATE(10, "库位"), AREA_OWNER(20, "责任区域"); + + private int value; + private String description; + + QUERY_RANGE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } } \ No newline at end of file From 1428b5f0aaa5da58c980a2813da3ad21f3c14f0e Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 4 Mar 2020 17:30:21 +0800 Subject: [PATCH 02/27] ptl --- .../java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 81ea67a..e8890bf 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -314,7 +314,7 @@ public class PtlPcnEnumUtil { public static SIGNAL_CHILD_CMD getByValue(String code) { for (SIGNAL_CHILD_CMD signalChildCmd : values()) { - if (signalChildCmd.getCode() == code) { + if (signalChildCmd.getCode().equals(code)) { return signalChildCmd; } } @@ -370,7 +370,7 @@ public class PtlPcnEnumUtil { public static TAG_LIGHT_COLOR_CMD getByValue(String code) { for (TAG_LIGHT_COLOR_CMD tagLightColorCmd : values()) { - if (tagLightColorCmd.getCode() == code) { + if (tagLightColorCmd.getCode().equals(code)) { return tagLightColorCmd; } } @@ -457,7 +457,7 @@ public class PtlPcnEnumUtil { public static FINISH_TAG_LIGHT_MUSIC_CMD getByValue(String code) { for (FINISH_TAG_LIGHT_MUSIC_CMD finishTagLightMusicCmd : values()) { - if (finishTagLightMusicCmd.getCode() == code) { + if (finishTagLightMusicCmd.getCode().equals(code)) { return finishTagLightMusicCmd; } } @@ -520,7 +520,7 @@ public class PtlPcnEnumUtil { public static FINISH_TAG_LIGHT_VOLUME_CMD getByValue(String code) { for (FINISH_TAG_LIGHT_VOLUME_CMD finishTagLightVolumeCmd : values()) { - if (finishTagLightVolumeCmd.getCode() == code) { + if (finishTagLightVolumeCmd.getCode().equals(code)) { return finishTagLightVolumeCmd; } } From cb1e8d5310d9f548f6af82a9b5e9461326249380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 4 Mar 2020 17:53:00 +0800 Subject: [PATCH 03/27] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96=20lac=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=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/lac/sqlpack/LacHqlPack.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index fdf9175..1a691aa 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -186,6 +186,8 @@ public class LacHqlPack { public static DdlPackBean packHqlCheckLacTaskCheckMasterOnly(LacTaskCheck lacTaskCheck){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(lacTaskCheck); DdlPreparedPack.getStringEqualPack(lacTaskCheck.getTaskCheckGroup(),"taskCheckGroup",ddlPackBean); + DdlPreparedPack.getNumEqualPack(lacTaskCheck.getStepId(),"stepId",ddlPackBean); + DdlPreparedPack.getNumNOEqualPack(lacTaskCheck.getId(),"id",ddlPackBean); return ddlPackBean; } } From 21c9af2007e97c5cd1d26c8454e322d86fe1440f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 5 Mar 2020 10:37:56 +0800 Subject: [PATCH 04/27] =?UTF-8?q?=E3=80=90PTL=5F=E5=8C=BA=E6=AE=B5?= =?UTF-8?q?=E4=BA=AE=E7=81=AF=E4=BB=BB=E5=8A=A1=E6=96=B0=E5=A2=9E=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java index 8c44e69..343c84d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java @@ -84,4 +84,8 @@ public class PtlAreaSectionTask extends BaseBean implements Serializable { @Column(name = "STATUS") @ApiParam("区段任务状态") private Integer status; + + @Column(name = "SEQ") + @ApiParam("区段任务顺序号") + private Integer seq; } From e15c2b6065905afbce8a1d324db821f62206afcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 5 Mar 2020 10:41:51 +0800 Subject: [PATCH 05/27] =?UTF-8?q?=E6=B7=BB=E5=8A=A0PTL=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 72 ++++++++++++++++++++++ .../pojo/ptl/bean/{PtlNode.java => PtlPcn.java} | 4 +- .../i3plus/pojo/ptl/bean/PtlPcnConnectLog.java | 56 +++++++++++++++++ .../pojo/ptl/repository/PtlNodeRepository.java | 4 +- .../ptl/repository/PtlPcnConnectLogRepository.java | 16 +++++ .../pojo/ptl/repository/PtlPcnRepository.java | 16 +++++ .../ptl/repository/PtlPcnTaskLogRepository.java | 16 +++++ .../estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java | 2 +- 8 files changed, 181 insertions(+), 5 deletions(-) rename modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/{PtlNode.java => PtlPcn.java} (95%) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnConnectLogRepository.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnRepository.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskLogRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index e8890bf..e1fad02 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -1388,4 +1388,76 @@ public class PtlPcnEnumUtil { return tmp; } } + + /** + * ptl-pcn定时任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PTL_PCN_TASK_STATUS { + + OPEN(1, "开启"), + CLOSE(2, "关闭"); + + private int value; + private String description; + + PTL_PCN_TASK_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + + /** + * mes-pcn定时任务同步结果状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PTL_PCN_TASK_SYNC_STATUS { + + SUCCESS(1, "ptl主服务定时任务工作清单同步成功"), + ERROR(2, "ptl主服务定时任务工作清单同步失败"); + + private int value; + private String description; + + PTL_PCN_TASK_SYNC_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java similarity index 95% rename from modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java rename to modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java index 1c842e1..b9e661b 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java @@ -25,9 +25,9 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "PTL_PCN_NODE") +@Table(name = "PTL_PCN") @Api("PCN节点") -public class PtlNode extends BaseBean implements Serializable { +public class PtlPcn extends BaseBean implements Serializable { private static final long serialVersionUID = -9140094723555406392L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java new file mode 100644 index 0000000..05d5c88 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.ptl.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 java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-22-17:20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_PCN_CONNECT_LOG") +@Api("PCN节点连接日志") +public class PtlPcnConnectLog extends BaseBean implements Serializable { + private static final long serialVersionUID = 2756240593256441951L; + + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "PCN_NAME") + @ApiParam("PCN名称") + private String pcnName; + + @Column(name = "PCN_VERSION") + @ApiParam("PCN版本") + private String pcnVersion; + + @Column(name = "CONNECT_IP") + @ApiParam("连接IP") + private String connectIp; + + @Column(name = "IS_CONNECT") + @ApiParam("是否连接") + private Integer isConnect; + + @Column(name = "REMARK") + @ApiParam("备注") + private String Remark; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlNodeRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlNodeRepository.java index d4b869c..4e8713a 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlNodeRepository.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlNodeRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.ptl.bean.PtlNode; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcn; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface PtlNodeRepository extends BaseRepository { +public interface PtlNodeRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnConnectLogRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnConnectLogRepository.java new file mode 100644 index 0000000..fb45c82 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnConnectLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcnConnectLog; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface PtlPcnConnectLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnRepository.java new file mode 100644 index 0000000..6ee2933 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcn; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface PtlPcnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskLogRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskLogRepository.java new file mode 100644 index 0000000..149a856 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcnTaskLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-27 + * @Modify: + **/ +@Repository +public interface PtlPcnTaskLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 6e5fc7e..3a7830f 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -149,7 +149,7 @@ public class PtlHqlPack { * @param organizeCode * @return */ - public static DdlPackBean getPtlPcnByCondition(PtlNode ptlPcn, String organizeCode) { + public static DdlPackBean getPtlPcnByCondition(PtlPcn ptlPcn, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); if (!StringUtils.isEmpty(ptlPcn.getConnectIp())) { DdlPreparedPack.getStringLikerPack(ptlPcn.getConnectIp(), "connectIp", packBean); From d87f5653a945c45296b7d4cb0b8ebdaeb82f0d3c Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 5 Mar 2020 11:32:31 +0800 Subject: [PATCH 06/27] =?UTF-8?q?1,=E4=BB=BB=E5=8A=A1=E5=91=A2=E7=AE=A1?= =?UTF-8?q?=E7=90=86=202=EF=BC=8C=E7=94=9F=E6=88=90=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java | 15 ++++ .../i3plus/pojo/ptl/bean/PtlAreaSectionTask.java | 4 + .../pojo/ptl/bean/PtlAreaSectionTaskDetail.java | 2 +- .../cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java | 4 + .../cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java | 8 ++ .../estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java | 87 ++++++++++++++++++++++ 6 files changed, 119 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java index 0ed78f0..25d55ab 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java @@ -14,7 +14,10 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; /** * @author Wynne.Lu @@ -42,4 +45,16 @@ public class PtlArea extends BaseBean implements Serializable { @ApiParam("区域名称") private String areaName; + @Transient + @ApiParam("区段集合") + private List ptlSectionList=new ArrayList<>(); + + @Transient + @ApiParam("区域名称") + private String name; + + + public String getName() { + return areaName; + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java index 343c84d..bbff28a 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java @@ -88,4 +88,8 @@ public class PtlAreaSectionTask extends BaseBean implements Serializable { @Column(name = "SEQ") @ApiParam("区段任务顺序号") private Integer seq; + + @Column(name = "qty") + @ApiParam("数量") + private Integer qty; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java index 38103b1..1d04433 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java @@ -28,7 +28,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("区段亮灯任务明细") public class PtlAreaSectionTaskDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = -7563481752643393714L; + private static final long serialVersionUID = -7563431552643393714L; @Column(name = "SECTION_TASK_NO") @ApiParam("区段任务编号") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java index c2949dd..64e3c64 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java @@ -88,4 +88,8 @@ public class PtlAreaTask extends BaseBean implements Serializable { @Column(name = "STATUS") @ApiParam("任务状态") private Integer status; + + @Column(name = "qty") + @ApiParam("数量") + private Integer qty; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java index 451d554..ef380a9 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -52,4 +53,11 @@ public class PtlSection extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String areaNo; + @Transient + @ApiParam("区域名称") + private String name; + + public String getName() { + return sectionName; + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 3a7830f..39fec2c 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -218,4 +218,91 @@ public class PtlHqlPack { } return packBean; } + + /** + * 区域任务主表 + * + * @param ptlAreaTask 区域任务主表 + * @return + */ + public static DdlPackBean packPtlAreaTask(PtlAreaTask ptlAreaTask) { + DdlPackBean result = new DdlPackBean(); + //查询参数封装 + DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskNo(), "taskNo", result); + DdlPreparedPack.getStringEqualPack(ptlAreaTask.getPartNo(), "partNo", result); + if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeStart()) + && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(ptlAreaTask.getCreateDateTimeStart(), ptlAreaTask.getCreateDateTimeEnd() + , "createDatetime", result, true); + } + DdlPreparedPack.getNumEqualPack(ptlAreaTask.getStatus(), "status", result); + DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskType(), "taskType", result); + DdlPreparedPack.getStringEqualPack(ptlAreaTask.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(ptlAreaTask.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result); + return result; + } + + /** + * 主任务表 + * + * @param ptlMainTask 主任务表 + * @return + */ + public static DdlPackBean packPtlMainTask(PtlMainTask ptlMainTask) { + DdlPackBean result = new DdlPackBean(); + //查询参数封装 + DdlPreparedPack.getStringEqualPack(ptlMainTask.getTaskNo(), "taskNo", result); + DdlPreparedPack.getStringEqualPack(ptlMainTask.getPartNo(), "partNo", result); + if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeStart()) + && org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(ptlMainTask.getCreateDateTimeStart(), ptlMainTask.getCreateDateTimeEnd() + , "createDatetime", result, true); + } + DdlPreparedPack.getNumEqualPack(ptlMainTask.getStatus(), "status", result); + DdlPreparedPack.getStringEqualPack(ptlMainTask.getTaskType(), "taskType", result); + DdlPreparedPack.getStringEqualPack(ptlMainTask.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(ptlMainTask.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result); + return result; + } + /** + * 区段 + * + * @param ptlAreaSectionTask 区段任务 + * @return + */ + public static DdlPackBean packPtlAreaSectionTask(PtlAreaSectionTask ptlAreaSectionTask) { + DdlPackBean result = new DdlPackBean(); + //查询参数封装 + DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaTaskNo(), "areaTaskNo", result); + DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getPartNo(), "partNo", result); + if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeStart()) + && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(ptlAreaSectionTask.getCreateDateTimeStart(), ptlAreaSectionTask.getCreateDateTimeEnd() + , "createDatetime", result, true); + } + DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaNo(), "areaNo", result); + DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getSectionNo(), "sectionNo", result); + DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(ptlAreaSectionTask.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result); + return result; + } + + /** + * 区段任务明细 + * + * @param ptlAreaSectionTaskDetail 区段任务明细 + * @return + */ + public static DdlPackBean packPtlAreaSectionTaskDetail(PtlAreaSectionTaskDetail ptlAreaSectionTaskDetail) { + DdlPackBean result = new DdlPackBean(); + //查询参数封装 + DdlPreparedPack.getStringEqualPack(ptlAreaSectionTaskDetail.getSectionTaskNo(), "sectionTaskNo", result); + DdlPreparedPack.getStringEqualPack(ptlAreaSectionTaskDetail.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(ptlAreaSectionTaskDetail.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result); + return result; + } } From 1fc4ae1ff91c8e238cc6048984b43d35dac0f538 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 5 Mar 2020 13:11:38 +0800 Subject: [PATCH 07/27] =?UTF-8?q?1,=E5=9B=9E=E9=80=80=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 276 +++++++++++++++++++++ 1 file changed, 276 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index e1fad02..a616aec 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -1460,4 +1460,280 @@ public class PtlPcnEnumUtil { return tmp; } } + + /** + * 单据主表类型(ASN,PO,MOVE,QC) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MASTER_ORDER_TYPE { + CREATE(10, "NORMAL", "正常"); + + private int value; + private String code; + private String description; + + MASTER_ORDER_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 valueOf(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 int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + /** + * 区域任务状态(ASN,PO,MOVE,QC) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MASTER_ORDER_STATUS { + CREATE(10, "CREATE", "创建"), + RECEIPT(20, "IN_PROGRESS", "处理中"), + RECEIPT_FINISH(30, "COMPLETED", "已完成"), + CANCELLED(40, "CANCELLED", "已取消"); + + private int value; + private String code; + private String description; + + MASTER_ORDER_STATUS(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 valueOf(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 int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + /** + * 区域任务类型(ASN,PO,MOVE,QC) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AREA_SECTION_TASK_TYPE { + CREATE(10, "CREATE", "JIT任务"), + RECEIPT(20, "IN_PROGRESS", "单据任务"), + RECEIPT_FINISH(30, "COMPLETED", "单点任务"); + + private int value; + private String code; + private String description; + + AREA_SECTION_TASK_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 valueOf(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 int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + /** + * 区域任务状态(ASN,PO,MOVE,QC) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AREA_TASK_STATUS { + CREATE(10, "CREATE", "创建"), + RECEIPT(20, "IN_PROGRESS", "处理中"), + RECEIPT_FINISH(30, "COMPLETED", "已完成"); + + private int value; + private String code; + private String description; + + AREA_TASK_STATUS(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 valueOf(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 int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 区域任务类型(ASN,PO,MOVE,QC) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AREA_TASK_TYPE { + CREATE(10, "JIT_TASK", "JIT任务"), + RECEIPT(20, "DOCUMENT_TASK", "单据任务"), + RECEIPT_FINISH(30, "SINGLE_POINT_TASK", "单点任务"); + + private int value; + private String code; + private String description; + + AREA_TASK_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 valueOf(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 int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } From aa403e9691a41fef873af2083de65cff5223d06a Mon Sep 17 00:00:00 2001 From: joke Date: Thu, 5 Mar 2020 13:20:43 +0800 Subject: [PATCH 08/27] =?UTF-8?q?[ptl-pcn:39=20=E6=A0=A1=E9=AA=8C=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=8F=B7]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index e8890bf..81035f4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -736,7 +736,8 @@ public class PtlPcnEnumUtil { DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"), SCAN_CONTROL_CMD(40, "SCAN_CONTROL_CMD", "scanControlService", "扫描"), - INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"); + INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"), + GET_CONTROL_DATA_CONTROL_CMD(50, "GET_CONTROL_DATA_CONTROL_CMD", "getControlDataControlService", "获取控制器数据"); // UNLOCK_CONTROL_CMD(50, "UNLOCK_CONTROL_CMD", "unlockControlService", "解锁"), // LABEL_SELF_CHECK_CONTROL_CMD(60, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"), // LIGHT_DETAIL_CONTROL_CMD(70, "LABEL_SELF_CHECK_CONTROL_CMD", "lightDetailControlService", "亮灯明细"); diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java index 5ead0fb..48d3a70 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java @@ -107,4 +107,9 @@ public class PtlTag extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer errorCount; + @Column(name = "CUSTOM_ATTRIBUTE") + @ApiParam("自定义属性") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String customAttribute; + } From 0c85d7132bb8a086d24179a31d34434c760739ef Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 5 Mar 2020 13:38:27 +0800 Subject: [PATCH 09/27] =?UTF-8?q?1,=E5=9B=9E=E9=80=80=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java index bbff28a..eec1146 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java @@ -11,7 +11,10 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; /** * @author Wynne.Lu @@ -92,4 +95,8 @@ public class PtlAreaSectionTask extends BaseBean implements Serializable { @Column(name = "qty") @ApiParam("数量") private Integer qty; + + @ApiParam("区域任务明细") + @Transient + private List ptlAreaSectionTaskDetailList=new ArrayList<>(); } From 1e0d88fb0eecd41a33fd05b4d828bec04f342978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 5 Mar 2020 18:30:06 +0800 Subject: [PATCH 10/27] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=9A=E5=BC=80=E7=AA=97=E5=92=8C=E6=97=B6=E9=97=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BC=98=E5=8C=96+3D=E4=BB=93=E5=BA=93=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 6 ------ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 6 ++++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 3 ++- .../cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java | 8 ++++++-- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java index 3df382d..4445d2f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java @@ -39,4 +39,6 @@ public @interface DynamicField { String listColumnName() default ""; // 下拉搜索列名称,多个列名需要根据逗号分隔 String searchColumnName() default ""; + // 回显列名 + String explicitColumnName() default ""; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 116abff..9e8bd67 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -64,19 +64,16 @@ public abstract class BaseBean implements Serializable { @Column(name="ORGANIZE_CODE", nullable = false) @ApiParam(value ="组织代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) // @AnnoOutputColumn(hidden = true) public String organizeCode; @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) @ApiParam(value = "有效性",example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1) @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) @ApiParam(value = "是否已删除",example = "2") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1) @AnnoOutputColumn(hidden = true) //逻辑删除，软删除 public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA @@ -135,13 +132,11 @@ public abstract class BaseBean implements Serializable { @Transient @ApiParam(value = "排序属性") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String orderByParam = ""; @Transient @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1) //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc public transient Integer ascOrDesc = 1; @@ -158,5 +153,4 @@ public abstract class BaseBean implements Serializable { } return result; } - } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 338d1d6..41092ce 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -52,12 +52,14 @@ public class WmsLocate extends BaseBean { @Column(name = "WH_NO") @ApiParam(value = "仓库代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WareHouse", + searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code") private String whNo; @Column(name = "ZONE_NO") @ApiParam(value = "存储区代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; @Column(name = "FURNITURE_NO") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 42c9bf0..9362c05 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -147,7 +147,8 @@ public class WmsPart extends BaseBean { @Column(name = "IN_LOCATE_NO") @ApiParam(value = "默认入库库位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String inLocateNo; @Column(name = "PROD_CFG_TYPE_CODE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java index b46e544..0321169 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java @@ -93,11 +93,15 @@ public class WmsFieldInfo extends BaseBean { @ApiParam(value = "条件连接符:and/or") private String conditionConnector; - @Column(name = "LIST_COLUMNNAME") + @Column(name = "LIST_COLUMN_NAME") @ApiParam(value = "开窗列表显示列名称") private String listColumnName; - @Column(name = "SEARCH_COLUMNNAME") + @Column(name = "SEARCH_COLUMN_NAME") @ApiParam(value = "开窗搜索列名称") private String searchColumnName; + + @Column(name = "EXPLICIT_COLUMN_NAME") + @ApiParam(value = "回显列名") + private String explicitColumnName; } From cd8dea18148fcf97d863bf20e857b362db131ca1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 5 Mar 2020 20:10:59 +0800 Subject: [PATCH 11/27] ptl --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 14 +++++++++-- .../estsh/i3plus/pojo/ptl/model/LightOnModel.java | 27 ++++++++++++++++++++-- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index bdcae3c..4642ad9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -417,6 +417,15 @@ public class PtlPcnEnumUtil { this.description = description; } + public static TAG_LIGHT_TYPE getByValue(int value) { + for (TAG_LIGHT_TYPE tagLightType : values()) { + if (tagLightType.getValue() == value) { + return tagLightType; + } + } + return null; + } + public int getValue() { return value; } @@ -687,7 +696,8 @@ public class PtlPcnEnumUtil { LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "lightOnService", "亮灯命令"), LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "lightOffService", "灭灯命令"), CONTROL_SIGNAL_CMD(50, "CONTROL_SIGNAL_CMD", "controlSignalService", "控制器反馈信号"), - INTERFACE_SIGNAL_CMD(60, "INTERFACE_SIGNAL_CMD", "", "发送给界面actor通过websocket返回"); + INTERFACE_SIGNAL_CMD(60, "INTERFACE_SIGNAL_CMD", "", "发送给界面actor通过websocket返回"), + REFRESH_CONTROL_CMD(70, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"); private int value; private String code; @@ -737,7 +747,7 @@ public class PtlPcnEnumUtil { REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"), SCAN_CONTROL_CMD(40, "SCAN_CONTROL_CMD", "scanControlService", "扫描"), INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"), - GET_CONTROL_DATA_CONTROL_CMD(50, "GET_CONTROL_DATA_CONTROL_CMD", "getControlDataControlService", "获取控制器数据"); + GET_CONTROL_DATA_CONTROL_CMD(60, "GET_CONTROL_DATA_CONTROL_CMD", "getControlDataControlService", "获取控制器数据"); // UNLOCK_CONTROL_CMD(50, "UNLOCK_CONTROL_CMD", "unlockControlService", "解锁"), // LABEL_SELF_CHECK_CONTROL_CMD(60, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"), // LIGHT_DETAIL_CONTROL_CMD(70, "LABEL_SELF_CHECK_CONTROL_CMD", "lightDetailControlService", "亮灯明细"); diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java index 549116a..ba6659f 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java @@ -1,18 +1,41 @@ package cn.estsh.i3plus.pojo.ptl.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.ToString; import java.io.Serializable; /** - * @author Wynne.Lu + * @author wangjie * @date 2020/2/15 15:42 * @desc */ @Data -@ToString +@ApiModel("亮灯model") public class LightOnModel implements Serializable { private static final long serialVersionUID = -1089361557513425229L; + @ApiParam("标签地址，范围1~250,设置null即为所有标签") + private Integer tagNo; + + @ApiParam("内容：字母，数字，字符") + private String content; + + @ApiParam("颜色指令:枚举获取，TAG_LIGHT_COLOR_CMD") + private String colorCmd; + + @ApiParam("亮灯方式") + private Integer lightType; + + @ApiParam("音乐编号指令:枚举获取，FINISH_TAG_LIGHT_MUSIC_CMD") + private String musicCmd; + + @ApiParam("音量值指令:枚举获取，FINISH_TAG_LIGHT_VOLUME_CMD") + private String volumeCmd; + + @ApiParam("是否蜂鸣") + private Integer buzz; + } From 269d325549252944c4c5497b8d51fe33aa051858 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 6 Mar 2020 09:41:10 +0800 Subject: [PATCH 12/27] ptl --- .../src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java index ba6659f..7dd41d4 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java @@ -38,4 +38,10 @@ public class LightOnModel implements Serializable { @ApiParam("是否蜂鸣") private Integer buzz; + @ApiParam("是否熄灯，清除LED显示器") + private Integer ledFlag; + + @ApiParam("是否熄灯") + private Integer lightFlag; + } From fa9c02705b10c4febb6c421f4c33484cc5c1d498 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 6 Mar 2020 14:36:14 +0800 Subject: [PATCH 13/27] ptl enum --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.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/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 4642ad9..90092ae 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -796,7 +796,7 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WsBusiType { MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"), - INTERFACE_PROCESS(10, "INTERFACE_PROCESS", "界面处理"); + INTERFACE_PROCESS(20, "INTERFACE_PROCESS", "界面处理"); private int value; private String code; From d156ffb85ad030bb65fbe9c6a0ca7ed483e1f74f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 6 Mar 2020 15:24:23 +0800 Subject: [PATCH 14/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=AD=BB=E4=BF=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/ptl/annotation/ElasticSearch.java | 15 ++++++ .../estsh/i3plus/pojo/ptl/annotation/Json4Es.java | 15 ++++++ .../i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java | 56 ++++++++++++++++++++++ .../i3plus/pojo/ptl/model/ProductDataModel.java | 24 ++++++++++ .../repository/PtlSyncDeadLetterRepository.java | 12 +++++ 5 files changed, 122 insertions(+) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/ElasticSearch.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/Json4Es.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSyncDeadLetterRepository.java diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/ElasticSearch.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/ElasticSearch.java new file mode 100644 index 0000000..e31f9c1 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/ElasticSearch.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.annotation; + + +import java.lang.annotation.*; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/25 1:45 下午 + * @Description: + **/ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +@Documented +public @interface ElasticSearch { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/Json4Es.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/Json4Es.java new file mode 100644 index 0000000..b169b83 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/Json4Es.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.annotation; + + +import java.lang.annotation.*; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/25 1:45 下午 + * @Description: + **/ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +@Documented +public @interface Json4Es { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java new file mode 100644 index 0000000..0de2878 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.ptl.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.*; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2020/02/15 1:45 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_SYNC_DEAD_LETTER", indexes = { + @Index(name = "idx_object_code_pcn", columnList = "OBJECT_CODE"), + @Index(name = "idx_object_code_pcn", columnList = "PCN_CODE") +}) +@Api("数据同步死信") +public class PtlSyncDeadLetter extends BaseBean implements Serializable { + private static final long serialVersionUID = 1151025992437433734L; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "SYNC_TYPE") + @ApiParam("同步类型") + private Integer syncType; + + @Column(name = "PCN_CODE") + @ApiParam("pcn代码") + private String pcnCode; + + @Lob + @Column(name = "EX_MSG") + @ApiParam("同步数据") + private String exMsg; + + @Lob + @Column(name = "DATA") + @ApiParam("同步数据") + private String data; + + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java new file mode 100644 index 0000000..c4bbcd4 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.ptl.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("产品包装model") +public class ProductDataModel { + + @ApiParam("字段代码") + private String fieldCode; + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("字段值") + private String fieldValue; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSyncDeadLetterRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSyncDeadLetterRepository.java new file mode 100644 index 0000000..5f9062a --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSyncDeadLetterRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlSyncDeadLetter; + +/** + * @author Wynne.Lu + * @date 2020/2/18 09:19 + * @desc + */ +public interface PtlSyncDeadLetterRepository extends BaseRepository { +} From dd1e5778a9257553ad458eae582debc0dfe4cdaf Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 6 Mar 2020 15:37:26 +0800 Subject: [PATCH 15/27] ptl enum --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 106 ++++++++++----------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 90092ae..bcf68f3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -689,10 +689,10 @@ public class PtlPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MonitorProcessMessageType { + public enum MONITOR_PROCESS_MESSAGE_TYPE { CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"), DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), - EXCEPTION__DISCONNECT_CONTROL_CMD(25, "EXCEPTION_DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), + EXCEPTION_DISCONNECT_CONTROL_CMD(25, "EXCEPTION_DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "lightOnService", "亮灯命令"), LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "lightOffService", "灭灯命令"), CONTROL_SIGNAL_CMD(50, "CONTROL_SIGNAL_CMD", "controlSignalService", "控制器反馈信号"), @@ -704,7 +704,7 @@ public class PtlPcnEnumUtil { private String callClass; private String description; - MonitorProcessMessageType(int value, String code, String callClass, String description) { + MONITOR_PROCESS_MESSAGE_TYPE(int value, String code, String callClass, String description) { this.value = value; this.code = code; this.callClass = callClass; @@ -727,11 +727,11 @@ public class PtlPcnEnumUtil { return description; } - public static MonitorProcessMessageType getTypeByValue(String code) { + public static MONITOR_PROCESS_MESSAGE_TYPE getTypeByValue(String code) { if (StringUtils.isEmpty(code)) { return null; } - for (MonitorProcessMessageType enums : MonitorProcessMessageType.values()) { + for (MONITOR_PROCESS_MESSAGE_TYPE enums : MONITOR_PROCESS_MESSAGE_TYPE.values()) { if (enums.getCode().equals(code)) { return enums; } @@ -741,7 +741,7 @@ public class PtlPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum InterfaceSignalMessageType { + public enum INTERFACE_SIGNAL_MESSAGE_TYPE { CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"), DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"), @@ -757,7 +757,7 @@ public class PtlPcnEnumUtil { private String callClass; private String description; - InterfaceSignalMessageType(int value, String code, String callClass, String description) { + INTERFACE_SIGNAL_MESSAGE_TYPE(int value, String code, String callClass, String description) { this.value = value; this.code = code; this.callClass = callClass; @@ -780,11 +780,11 @@ public class PtlPcnEnumUtil { return description; } - public static InterfaceSignalMessageType getTypeByValue(String code) { + public static INTERFACE_SIGNAL_MESSAGE_TYPE getTypeByValue(String code) { if (StringUtils.isEmpty(code)) { return null; } - for (InterfaceSignalMessageType enums : InterfaceSignalMessageType.values()) { + for (INTERFACE_SIGNAL_MESSAGE_TYPE enums : INTERFACE_SIGNAL_MESSAGE_TYPE.values()) { if (enums.getCode().equals(code)) { return enums; } @@ -793,25 +793,33 @@ public class PtlPcnEnumUtil { } } + /** + * 生成任务actor message type + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WsBusiType { - MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"), - INTERFACE_PROCESS(20, "INTERFACE_PROCESS", "界面处理"); + public enum GEN_TASK_MESSAGE_TYPE { + GEN_TASK_CMD(10, "GEN_TASK_CMD", "", "生成任务"); private int value; private String code; + private String callClass; private String description; - WsBusiType(int value, String code, String description) { + GEN_TASK_MESSAGE_TYPE(int value, String code, String callClass, String description) { this.value = value; - this.description = description; this.code = code; + this.callClass = callClass; + this.description = description; } public int getValue() { return value; } + public String getCallClass() { + return callClass; + } + public String getCode() { return code; } @@ -819,22 +827,33 @@ public class PtlPcnEnumUtil { public String getDescription() { return description; } + + public static INTERFACE_SIGNAL_MESSAGE_TYPE getTypeByValue(String code) { + if (StringUtils.isEmpty(code)) { + return null; + } + for (INTERFACE_SIGNAL_MESSAGE_TYPE enums : INTERFACE_SIGNAL_MESSAGE_TYPE.values()) { + if (enums.getCode().equals(code)) { + return enums; + } + } + return null; + } } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WsDataType { - TEXT(10, "TEXT", "正常信息"), - EXP_TEXT(20, "EXP_TEXT", "异常信息"), - TABLE(30, "TABLE", "表格"); + public enum WsBusiType { + MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"), + INTERFACE_PROCESS(20, "INTERFACE_PROCESS", "界面处理"); private int value; private String code; private String description; - WsDataType(int value, String code, String description) { + WsBusiType(int value, String code, String description) { this.value = value; - this.code = code; this.description = description; + this.code = code; } public int getValue() { @@ -851,16 +870,16 @@ public class PtlPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum STATUS_TYPE { - START(10, "START", "开始状态"), - FINISH(20, "FINISH", "完成状态"), - TERMINATE(30, "TERMINATE", "中断状态"); + public enum WsDataType { + TEXT(10, "TEXT", "正常信息"), + EXP_TEXT(20, "EXP_TEXT", "异常信息"), + TABLE(30, "TABLE", "表格"); private int value; private String code; private String description; - STATUS_TYPE(int value, String code, String description) { + WsDataType(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -880,15 +899,16 @@ public class PtlPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum AREA_SECTION_TASK_DETAIL_STATUS { - CREATE(10, "CREATE", "创建"), - COMPLETE(20, "COMPLETE", "完成"); + public enum STATUS_TYPE { + START(10, "START", "开始状态"), + FINISH(20, "FINISH", "完成状态"), + TERMINATE(30, "TERMINATE", "中断状态"); private int value; private String code; private String description; - AREA_SECTION_TASK_DETAIL_STATUS(int value, String code, String description) { + STATUS_TYPE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -907,22 +927,18 @@ public class PtlPcnEnumUtil { } } - /** - * 生成任务actor message type - */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum GenTaskMessageType { - GEN_TASK_CMD(10, "GEN_TASK_CMD", "", "生成任务"); + public enum AREA_SECTION_TASK_DETAIL_STATUS { + CREATE(10, "CREATE", "创建"), + COMPLETE(20, "COMPLETE", "完成"); private int value; private String code; - private String callClass; private String description; - GenTaskMessageType(int value, String code, String callClass, String description) { + AREA_SECTION_TASK_DETAIL_STATUS(int value, String code, String description) { this.value = value; this.code = code; - this.callClass = callClass; this.description = description; } @@ -930,10 +946,6 @@ public class PtlPcnEnumUtil { return value; } - public String getCallClass() { - return callClass; - } - public String getCode() { return code; } @@ -941,18 +953,6 @@ public class PtlPcnEnumUtil { public String getDescription() { return description; } - - public static InterfaceSignalMessageType getTypeByValue(String code) { - if (StringUtils.isEmpty(code)) { - return null; - } - for (InterfaceSignalMessageType enums : InterfaceSignalMessageType.values()) { - if (enums.getCode().equals(code)) { - return enums; - } - } - return null; - } } /** From fcb56e09e5757ecc3f92a9bf7ea6bf5ce37b857d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 6 Mar 2020 17:04:03 +0800 Subject: [PATCH 16/27] =?UTF-8?q?=E3=80=90PTL=5F=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=99=A8=E5=8F=8D=E9=A6=88=E4=BF=A1=E5=8F=B7=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java index 64e3c64..cb738fd 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java @@ -31,7 +31,7 @@ public class PtlAreaTask extends BaseBean implements Serializable { @Column(name = "AREA_TASK_NO") @ApiParam("区域任务编号") - private Long areaTaskNo; + private String areaTaskNo; @Column(name = "AREA_NO") @ApiParam("区域代码") From 027470cb071198489235ae2e877e4da1deae50cc Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 6 Mar 2020 17:16:06 +0800 Subject: [PATCH 17/27] =?UTF-8?q?1,=E9=87=8D=E8=AF=95=202=EF=BC=8C?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=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/ptl/model/CommonMsgModel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java index 34116b7..13576e2 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.ptl.model; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteStatus; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -29,6 +30,9 @@ public class CommonMsgModel implements Serializable { @ApiModelProperty("消息类型") private String msgType; + @ApiModelProperty("是否重试") + private Integer isRestart= CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + @ApiModelProperty("消息数据") private Map msgData; From 531596d2d439bf6de1c186f2ad54efa71852759e Mon Sep 17 00:00:00 2001 From: joke Date: Fri, 6 Mar 2020 19:43:09 +0800 Subject: [PATCH 18/27] =?UTF-8?q?[mes:=2049=20JIT=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=B8=8E=E7=AE=A1=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 74 +++++++++++++++++- .../i3plus/pojo/mes/bean/MesCustProdLine.java | 8 ++ .../i3plus/pojo/mes/bean/MesProduceGroup.java | 42 ++++++++++ .../i3plus/pojo/mes/bean/MesProduceGroupCfg.java | 40 ++++++++++ .../i3plus/pojo/mes/bean/MesQueueGroupCount.java | 49 ++++++++++++ .../i3plus/pojo/mes/bean/MesQueueGroupRule.java | 49 ++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJitActual.java | 91 ++++++++++++++++++++++ .../pojo/mes/bean/MesQueueJitActualDetail.java | 61 +++++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJitPlan.java | 77 ++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJitPlanBom.java | 53 +++++++++++++ .../pojo/mes/bean/MesQueueJitPlanDetail.java | 49 ++++++++++++ .../repository/MesProduceGroupCfgRepository.java | 14 ++++ .../mes/repository/MesProduceGroupRepository.java | 14 ++++ .../repository/MesQueueGroupCountRepository.java | 14 ++++ .../repository/MesQueueGroupRuleRepository.java | 14 ++++ .../MesQueueJitActualDetailRepository.java | 14 ++++ .../repository/MesQueueJitActualRepository.java | 14 ++++ .../repository/MesQueueJitPlanBomRepository.java | 14 ++++ .../MesQueueJitPlanDetailRepository.java | 14 ++++ .../mes/repository/MesQueueJitPlanRepository.java | 14 ++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 42 ++++++++++ 21 files changed, 760 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupCfgRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupCountRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupRuleRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanBomRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanRepository.java 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 bc83711..850ce6c 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 @@ -1598,7 +1598,8 @@ public class MesEnumUtil { MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"), MES_PLC(390,"PLC地址清单"), MES_PROCESS(400,"工序信息"), - MES_KPSN_RULE(410,"关键件条码校验规则"); + MES_KPSN_RULE(410,"关键件条码校验规则"), + MES_QUEUE_JIT_ACTUAL(420,"客户JIT生产队列"); private int value; private String description; @@ -4062,4 +4063,75 @@ public class MesEnumUtil { return tmp; } } + + /** + * 客户JIT生产队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QUEUE_JIT_ACTUAL_STATUS { + CREATE(10, "创建"), + LANDED(20, "下达"), + CANCEL(30, "取消"); + + private int value; + private String description; + + MES_QUEUE_JIT_ACTUAL_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + + /** + * 客户JIT生产队列特殊标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG { + NORMAL(10, "正常"), + EMPTYING(20, "放空"); + + private int value; + private String description; + + MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java index c8da995..6224656 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java @@ -37,4 +37,12 @@ public class MesCustProdLine extends BaseBean implements Serializable { @Column(name = "CUST_PROD_LINE_NAME") @ApiParam("客户产线名称") private String custProdLineName; + + @Column(name = "PG_CODE") + @ApiParam("生产组代码") + private String pgCode; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java new file mode 100644 index 0000000..21fbfe9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.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 java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 9:34 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_GROUP") +@Api("MES_生产组") +public class MesProduceGroup extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6926189371427937743L; + + @Column(name = "PG_CODE") + @ApiParam("生产组代码") + private String pgCode; + + @Column(name = "PG_NAME") + @ApiParam("生产组名称") + private String pgName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java new file mode 100644 index 0000000..0648f2c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.mes.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 java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 9:22 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_GROUP_CFG") +@Api("MES_生产组配置") +public class MesProduceGroupCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 82611799819312505L; + @Column(name = "PG_CODE") + @ApiParam("生产组代码") + private String pgCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("生产线") + private String workCenterCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java new file mode 100644 index 0000000..1133c1a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.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 java.io.Serializable; + +/** + * @Description :MES_QUEUE_JIT_ACTUAL_DETAIL + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_GROUP_COUNT") +@Api("MES_队列分组计数") +public class MesQueueGroupCount extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7799006330177462162L; + + @Column(name = "QGR_CODE") + @ApiParam("分组规则代码") + private String qgrCode; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "QTY") + @ApiParam("分组数量") + private Integer qty; + + @Column(name = "CNT_QTY") + @ApiParam("累计数") + private Integer cntQty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java new file mode 100644 index 0000000..c9e3f4f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.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 java.io.Serializable; + +/** + * @Description :MES_QUEUE_GROUP_COUNT + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_GROUP_RULE") +@Api("MES_队列分组规则") +public class MesQueueGroupRule extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6857842499743356177L; + + @Column(name = "QGR_CODE") + @ApiParam("分组规则代码") + private String qgrCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户产线代码") + private String custPlantCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "QTY") + @ApiParam("分组数量") + private Integer qty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java new file mode 100644 index 0000000..e3f8e55 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.mes.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; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIT_ACTUAL") +@Api("MES_客户JIT生产队列") +public class MesQueueJitActual extends BaseBean implements Serializable { + + private static final long serialVersionUID = 655875369308810110L; + + @Column(name = "JIS_ACTUAL_NO") + @ApiParam("队列编号") + private String jisActualNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "SEQ") + @ApiParam("排序号") + private Double seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "SPECIAL_FLAG") + @ApiParam("特殊标识") + private Integer specialFlag; + + @Column(name = "CUST_POINT_DATE") + @ApiParam("客户需求时间") + private String custPointDate; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户产线代码") + private String custPlantCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "PG_CODE") + @ApiParam("生产组代码") + private String pgCode; + + @Transient + @ApiParam("客户需求开始时间") + private String custPointStartDate; + + @Transient + @ApiParam("客户需求结束时间") + private String custPointEndDate; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java new file mode 100644 index 0000000..77e6c6f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.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 java.io.Serializable; + +/** + * @Description :MES_QUEUE_JIT_ACTUAL + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL") +@Api("MES_客户JIT生产队列明细") +public class MesQueueJitActualDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1442091799346314190L; + + @Column(name = "QGR_CODE") + @ApiParam("分组规则代码") + private String qgrCode; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "PART_NAME") + @ApiParam("产品名称") + private String partName; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "GROUP_NO") + @ApiParam("组内编号") + private Integer groupNo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java new file mode 100644 index 0000000..d982dab --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java @@ -0,0 +1,77 @@ +package cn.estsh.i3plus.pojo.mes.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 java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 9:40 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIT_PLAN") +@Api("MES_客户JIT预装队列") +public class MesQueueJitPlan extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6613487463796132500L; + + @Column(name = "JIS_PLAN_NO") + @ApiParam("队列编号") + private String jisPlanNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "VEHICLE_CODE") + @ApiParam("选配码") + private String vehicleCode; + + @Column(name = "SEQ") + @ApiParam("计划排序号") + private String seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "PLAN_DATE") + @ApiParam("计划上线时间") + private String planDate; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantCode; + + @Column(name = "VERSION") + @ApiParam("版本号") + private String version; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java new file mode 100644 index 0000000..1d9faad --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.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 java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:01 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIT_PLAN_BOM") +@Api("MES_客户JIT预装队列BOM") +public class MesQueueJitPlanBom extends BaseBean implements Serializable { + + private static final long serialVersionUID = 2037991315471333415L; + + @Column(name = "JIS_PLAN_NO") + @ApiParam("队列编号") + private String jisPlanNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "ITEM_PART_NO") + @ApiParam("原材料物料号") + private String itemPartNo; + + @Column(name = "DOCK_NO") + @ApiParam("道口") + private String dockNo; + + @Column(name = "QTY") + @ApiParam("用量") + private Double qty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java new file mode 100644 index 0000000..7111b75 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.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 java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 9:58 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIT_PLAN_DETAIL") +@Api("MES_客户JIT预装队列明细") +public class MesQueueJitPlanDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1263996676519565026L; + + @Column(name = "JIS_PLAN_NO") + @ApiParam("队列编号") + private String jisPlanNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("产品名称") + private String partName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupCfgRepository.java new file mode 100644 index 0000000..9065d3c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupCfgRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProduceGroupCfg; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:53 上午 + * @Modify: + **/ +public interface MesProduceGroupCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupRepository.java new file mode 100644 index 0000000..55e5df0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProduceGroup; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:52 上午 + * @Modify: + **/ +public interface MesProduceGroupRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupCountRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupCountRepository.java new file mode 100644 index 0000000..5b5e0f3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupCountRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueGroupCount; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:54 上午 + * @Modify: + **/ +public interface MesQueueGroupCountRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupRuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupRuleRepository.java new file mode 100644 index 0000000..93a9798 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupRuleRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueGroupRule; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:55 上午 + * @Modify: + **/ +public interface MesQueueGroupRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualDetailRepository.java new file mode 100644 index 0000000..2a56b7b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitActualDetail; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:57 上午 + * @Modify: + **/ +public interface MesQueueJitActualDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualRepository.java new file mode 100644 index 0000000..d7d0062 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitActual; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:56 上午 + * @Modify: + **/ +public interface MesQueueJitActualRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanBomRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanBomRepository.java new file mode 100644 index 0000000..182e8d9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanBomRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanBom; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:58 上午 + * @Modify: + **/ +public interface MesQueueJitPlanBomRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanDetailRepository.java new file mode 100644 index 0000000..f645abc --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanDetail; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:58 上午 + * @Modify: + **/ +public interface MesQueueJitPlanDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanRepository.java new file mode 100644 index 0000000..2168ea9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlan; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:57 上午 + * @Modify: + **/ +public interface MesQueueJitPlanRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 3670819..9e068c0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2164,4 +2164,46 @@ public class MesHqlPack { } return packBean; } + + /** + * 客户JIT生产队列 + * + * @param queueJitActual + * @param organizeCode + * @return + */ + public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(queueJitActual.getJisActualNo())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getJisActualNo(), "jisActualNo", packBean); + } + if (!StringUtils.isEmpty(queueJitActual.getCustPlantCode())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getCustPlantCode(), "custPlantCode", packBean); + } + if (!StringUtils.isEmpty(queueJitActual.getCustFlagNo())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getCustFlagNo(), "custFlagNo", packBean); + } + if (!StringUtils.isEmpty(queueJitActual.getVinCode())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getVinCode(), "vinCode", packBean); + } + if (!StringUtils.isEmpty(queueJitActual.getProdCfgCode())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getProdCfgCode(), "prodCfgCode", packBean); + } + if (queueJitActual.getStatus() != null) { + DdlPreparedPack.getNumEqualPack(queueJitActual.getStatus(), "status", packBean); + } + if (!StringUtil.isEmpty(queueJitActual.getCreateDateTimeStart()) || !StringUtil.isEmpty(queueJitActual.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + queueJitActual.getCreateDateTimeStart(), + queueJitActual.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + if (!StringUtil.isEmpty(queueJitActual.getCustPointStartDate()) || !StringUtil.isEmpty(queueJitActual.getCustPointEndDate())) { + DdlPreparedPack.timeBuilder( + queueJitActual.getCustPointStartDate(), + queueJitActual.getCustPointEndDate(), + "createDatetime", packBean, true); + } + return packBean; + } } From 7beaa515c8b612a96cbf2c0c4ddfd574f8a1eb9c Mon Sep 17 00:00:00 2001 From: luweihao Date: Mon, 9 Mar 2020 10:53:45 +0800 Subject: [PATCH 19/27] =?UTF-8?q?task=20`1428`=20=20=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 4 +++ .../i3plus/pojo/mes/bean/MesPartProduceType.java | 38 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesProdRouteCfg.java | 4 +++ .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 4 +++ .../repository/MesPartProduceTypeRepository.java | 16 +++++++++ 5 files changed, 66 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProduceType.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProduceTypeRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index b326a99..011f6f5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -88,6 +88,10 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("产品编码匹配类型") private Integer productMatchType; + @Column(name = "产品生产类型") + @ApiParam("产品类型名称") + private String pptCode; + @Transient @ApiParam("产品类型名称") private String produceCategoryName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProduceType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProduceType.java new file mode 100644 index 0000000..e680c19 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProduceType.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.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 java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/3/5 11:54 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_PRODUCE_TYPE") +@Api("产品生产类型") +public class MesPartProduceType extends BaseBean implements Serializable { + private static final long serialVersionUID = 9191695513960958568L; + + @Column(name = "PPT_CODE") + @ApiParam("产品生产类型") + private String pptCode; + + @Column(name = "PPT_NAME") + @ApiParam("产品生产类型名称") + private String pptName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java index 0285bb7..5fb24e8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java @@ -45,4 +45,8 @@ public class MesProdRouteCfg extends BaseBean implements Serializable { @Column(name = "ROUTE_TYPE") @ApiParam("流程类型 10-扫描类型 20-监控类型") private Integer routeType; + + @Column(name = "PPT_CODE") + @ApiParam("产品生产类型") + private String pptCode; } 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 cb39dc8..040bac7 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 @@ -72,6 +72,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品类型名称") private String produceCategoryNameRdd; + @Column(name = "产品生产类型") + @ApiParam("产品类型名称") + private String pptCode; + @Transient @ApiParam("队列序号") private Double queueSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProduceTypeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProduceTypeRepository.java new file mode 100644 index 0000000..0dcd234 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProduceTypeRepository.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.MesPartProduceType; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPartProduceTypeRepository extends BaseRepository { +} From b10ddbc9584f12a761172e87b590275078c4bbbc Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 9 Mar 2020 16:01:26 +0800 Subject: [PATCH 20/27] ptl enum --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index bcf68f3..7d3d688 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -1747,4 +1747,54 @@ public class PtlPcnEnumUtil { return valueOf(val); } } + + /** + * redis过期时间 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EXPIRE_TIME { + + NEVER(-1, "不过期"), + ONE_HOUR(3600, "一小时"), + FIVE_MINS(300, "5分钟"), + HALF_HOUR(1800, "半小时"), + ONE_QUARTER(900, "一刻钟"), + ONE_MIN(60, "一分钟"); + + private int value; + private String description; + + EXPIRE_TIME(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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 String valueOfDescription2(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; + } + } + return tmp; + } + } } From 380fded580ee8cc8ce471227ec6827d25168d639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 9 Mar 2020 18:21:02 +0800 Subject: [PATCH 21/27] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=B8=85=E7=90=86=E5=AE=9E=E4=BD=93=E5=92=8C=E6=AD=BB=E4=BF=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java new file mode 100644 index 0000000..f218fc3 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.ptl.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 java.io.Serializable; +import java.util.Date; + +/** + * @author adair.song + * @date 2020/03/09 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_PCN_CLEAR") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_PCN数据清理") +public class PtlPcnClear extends BaseBean implements Serializable { + private static final long serialVersionUID = -1596443273899197995L; + + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name = "EXTRACT_CONDITION") + @ApiParam("获取数据条件") + private String extractCondition; + + @Column(name = "ACTION_FREQUENCY") + @ApiParam("执行频率") + private Integer actionFrequency; + + @Column(name = "LAST_SYNC_TIME") + @ApiParam("上一执行时间") + private Date lastSyncTime; + +} From 50d3de9b772040e905b3e1a6b6aeea89c585cc8e Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 9 Mar 2020 18:46:54 +0800 Subject: [PATCH 22/27] =?UTF-8?q?7600=20=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9=E3=80=82=207565=20=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E5=88=86=E7=BB=84=E5=8A=9F=E8=83=BD=E8=A6=81=E6=B1=82?= =?UTF-8?q?=E3=80=82=207633=20=E6=9D=A1=E7=A0=81=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E7=82=B9=E5=87=BB=E5=AF=BC=E5=87=BA=EF=BC=8C?= =?UTF-8?q?=E6=97=A5=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E4=BA=A7=E7=94=9F?= =?UTF-8?q?=E7=9A=84=E6=9D=A1=E7=A0=81=E6=97=A0=E6=B3=95=E8=A2=AB=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=EF=BC=8C=E7=95=8C=E9=9D=A2=E4=B8=8A=E7=9A=84=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=BA=94=E8=AF=A5=E6=98=AF=E6=9F=A5=E5=88=B0=E4=BB=80?= =?UTF-8?q?=E4=B9=88=E5=B0=B1=E5=AF=BC=E5=87=BA=E4=BB=80=E4=B9=88=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E5=86=8D=E5=8A=A0=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E9=A2=9D=E5=A4=96=E7=9A=84=E6=9D=A1=E4=BB=B6=207628=20?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=B0=83=E6=95=B4=E7=9B=98=E7=82=B9=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=89=AB=E6=8F=8F=E5=BA=93=E4=BD=8D=E5=90=8E=E7=9A=84?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=207640=20=E8=A7=A3=E5=86=BB=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E5=90=8E=E7=9A=84=E6=8F=90=E7=A4=BA=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=98=BE=E7=A4=BA=E6=9D=A1=E7=A0=81=EF=BC=8C=E5=86=BB?= =?UTF-8?q?=E7=BB=93=E6=98=AF=E6=9C=89=E7=9A=84=E3=80=82=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E9=83=BD=E6=98=BE=E7=A4=BA=207536=20?= =?UTF-8?q?=E6=B2=A1=E5=BA=93=E5=AD=98=E6=97=B6=E9=A2=86=E6=96=99=E4=B8=8E?= =?UTF-8?q?=E5=8F=91=E8=BF=90=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=B8=8B=E5=88=97=207659=20=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=8D=95=E5=86=BB=E7=BB=93=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=97=B6=E6=9D=A1=E7=A0=81is=5Fvaild=3D2=207617=20=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9A=84=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E6=A3=80=E6=B5=8B=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=9C=89=E6=B2=A1=E6=9C=89=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=EF=BC=8C=E7=8A=B6=E6=80=81=E4=B8=BA=E5=88=9B=E5=BB=BA=E7=9A=84?= =?UTF-8?q?=E6=89=8D=E5=8F=AF=E4=BB=A5=E6=89=93=E5=8D=B0=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=B8=94=E5=8F=AA=E8=83=BD=E6=89=93=E5=8D=B0=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E3=80=82=207652=20=E5=9C=A8=E6=9D=A1=E7=A0=81=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=8A=A5=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0=E7=BB=84?= =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=A1=86=E4=B9=9F=E9=9C=80=E8=A6=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=207454=20=E9=9C=80=E8=A6=81=E4=B8=80=E4=B8=AA=E9=85=8D?= =?UTF-8?q?=E6=96=99=E6=92=A4=E9=94=80=EF=BC=88=E9=92=88=E5=AF=B9=E5=8D=95?= =?UTF-8?q?=E4=B8=AA=E6=9D=A1=E7=A0=81=EF=BC=8C=E8=80=8C=E4=B8=8D=E6=98=AF?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=EF=BC=89=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E9=85=8D=E6=96=99=E7=9A=84=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E8=A2=AB=E6=92=A4=E5=9B=9E=E5=88=B0=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E4=B8=AD=EF=BC=8C=E9=9C=80=E8=A6=81=E8=80=83=E8=99=91?= =?UTF-8?q?=E5=90=84=E7=A7=8D=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=E5=8D=95?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E3=80=82=207631=20=E5=9C=A8=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9A=84=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=8A=8A=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E4=B8=AD=E7=9A=84src=5Forder=5Fno=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=87=BA=E6=9D=A5=EF=BC=8C=E5=AD=97=E6=AE=B5=E5=8F=96=E5=90=8D?= =?UTF-8?q?=E4=B8=BA=E5=8E=9F=E5=A7=8B=E5=8D=95=E5=8F=B7=207526=20?= =?UTF-8?q?=E5=8F=91=E8=BF=90=E5=8D=95=E6=8E=A5=E6=94=B6=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=9C=A8=E4=B8=BB=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=9C=A8=E8=AE=B2=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E4=BF=A1=E6=81=AF=E5=86=99=E5=85=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E8=AF=A5=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E6=9D=A1=E7=A0=81=E4=B8=AD=E5=8F=AA=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E4=B8=80=E6=AD=A5=E6=B3=95=E7=9A=84=E9=9B=B6=E4=BB=B6=E5=8F=B7?= =?UTF-8?q?=EF=BC=8C=E5=88=99=E8=AF=A5=E5=AD=97=E6=AE=B5=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=9C=A8=E5=89=8D=E5=8F=B0=E6=98=BE=E7=A4=BA=E4=B8=BA=E4=B8=80?= =?UTF-8?q?=E6=AD=A5=E6=B3=95=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E4=B8=A4=E6=AD=A5=E6=B3=95=E7=9A=84=E9=9B=B6=E4=BB=B6=E5=8F=B7?= =?UTF-8?q?=EF=BC=8C=E5=88=99=E6=98=BE=E7=A4=BA=E4=B8=BA=E4=B8=A4=E6=AD=A5?= =?UTF-8?q?=E6=B3=95=E3=80=82=207617=20=E5=87=BA=E5=BA=93=E5=8D=95?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9A=84=E6=89=93=E5=8D=B0=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E6=A0=87=E7=AD=BE=E6=8C=89=E9=92=AE=EF=BC=8C=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=A3=80=E6=B5=8B=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=9C=89=E6=B2=A1=E6=9C=89=E6=8F=90=E4=BA=A4=EF=BC=8C=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=BA=E5=88=9B=E5=BB=BA=E7=9A=84=E6=89=8D=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E6=89=93=E5=8D=B0=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E6=89=93=E5=8D=B0=E4=B8=80=E6=AC=A1=E3=80=82?= 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 | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 2 files changed, 3 insertions(+), 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 e7b8cd0..57cadad 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 @@ -3857,7 +3857,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRINT_TYPE { - SN(10, "SN"); + SN(10, "SN"), + PACKAGE_NO(20, "PACKAGE_NO"); private int value; private String description; 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 6e717a9..aec24ee 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 @@ -1301,6 +1301,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); DdlPreparedPack.timeBuilder(wmsStockSn.getQualityDateTimeStart()+","+ wmsStockSn.getQualityDateTimeEnd(), "qualityDate", result, false,false); if (wmsStockSn.getIsValid() != null) { From 00252caa0c609b3855ddc6d128bb2fd7d403b2ea Mon Sep 17 00:00:00 2001 From: luweihao Date: Mon, 9 Mar 2020 19:19:24 +0800 Subject: [PATCH 23/27] =?UTF-8?q?=E7=A7=BB=E5=8A=A8mespcn=E5=85=AC?= =?UTF-8?q?=E7=94=A8model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/ActorMessageModel.java | 37 ++++++++++++++++++++++ .../i3plus/pojo/mes/model}/StationRequestBean.java | 2 +- .../cn/estsh/i3plus/pojo/mes/model}/StepModel.java | 2 +- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes => i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model}/StationRequestBean.java (98%) rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes => i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model}/StepModel.java (98%) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java new file mode 100644 index 0000000..822087a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/3/9 15:35 + * @desc + */ +@Data +public class ActorMessageModel { + + private String msgType; + + private String clientInfo; + + private String workCellCode; + + private String workCenterCode; + + private String organizeCode; + + private String routeCode; + + private String serialNumber; + + private String productSn; + + private T dataObj; + + private List dataList; + + private Map dataMap; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java similarity index 98% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 46134cc..d4961d3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.model.mes; +package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java similarity index 98% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java index 6b7eedd..7636eae 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.model.mes; +package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; import lombok.Data; From 5cc5844e45179c2af7328b496bf537ebcbf6e577 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 11 Mar 2020 09:18:36 +0800 Subject: [PATCH 24/27] =?UTF-8?q?=E3=80=90=E5=BA=93=E5=AD=98=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E5=AE=9E=E4=BD=93-=E6=B7=BB=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20=E5=8C=85=E8=A3=85=E9=9B=B6=E4=BB=B6=E5=8F=B7?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index f72a66b..292a424 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -215,6 +215,10 @@ public class WmsStockSn extends BaseBean { @Transient public String labelNo; + @Column(name = "PACKAGE_PART_NO") + @ApiParam(value = "包装零件号") + private String packagePartNo; + @Transient @ApiParam(value = "工厂名称") public String organizeName; From eefb4721170af31037b6de193a590043d2479a56 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 11 Mar 2020 10:41:34 +0800 Subject: [PATCH 25/27] =?UTF-8?q?=E3=80=907650=20=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=89=AB=E6=8F=8F=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 81cd4b4..d05658c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -126,4 +126,15 @@ public class WmsDocMovementSn extends BaseBean { @Transient @ApiParam("父层级packcode对应的可回用零件号") private String parentReturnPart; + + @Transient + @ApiParam("剩余箱数量") + private Long countBox; + + public WmsDocMovementSn(){} + + public WmsDocMovementSn(Long countBox,String partNo) { + this.countBox = countBox; + this.partNo = partNo; + } } From 4d701aa9c4bec8647ae1281cbd2ddab8955ed5c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 11 Mar 2020 11:51:19 +0800 Subject: [PATCH 26/27] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ptl=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java | 2 +- .../estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 2 +- .../estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java | 4 ++++ .../i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 12 ++++++++++++ .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java | 8 ++++---- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java | 2 +- .../pojo/ptl/repository/PtlPcnClearRepository.java | 16 ++++++++++++++++ 7 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnClearRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index cd9a311..8956db4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -476,7 +476,7 @@ public class PtlEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYNC_PATTERN { - UPDATE(1, "修改"), + UPDATE(1, "新增或修改"), INSERT(2, "新增"); private int value; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 7d3d688..e452e94 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -1360,7 +1360,7 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYNC_PATTERN { - UPDATE(1, "修改"), + UPDATE(1, "新增或修改"), INSERT(2, "新增"); private int value; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index 620fa7d..649fe2d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.repository.NoRepositoryBean; import java.io.Serializable; +import java.util.Date; import java.util.List; import java.util.Map; @@ -378,4 +379,7 @@ public interface BaseRepository extends JpaReposito double findMinByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); double findMinByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); + + List findByHqlWhereByClear(DdlPackBean packBean, String dateTime); + } 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 103be31..b766f3f 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 @@ -1548,4 +1548,16 @@ public class BaseRepositoryImpl extends SimpleJpaRep } return num; } + + @Override + public List findByHqlWhereByClear(DdlPackBean packBean, String dateTime) { + StringBuffer queryString = new StringBuffer(); + queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 and model.createDatetime <= " + dateTime + " "); + + if (packBean != null) { + queryString.append(packBean.getWhereAppend()); + } + + return entityManager.createQuery(queryString.toString()).getResultList(); + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java index 6aec23d..55a0d3e 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java @@ -82,11 +82,11 @@ public class PtlBom extends BaseBean implements Serializable { @Column(name = "EFF_START_TIME") @ApiParam("有效起始日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) - private Date effStartTime; + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String effStartTime; @Column(name = "EFF_END_TIME") @ApiParam("有效截止日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) - private Date effEndTime; + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String effEndTime; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java index f218fc3..360d748 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java @@ -53,6 +53,6 @@ public class PtlPcnClear extends BaseBean implements Serializable { @Column(name = "LAST_SYNC_TIME") @ApiParam("上一执行时间") - private Date lastSyncTime; + private String lastSyncTime; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnClearRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnClearRepository.java new file mode 100644 index 0000000..c39a211 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnClearRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcnClear; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: adair.song + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface PtlPcnClearRepository extends BaseRepository { +} From cd19bfb429401680477e9cc4c5a452978a69edb9 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 11 Mar 2020 19:24:40 +0800 Subject: [PATCH 27/27] ptlpcn --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 36 +++++++++++----------- .../estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java | 1 + 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index e452e94..6c75133 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -351,12 +351,12 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TAG_LIGHT_COLOR_CMD { - TAG_LIGHT_COLOR_RED("00", 0, "红"), - TAG_LIGHT_COLOR_GREEN("01", 1, "绿"), - TAG_LIGHT_COLOR_ORANGE("02", 2, "橙"), - TAG_LIGHT_COLOR_BLUE("03", 3, "蓝"), - TAG_LIGHT_COLOR_PINK_RED("04", 4, "粉红"), - TAG_LIGHT_COLOR_BLUE_GREEN("05", 5, "蓝绿"); + TAG_LIGHT_COLOR_RED("00", 1, "红"), + TAG_LIGHT_COLOR_GREEN("01", 2, "绿"), + TAG_LIGHT_COLOR_ORANGE("02", 3, "橙"), + TAG_LIGHT_COLOR_BLUE("03", 4, "蓝"), + TAG_LIGHT_COLOR_PINK_RED("04", 5, "粉红"), + TAG_LIGHT_COLOR_BLUE_GREEN("05", 6, "蓝绿"); private String code; private Integer value; @@ -441,18 +441,18 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FINISH_TAG_LIGHT_MUSIC_CMD { - FINISH_TAG_LIGHT_MUSIC_00H("00", 0, "Jingle bells"), - FINISH_TAG_LIGHT_MUSIC_01H("01", 1, "Carmen"), - FINISH_TAG_LIGHT_MUSIC_02H("02", 2, "Happy Chinese new year"), - FINISH_TAG_LIGHT_MUSIC_03H("03", 3, "Edelweiss"), - FINISH_TAG_LIGHT_MUSIC_04H("04", 4, "Going home"), - FINISH_TAG_LIGHT_MUSIC_05H("05", 5, "PAPALA"), - FINISH_TAG_LIGHT_MUSIC_06H("06", 6, "Classical"), - FINISH_TAG_LIGHT_MUSIC_07H("07", 7, "Listen to the rhythm of the falling rain"), - FINISH_TAG_LIGHT_MUSIC_08H("08", 8, "Rock and roll"), - FINISH_TAG_LIGHT_MUSIC_09H("09", 9, "Happy birthday"), - FINISH_TAG_LIGHT_MUSIC_0AH("0A", 10, "Do Re Me"), - FINISH_TAG_LIGHT_MUSIC_0BH("0B", 11, "Strauss"); + FINISH_TAG_LIGHT_MUSIC_00H("00", 1, "Jingle bells"), + FINISH_TAG_LIGHT_MUSIC_01H("01", 2, "Carmen"), + FINISH_TAG_LIGHT_MUSIC_02H("02", 3, "Happy Chinese new year"), + FINISH_TAG_LIGHT_MUSIC_03H("03", 4, "Edelweiss"), + FINISH_TAG_LIGHT_MUSIC_04H("04", 5, "Going home"), + FINISH_TAG_LIGHT_MUSIC_05H("05", 6, "PAPALA"), + FINISH_TAG_LIGHT_MUSIC_06H("06", 7, "Classical"), + FINISH_TAG_LIGHT_MUSIC_07H("07", 8, "Listen to the rhythm of the falling rain"), + FINISH_TAG_LIGHT_MUSIC_08H("08", 9, "Rock and roll"), + FINISH_TAG_LIGHT_MUSIC_09H("09", 10, "Happy birthday"), + FINISH_TAG_LIGHT_MUSIC_0AH("0A", 11, "Do Re Me"), + FINISH_TAG_LIGHT_MUSIC_0BH("0B", 12, "Strauss"); private String code; private Integer value; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 39fec2c..bbb4564 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -235,6 +235,7 @@ public class PtlHqlPack { DdlPreparedPack.timeBuilder(ptlAreaTask.getCreateDateTimeStart(), ptlAreaTask.getCreateDateTimeEnd() , "createDatetime", result, true); } + DdlPreparedPack.getStringEqualPack(ptlAreaTask.getAreaNo(), "areaNo", result); DdlPreparedPack.getNumEqualPack(ptlAreaTask.getStatus(), "status", result); DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskType(), "taskType", result); DdlPreparedPack.getStringEqualPack(ptlAreaTask.getOrganizeCode(), "organizeCode", result);