From 1f5052d679fa2625bffa4103506b44fdddc9e98e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 12 May 2020 11:39:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E7=B1=BB=E5=9E=8B=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) 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 757594f..c3892e2 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 @@ -2565,17 +2565,19 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_QC_CHECK_TYPE { - IN_MATERIAL_CHECK(5, "来料检验"), - FIRST_CHECK(10, "首检"), - ON_SITE_CHECK(20, "巡检"), - END_CHECK(30, "尾检"), - EDELIVERY_CHECK(40, "发货"); + IN_MATERIAL_CHECK(5, "IN_MATERIAL_CHECK", "来料检验"), + FIRST_CHECK(10, "FIRST_CHECK", "首检"), + ON_SITE_CHECK(20, "ON_SITE_CHECK", "巡检"), + END_CHECK(30, "END_CHECK", "尾检"), + EDELIVERY_CHECK(40, "EDELIVERY_CHECK", "发货"); private int value; + private String code; private String description; - MES_QC_CHECK_TYPE(int value, String description) { + MES_QC_CHECK_TYPE(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -2583,6 +2585,8 @@ public class MesEnumUtil { return value; } + public String getCode() {return code;} + public String getDescription() { return description; } From 1f97be30783045095a0ee607b479b36960007ff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 12 May 2020 15:15:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=8A=A5=E8=A1=A8=EF=BC=885=E4=B8=AA?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/repository/MesQcOrderDetailRepository.java | 16 ++++++++++++++++ .../i3plus/pojo/mes/repository/MesQcOrderRepository.java | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java new file mode 100644 index 0000000..794d6ff --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.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.MesQcOrderDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-18-17:13 + * @Modify: + **/ +@Repository +public interface MesQcOrderDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java new file mode 100644 index 0000000..f503196 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.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.MesQcOrder; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-18-17:13 + * @Modify: + **/ +@Repository +public interface MesQcOrderRepository extends BaseRepository { +} From a6e9b90026a867e760be92bd1c657ae7d32d96ad Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 12 May 2020 16:28:19 +0800 Subject: [PATCH 3/4] pom --- modules/i3plus-pojo-andon/pom.xml | 1 - modules/i3plus-pojo-aps/pom.xml | 1 - modules/i3plus-pojo-base/pom.xml | 1 - modules/i3plus-pojo-form/pom.xml | 1 - modules/i3plus-pojo-hardswitch/pom.xml | 1 - modules/i3plus-pojo-ics/pom.xml | 1 - modules/i3plus-pojo-jobflow/pom.xml | 1 - modules/i3plus-pojo-lac/pom.xml | 1 - modules/i3plus-pojo-mes-pcn/pom.xml | 1 - modules/i3plus-pojo-mes/pom.xml | 1 - modules/i3plus-pojo-model/pom.xml | 1 - modules/i3plus-pojo-platform/pom.xml | 1 - modules/i3plus-pojo-ptl/pom.xml | 1 - modules/i3plus-pojo-report/pom.xml | 1 - modules/i3plus-pojo-softswitch/pom.xml | 1 - modules/i3plus-pojo-sweb/pom.xml | 1 - modules/i3plus-pojo-wms/pom.xml | 1 - modules/i3plus-pojo-workflow/pom.xml | 1 - 18 files changed, 18 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 4b9154c..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-andon jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index da2f55a..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-aps jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index a933723..9f9717e 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-base jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index c86f822..a9e288f 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-form jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 36594a5..a44418c 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-hardswitch jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 93dfe19..2de88b5 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-ics jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6b17e65..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-jobflow jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index ff17bee..50ab2c2 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-lac jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index a2bb2df..d800ecf 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-mes-pcn jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 8664dd2..60fc467 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-mes jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 265f98d..d65e031 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-model jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 7545af8..a785f21 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-platform jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index c11bfc9..d6d2f8e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-ptl jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index f941c0d..0fbfb69 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-report jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 069a4e2..76739f9 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-softswitch jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 4c7b396..0368700 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-sweb jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index c6788d4..b2eedd4 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-wms jar - 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 5c86a26..5fcd08a 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -12,7 +12,6 @@ i3plus-pojo-workflow jar - 1.0-DEV-SNAPSHOT From 222ba4f8a4031f42a277e55d32cba4d2497fd82c Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 12 May 2020 17:49:54 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1825=20plc?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=B1=9E=E6=80=A7=E5=AD=97?= =?UTF-8?q?=E6=AE=B5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 4d2fc73..fc99205 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -130,6 +130,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("密码") private String password; + @Column(name = "DEFAULT_RULE") + @ApiParam("默认赋值属性") + private String defaultRule; + @Transient @ApiParam("设备名称") private String equipmentName;