From f7d61927949b585699ef1ab93ffdac1e8f28d70a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 17 Feb 2020 13:17:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E8=B0=83=E6=95=B4=E4=B8=BAkey+languageCode+s?= =?UTF-8?q?oftType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java index 366a100..b712a37 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -30,6 +29,7 @@ import javax.persistence.Table; public class SysTask extends BaseBean { private static final long serialVersionUID = -4462661508105857312L; + @Column(name="NAME") @ApiParam(value ="名称") private String name; 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 50edbaf..44ddce3 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 @@ -718,6 +718,7 @@ public class CoreHqlPack { HqlPack.getStringEqualPack(localeResource.getLanguageCode(),"languageCode",result); HqlPack.getStringEqualPack(localeResource.getResourceKey(),"resourceKey",result); + HqlPack.getNumEqualPack(localeResource.getSoftType(),"softType",result); HqlPack.getNumNOEqualPack(localeResource.getId(),"id",result); // 添加默认排序 From 5eb7cf03edf3cd460cc4d1be484ea7a1ff1d5396 Mon Sep 17 00:00:00 2001 From: luweihao Date: Thu, 20 Feb 2020 16:10:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?task=20=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java index 3be0723..16436c6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java @@ -45,5 +45,5 @@ public class MesNumberSerialno extends BaseBean implements Serializable { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public Integer lockVersion; + public transient Integer lockVersion; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java index 986ee2c..3692f51 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java @@ -46,6 +46,11 @@ public class MesSyncDeadLetter extends BaseBean implements Serializable { private String pcnCode; @Lob + @Column(name = "EX_MSG") + @ApiParam("同步数据") + private String exMsg; + + @Lob @Column(name = "DATA") @ApiParam("同步数据") private String data; From c40d3360d34bab2eb052487651d3a8f29be1549f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 20 Feb 2020 22:23:10 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=901416=20=E6=96=B0=E5=A2=9E=E5=9B=BA?= =?UTF-8?q?=E5=8C=96=E6=97=B6=E9=97=B4=E7=BB=B4=E6=8A=A4=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/WmsPart.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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 613ee34..c0a9d25 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 @@ -247,6 +247,11 @@ public class WmsPart extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double cycleRquestQty = 0d; + @Column(name = "CURING_TIME") + @ApiParam(value = "固化时间", example = "0") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double curingTime = 0d; + public int getIqcVal(){ return this.iqc == null ? 0 : this.iqc.intValue(); } @@ -274,6 +279,10 @@ public class WmsPart extends BaseBean { return this.cycleRquestQty == null? 0d:this.cycleRquestQty.doubleValue(); } + public Double getCuringTime() { + return this.curingTime == null? 0d:this.curingTime.doubleValue(); + } + public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty, String partType) { this.partNo = partNo; From 2b84f939501d14a645ebd246e5d2e2ad1733d8e8 Mon Sep 17 00:00:00 2001 From: joke Date: Fri, 21 Feb 2020 14:32:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BB=BB=E5=8A=A1:=201424=20DT=E9=80=9A?= =?UTF-8?q?=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java | 8 ++++++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java index 87af76c..d6740f7 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java @@ -52,4 +52,12 @@ public class MesWorkCell extends BaseBean implements Serializable { @Column(name = "SEQ") @ApiParam("序号") private Integer seq; + + @Column(name = "WORK_CELL_IP") + @ApiParam("工作单元IP") + private String workCellIp; + + @Column(name = "WORK_CELL_PORT") + @ApiParam("工作单元端口") + private String workCellPort; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 1140404..2f0533a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -57,6 +57,14 @@ public class MesWorkCell extends BaseBean implements Serializable { @ApiParam("序号") private Integer seq; + @Column(name = "WORK_CELL_IP") + @ApiParam("工作单元IP") + private String workCellIp; + + @Column(name = "WORK_CELL_PORT") + @ApiParam("工作单元端口") + private String workCellPort; + @Transient @ApiParam(value = "子集列表") private List childTreeList;