From 5554bfd14c208d1c4f8cbd7697558685bdf6a471 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Tue, 30 Mar 2021 11:08:21 +0800 Subject: [PATCH 1/8] =?UTF-8?q?14520=2020027--=E7=AE=A1=E7=90=86=E7=AB=AF-?= =?UTF-8?q?-=E6=8E=A7=E5=88=B6=E8=AE=A1=E5=88=92--=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E3=80=81=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E7=94=9F=E6=95=88=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6-2021-03-?= =?UTF-8?q?17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 5ac24b1..5ab12ee 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 @@ -3493,10 +3493,13 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(controlPlan.getCustCode(), "custCode", packBean); } if (!StringUtils.isEmpty(controlPlan.getVersion())) { - DdlPreparedPack.getNumberBiggerEqualPack(controlPlan.getVersion(), "version", packBean); + DdlPreparedPack.getNumEqualPack(controlPlan.getVersion(), "version", packBean); } if (!StringUtils.isEmpty(controlPlan.getAuditType())) { - DdlPreparedPack.getNumberBiggerEqualPack(controlPlan.getAuditType(), "auditType", packBean); + DdlPreparedPack.getNumEqualPack(controlPlan.getAuditType(), "auditType", packBean); + } + if (!StringUtils.isEmpty(controlPlan.getIsEnable())) { + DdlPreparedPack.getNumEqualPack(controlPlan.getIsEnable(), "isEnable", packBean); } return packBean; } From 072bc431fb5f0c432ed7b3a5aa7594c6479ebfa4 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 30 Mar 2021 19:07:01 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=89=AD=E7=9F=A9=E9=87=87=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java index c48d8cb..59b5cac 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java @@ -113,6 +113,10 @@ public class MesKpData extends BaseBean implements Serializable { @ApiParam("记录颜色") private String color; + @Transient + @ApiParam("特殊码") + private String specificSn; + public double getKeyDataCountVal() { return this.keyDataCount == null ? 0 : this.keyDataCount; From 9eba8f1683c51b66ce01c9c0fa87c90b791d17d2 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Wed, 31 Mar 2021 13:51:45 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=A4=A9=E6=B4=A5-PCN:=E7=89=A9=E6=96=99?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E4=B8=8E=E7=89=A9=E6=96=99=E7=BB=91=E5=AE=9A=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E6=A0=87=E7=AD=BE=E6=98=8E=E7=BB=86=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=A0=87=E8=AF=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/IfPartCheckCustomerLabel.java | 17 +++++++++++++++++ .../pojo/mes/bean/IfPartCheckCustomerLabelDetail.java | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabel.java index 67326d7..af00520 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabel.java @@ -34,4 +34,21 @@ public class IfPartCheckCustomerLabel extends BaseBean { @Column(name = "IS_CHECK") @ApiParam("是否校验") private Integer isCheck; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + @Lob + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabelDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabelDetail.java index fdb6abf..6b2235e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabelDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabelDetail.java @@ -34,4 +34,21 @@ public class IfPartCheckCustomerLabelDetail extends BaseBean { @Column(name = "CUSTOMER_LABEL") @ApiParam("客户标签") private String customerLabel; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + @Lob + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; } From f12c568119735a22d3be541d517948d2bc57de1b Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Wed, 31 Mar 2021 14:01:38 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=A4=A9=E6=B4=A5:=E7=89=A9=E6=96=99?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E5=92=8C=E7=89=A9=E6=96=99=E7=BB=91=E5=AE=9A=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E6=A0=87=E7=AD=BE=E6=98=8E=E7=BB=86=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=A0=87=E8=AF=86=E8=B5=8B=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabel.java | 2 ++ .../cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabelDetail.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabel.java index af00520..feb6f08 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabel.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -36,6 +37,7 @@ public class IfPartCheckCustomerLabel extends BaseBean { private Integer isCheck; @Column(name = "SYNC_STATUS") + @ColumnDefault("10") @ApiParam("同步状态") private Integer syncStatus; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabelDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabelDetail.java index 6b2235e..17d59c1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabelDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartCheckCustomerLabelDetail.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -36,6 +37,7 @@ public class IfPartCheckCustomerLabelDetail extends BaseBean { private String customerLabel; @Column(name = "SYNC_STATUS") + @ColumnDefault("10") @ApiParam("同步状态") private Integer syncStatus; From ca8bfd3f531d765746e7adb9531ad18fb5e54a05 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 31 Mar 2021 19:48:32 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=B3=B0=E5=9B=BD=E6=89=AD=E7=9F=A9?= =?UTF-8?q?=E9=87=87=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java index 59b5cac..a84f553 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java @@ -107,7 +107,7 @@ public class MesKpData extends BaseBean implements Serializable { @Transient @ApiParam("实采个数") - private Integer actualNum; + private Integer actualNum = 0; @Transient @ApiParam("记录颜色") From 2b2761ade2a5367ed5d20233a8d40189c90fafe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 1 Apr 2021 13:23:31 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E3=80=9014827=2019108+=20MES->=E3=80=90?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=B7=A5=E5=8D=95=E3=80=91=E6=A8=A1=E5=9D=97?= =?UTF-8?q?,=E9=87=8A=E6=94=BE=E5=8A=9F=E8=83=BD=E5=BA=94=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E9=9B=B6=E4=BB=B6=E5=8F=B7=E8=BF=9B=E8=A1=8C=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E5=8F=B7=E7=B4=AF=E5=8A=A0+2021-04-01=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/mes/bean/MesPart.java | 4 ++++ 1 file changed, 4 insertions(+) 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 235efb2..b3c48f6 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 @@ -154,6 +154,10 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("packmoth") private String packMoth; + @Column(name = "SERIAL_NO") + @ApiParam("零件流水号") + private String serialNo; + @Transient @ApiParam("产品类型名称") private String produceCategoryName; From 52b2ea43da808f3d1976d2bd76e3022dd7b89909 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 1 Apr 2021 19:34:16 +0800 Subject: [PATCH 7/8] =?UTF-8?q?14859=2019081-JISA=E6=94=B6=E5=BA=8F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=B6=85=E6=97=B6=E5=92=8C=E9=98=9F=E5=88=97?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=A2=84=E8=AD=A6=E4=BF=A1=E6=81=AF-?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=8F=90=E7=A4=BA=E5=86=85=E5=AE=B9=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E9=A2=84=E8=AD=A6=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesKpDataRecord.java | 11 ++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java index a84f553..8e3bbf9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java @@ -117,6 +117,14 @@ public class MesKpData extends BaseBean implements Serializable { @ApiParam("特殊码") private String specificSn; + @Transient + @ApiParam("过程条码") + private String serialNumber; + + @Transient + @ApiParam("采集结果") + private Integer result; + public double getKeyDataCountVal() { return this.keyDataCount == null ? 0 : this.keyDataCount; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpDataRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpDataRecord.java index 9e8a774..4188057 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpDataRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpDataRecord.java @@ -98,7 +98,16 @@ public class MesKpDataRecord extends BaseBean implements Serializable { @Column(name = "ACTUAL_NUM") @ApiParam("实采个数") - private Integer actualNum;; + private Integer actualNum; + + @Column(name = "SPECIFIC_SN") + @ApiParam("特殊码") + private String specificSn; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + public double getKeyDataCountVal() { return this.keyDataCount == null ? 0 : this.keyDataCount; From eacbdbaa7d8a651697516977fb46ac8c3d9d6d12 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 2 Apr 2021 20:00:47 +0800 Subject: [PATCH 8/8] =?UTF-8?q?20027--MES=E7=9C=8B=E6=9D=BF-=E7=8F=AD?= =?UTF-8?q?=E7=BB=84=E6=95=B0=E6=9D=A5=E6=BA=90=E7=8F=AD=E7=BB=84=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E9=9C=80=E8=A6=81=E7=8F=AD=E7=BB=84=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=9D=A5=E7=BB=B4=E6=8A=A4=E7=8F=AD=E7=BB=84=E4=BA=BA?= =?UTF-8?q?=E6=95=B0-2021-04-02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.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/MesShiftGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java index 9715a22..829b908 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java @@ -50,7 +50,11 @@ public class MesShiftGroup extends BaseBean implements Serializable { @ApiParam("班长") private String squadLeader; - @Transient - @ApiParam("班组数") - private String count; + @Column(name = "USER_EMP_NO") + @ApiParam(value = "工号") + private String userEmpNo; + + @Column(name = "SHIFT_NUM") + @ApiParam("班组人数") + private String shiftNum; }