From 809c625fc51ecae1b89b90ce0e00b069cee79130 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 20 Jul 2020 16:45:24 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..268eaf2 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 4b3470b1fdea424e4a286047338b67471eae50e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 22 Jul 2020 17:57:03 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96=20=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=A4=B1=E8=B4=A5=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 11 +++++++++++ .../cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java | 13 ++++++++++++- .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 10 ++++------ 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 8fcfab5..f6eb1ae 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -218,6 +218,17 @@ public class ImppEnumUtil { return tmp; } + + public static LOG_LEVEL valueOf(int val) { + LOG_LEVEL tmp = ERROR; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i]; + } + } + return tmp; + } + public static String codeOfDescription(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java index 5f54d24..641bee9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.platform.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -9,7 +11,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; import javax.persistence.Column; import javax.persistence.Entity; @@ -139,4 +140,14 @@ public class SysTaskPlan extends BaseBean { } return taskPlanStatus.intValue(); } + + // 枚举 ImppEnumUtil.MESSAGE_TYPE + @Column(name = "LOG_LEVEL") + @ApiParam(value = "日志等级") + @AnnoOutputColumn(refClass = ImppEnumUtil.LOG_LEVEL.class) + private Integer logLevel; + + public int getLogLevelVal() { + return logLevel == null ? ImppEnumUtil.LOG_LEVEL.ERROR.getValue() : logLevel; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 166e94a..225cfd7 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -467,15 +467,13 @@ public class CoreHqlPack { DdlPreparedPack.getStringLikerPack(message.getMessageTitle(), "messageTitle", ddlPackBean); DdlPreparedPack.getStringLikerPack(message.getMessageContent(), "messageContent", ddlPackBean); DdlPreparedPack.getNumEqualPack(message.getMessageType(), "messageType", ddlPackBean); - DdlPreparedPack.getStringLikerPack(message.getMessageSenderNameRdd(), "messageSenderNameRdd", - ddlPackBean); - DdlPreparedPack.getStringLikerPack(message.getMessageReceiversNameRdd(), "messageReceiversNameRdd", - ddlPackBean); - DdlPreparedPack.timeBuilder(message.getMessageSendTime(), "messageSendTime", ddlPackBean, - false, false); + DdlPreparedPack.getStringLikerPack(message.getMessageSenderNameRdd(), "messageSenderNameRdd", ddlPackBean); + DdlPreparedPack.getStringLikerPack(message.getMessageReceiversNameRdd(), "messageReceiversNameRdd", ddlPackBean); + DdlPreparedPack.timeBuilder(message.getMessageSendTime(), "messageSendTime", ddlPackBean, false, false); DdlPreparedPack.getNumEqualPack(message.getMessageSenderId(), "messageSenderId", ddlPackBean); DdlPreparedPack.getNumEqualPack(message.getIsUrgent(), "isUrgent", ddlPackBean); DdlPreparedPack.getNumEqualPack(message.getMessageSoftType(), "messageSoftType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(message.getSendStatus(), "sendStatus", ddlPackBean); DdlPreparedPack.getOrderDefault(message); From 374e73128d4a53ab5240ef901eae79e2ae188a4e Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 22 Jul 2020 18:32:43 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E3=80=90=E5=9D=A4=E6=B3=B0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=B5=8B=E8=AF=95=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.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/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 66ad4a6..6b820ef 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 @@ -769,10 +769,10 @@ public class WmsEnumUtil { QUARANTINE(340, "QUARANTINE", "隔离"), BACK_QUARANTINE(350, "BACK_QUARANTINE", "反隔离"), DEFINITE_FAIL(360, "DEFINITE_FAIL", "不合格"), - RETURN(370, "RETURN", "KT退货"), - REWORK(380, "KT_REWORK", "KT返工"), - MISCALCULATION(390, "MISCALCULATION", "KT误判"), - SORTING(400, "SORTING", "KT分选"), + RETURN(370, "RETURN", "退货"), + REWORK(380, "REWORK", "返工"), + MISCALCULATION(390, "MISCALCULATION", "误判"), + SORTING(400, "SORTING", "分选"), VDA_STATIC_CS(410, "VDA_STATIC_CS", "静态盘点"), VDA_CS_SEARCH(420, "VDA_CS_SEARCH", "VDA盘点查询"), DEFINITE(430, "DEFINITE", "合格"), From a1136dd55dabb0745ca4b0f902bfeac8749cdc0e Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 23 Jul 2020 11:56:13 +0800 Subject: [PATCH 4/7] =?UTF-8?q?Fix=20bug=20#9697=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=99=A8=E5=85=B7=E7=B1=BB=E5=9E=8BBOM=E7=9A=84=E7=89=A9?= =?UTF-8?q?=E6=96=99=E7=B1=BB=E5=9E=8B=E5=8D=A1=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 268eaf2..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 13142b4ce1f5eec45cd5ee5854e83d13872973a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 23 Jul 2020 20:10:11 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B5=E6=A3=80?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java index fd4a786..79b60b3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java @@ -54,4 +54,7 @@ public class MesElectricDataModel implements Serializable { @ApiParam(value = "FTP文件") private Object ftpFile; + + @ApiParam(value = "过程条码") + private String serialNumber; } \ No newline at end of file From 41ff729f99b9a9e6d70bc43a9e545aa80ecd89fb Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 23 Jul 2020 22:07:20 +0800 Subject: [PATCH 6/7] workorderlog --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java index 7c57d0a..6213888 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java @@ -31,11 +31,11 @@ import java.io.Serializable; public class MesWorkOrderLog extends BaseBean implements Serializable { private static final long serialVersionUID = -5859382100462830988L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("工单号") private String orderNo; - @Column(name = "PART_NO") + @Column(name = "PART_NO", nullable = false) @ApiParam("物料号") private String partNo; @@ -154,7 +154,7 @@ public class MesWorkOrderLog extends BaseBean implements Serializable { @Lob @Column(name = "EXTEND") @ApiParam("扩展数据") - private String extend; + public String extend; @Column(name = "RESERVED1") @ApiParam("预留字段1") @@ -172,6 +172,10 @@ public class MesWorkOrderLog extends BaseBean implements Serializable { @ApiParam("预留字段4") private String reserved4; + @Column(name = "PARENT_PART_NO") + @ApiParam("父阶物料号") + private String parentPartNo; + /********************** 冗余字段 *********************************/ @Transient @ApiParam(value = "工作中心名称") From 03dbb18bb850e4c7ea47f5370a1819c480863335 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 23 Jul 2020 23:46:18 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=208832=20PO-HJMGN-19073--TJX5=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BD=86?= =?UTF-8?q?=E6=98=AF=E6=98=BE=E7=A4=BA=E4=BA=86=E6=96=B0=E6=9D=BE=E7=BA=BF?= =?UTF-8?q?=E7=9A=84=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E3=80=82--2020060?= =?UTF-8?q?9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 2ee4cc2..05520d5 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -556,6 +556,9 @@ public class AndonHqlPack { if (!StringUtils.isEmpty(mesEquipment.getWorkCellCode())){ DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean); } + if (!StringUtils.isEmpty(mesEquipment.getWorkCenterCode())){ + DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCenterCode(), "workCenterCode", packBean); + } if (!StringUtils.isEmpty(mesEquipment.getEquipmentCode())){ DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean); }