From 9466e62ff5d81d68bb21325d8c2f6d6a0a099f1c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 10 Sep 2021 15:50:32 +0800 Subject: [PATCH 1/6] =?UTF-8?q?plc=E6=9F=A5=E8=AF=A2bug?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0a0fe1f..34e5995 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 @@ -1462,7 +1462,7 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesPlc.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCenterCode(), "workCenterCode", packBean); } - if (!StringUtils.isEmpty(mesPlc.getPlcCode())) { + if (!StringUtils.isEmpty(mesPlc.getWorkCellCode())) { DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCellCode(), "workCellCode", packBean); } if (!StringUtils.isEmpty(mesPlc.getEquipmentCode())) { From e649024439e7b0436dd77cebb914d98607da72da Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sun, 12 Sep 2021 08:50:17 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E5=B1=A5=E5=8E=86?= =?UTF-8?q?=E8=A1=A8=20=E5=A2=9E=E5=8A=A0=20=E7=89=88=E6=9C=AC=E5=8F=B7=20?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=90=8C=E6=AD=A5=E6=A0=87=E5=BF=97=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/bean/MesProduceSnTravel.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index 73f6281..e255104 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -36,6 +36,16 @@ import java.io.Serializable; public class MesProduceSnTravel extends BaseBean implements Serializable { private static final long serialVersionUID = -1807953720033107108L; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public Integer lockVersion; + + @Column(name = "SYSTEM_SYNC_STATUS") + @ColumnDefault("2") + @ApiParam(value = "系统同步标志") + public Integer systemSyncStatus; + @Column(name = "SERIAL_NUMBER") @ApiParam("过程条码") private String serialNumber; From 697f7f1c2f43f04083a6bd0020c65641dbd1971a Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sun, 12 Sep 2021 10:43:48 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E5=B1=A5=E5=8E=86?= =?UTF-8?q?=E8=A1=A8=20=E5=8E=BB=E9=99=A4=E7=89=88=E6=9C=AC=E5=8F=B7?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index e255104..7171d8e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -36,11 +36,6 @@ import java.io.Serializable; public class MesProduceSnTravel extends BaseBean implements Serializable { private static final long serialVersionUID = -1807953720033107108L; - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public Integer lockVersion; - @Column(name = "SYSTEM_SYNC_STATUS") @ColumnDefault("2") @ApiParam(value = "系统同步标志") From 62ddd292c97f95e4ac2d17cac77d8d9600d35da3 Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Tue, 14 Sep 2021 18:10:43 +0800 Subject: [PATCH 4/6] =?UTF-8?q?17619=2019081-=E7=9B=98=E7=82=B9=E7=AD=96?= =?UTF-8?q?=E7=95=A5-=E5=A2=9E=E5=8A=A0=E5=BE=AA=E7=8E=AF=E8=A7=84?= =?UTF-8?q?=E5=88=99?= 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 | 1 + 1 file changed, 1 insertion(+) 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 1c78ab9..d3613aa 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 @@ -9309,6 +9309,7 @@ public class WmsEnumUtil { EVERY_DAY("0 0 0 * * ?", "EVERY_DAY", "每天零点"), EVERY_HOUR("0 0 * * * ?", "EVERY_HOUR", "每小时"), NINE_AND_NINTEEN("0 0 9,21 * * ?", "NINE_AND_NINTEEN", "早上九点晚上九点"), + EIGHT("0 0 8 * * ?", "EIGHT", "早上八点"), NINE("0 0 9 * * ?", "NINE", "早上九点"), NINTEEN("0 0 21 * * ?", "NINTEEN", "晚上九点"); private String value; From 0113ac803841eef2e9215ebe4e9531eb56001818 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 17 Sep 2021 14:08:49 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=A0=B8=E5=BF=83=E5=8C=85=20=20=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=20=E5=8C=85=E8=A3=85=20=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=90=8C=E6=AD=A5=E6=A0=87=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 5 +++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java | 6 ++++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 5 +++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java | 2 +- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 12566dd..3e1767d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -43,6 +43,11 @@ import java.util.List; public class MesPackage extends BaseBean implements Serializable { private static final long serialVersionUID = 5275923991324889995L; + @Column(name = "SYSTEM_SYNC_STATUS") + @ColumnDefault("2") + @ApiParam(value = "系统同步标志") + public Integer systemSyncStatus = 2; + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编号") private String packageNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index 2275812..f6493fe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -8,6 +8,7 @@ import lombok.Data; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -37,6 +38,11 @@ import java.io.Serializable; public class MesPackageDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 6980459490465566975L; + @Column(name = "SYSTEM_SYNC_STATUS") + @ColumnDefault("2") + @ApiParam(value = "系统同步标志") + public Integer systemSyncStatus = 2; + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编码") private String packageNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index b9ec8a9..eab2b60 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -38,6 +38,11 @@ import java.io.Serializable; public class MesProduceSn extends BaseBean implements Serializable { private static final long serialVersionUID = -1630924042562178494L; + @Column(name = "SYSTEM_SYNC_STATUS") + @ColumnDefault("2") + @ApiParam(value = "系统同步标志") + public Integer systemSyncStatus = 2; + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index 7171d8e..d214feb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -39,7 +39,7 @@ public class MesProduceSnTravel extends BaseBean implements Serializable { @Column(name = "SYSTEM_SYNC_STATUS") @ColumnDefault("2") @ApiParam(value = "系统同步标志") - public Integer systemSyncStatus; + public Integer systemSyncStatus = 2; @Column(name = "SERIAL_NUMBER") @ApiParam("过程条码") From 682a086f239c191b5885ec092495756ee76d0358 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 17 Sep 2021 14:47:50 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A1=A8=20=E5=A2=9E=E5=8A=A0=E7=B3=BB=E7=BB=9F=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=A0=87=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index 025a99d..7ab0eaf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -10,6 +10,7 @@ import lombok.Data; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -39,6 +40,12 @@ import java.io.Serializable; @Api("生产数据") public class MesProductData extends BaseBean implements Serializable { private static final long serialVersionUID = 4514407617515827040L; + + @Column(name = "SYSTEM_SYNC_STATUS") + @ColumnDefault("2") + @ApiParam(value = "系统同步标志") + public Integer systemSyncStatus = 2; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode;