From 9a38c5d359b3d58673b40c216f22bf339718ec6b Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 27 May 2020 10:53:31 +0800 Subject: [PATCH 01/72] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= 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 932bdd9..3428e74 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-PROD-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 85f99fcdfa3beb44827aa21c06b55fff81c4736b Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 1 Jun 2020 18:26:36 +0800 Subject: [PATCH 02/72] =?UTF-8?q?=E6=8F=90=E6=B5=8B=20=E8=BF=98=E5=8E=9Fpo?= =?UTF-8?q?m?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 807bef5..9f9717e 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b948580..a9e288f 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index e12eaee..a44418c 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index c338f71..2de88b5 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..123fdc9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 7637865..50ab2c2 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d98b7d8..7f94617 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index bf96e57..d800ecf 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index a758a6a..60fc467 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index efacfd2..d65e031 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index dba12cc..a785f21 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 81670b2..d6d2f8e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26a7311..0fbfb69 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index eaf2544..76739f9 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 0f615b6..0368700 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 9e5f745..b2eedd4 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 0fea52b..5fcd08a 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc8fce6..2eddf76 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 55de940f7c86f90e30f3e4faafe3fd120b434ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 2 Jun 2020 11:04:55 +0800 Subject: [PATCH 03/72] =?UTF-8?q?=E3=80=901926=20=E7=9B=B2=E6=A3=80?= =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 46 ++++++++++++++++++ .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 56 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesBlindHistory.java | 4 ++ .../i3plus/pojo/mes/bean/MesBlindTopicSetting.java | 2 +- .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 4 ++ .../i3plus/pojo/mes/model/GenSerialNoModel.java | 6 +++ .../i3plus/pojo/mes/model/MesBlindProbleModel.java | 4 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 +- 8 files changed, 123 insertions(+), 2 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 53b6bb0..b11a545 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 @@ -6147,4 +6147,50 @@ public class MesEnumUtil { return valueOf(val); } } + + /** + * 盲检类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TOPIC_TYPE { + COLOUR(10, "颜色"), + GRADE(20, "等级"), + TO_CONFIGURE(30, "配置"); + + private int value; + private String description; + + TOPIC_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 4ab41c0..4315afc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -612,6 +612,16 @@ public class MesPcnEnumUtil { return tmp; } + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + public static MES_MATCH_TYPE getByValue(int value) { for (MES_MATCH_TYPE mesMatchType : values()) { if (mesMatchType.getValue() == value) { @@ -3939,4 +3949,50 @@ public class MesPcnEnumUtil { return valueOf(val); } } + + /** + * 盲检类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TOPIC_TYPE { + COLOUR(10, "零件颜色"), + GRADE(20, "等级"), + TO_CONFIGURE(30, "配置"); + + private int value; + private String description; + + TOPIC_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java index cba882b..2f35bf8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java @@ -60,4 +60,8 @@ public class MesBlindHistory extends BaseBean implements Serializable { @ApiParam("工作中心代码") private String workCenterCode; + @Transient + @ApiParam("主队列编号") + private String orderNo; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java index 91ddc09..b82bbae 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java @@ -51,7 +51,7 @@ public class MesBlindTopicSetting extends BaseBean implements Serializable { private Integer topicType; @Column(name = "QTY") - @ApiParam("答案数量") + @ApiParam("错误答案数量") private Integer qty; @Column(name = "WORK_CELL_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 948b1f9..fa0e97b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -160,6 +160,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("年度型") private String modelYear; + @Transient + @ApiParam("主队列状态") + private Integer masterStatus; + public double getQueueSeqVal() { return this.queueSeq == null ? 0.0d : this.queueSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index 28b8235..c130f5b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -82,6 +82,12 @@ public class GenSerialNoModel { @ApiParam("当前编号") private String currentNumber; + @ApiParam("物料类型3") + private String categoryCode3; + + @ApiParam("零件号后4位") + private String partNoAfterFour; + public GenSerialNoModel(String ruleCode) { this.ruleCode = ruleCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java index af48ce8..8944231 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java @@ -32,4 +32,8 @@ public class MesBlindProbleModel extends BaseBean { @ApiParam(value = "正确答案") private String rightKey; + + @ApiParam(value = "工厂代码") + private String organizeCode; + } 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 fc23a2e..07ac37c 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 @@ -2903,10 +2903,11 @@ public class MesHqlPack { public static DdlPackBean getMesBlindTopicSetting(MesBlindTopicSetting mesBlindTopicSetting) { DdlPackBean packBean = getAllBaseData(mesBlindTopicSetting.getOrganizeCode()); - DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicCode(), "topicCode()", packBean); + DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicCode(), "topicCode", packBean); DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicDesc(), "topicDesc", packBean); DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getWorkCellCode(), "workCellCode", packBean); DdlPreparedPack.getStringEqualPack(mesBlindTopicSetting.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getNumEqualPack(mesBlindTopicSetting.getTopicType(), "topicType", packBean); DdlPreparedPack.getNumEqualPack(mesBlindTopicSetting.getIsValid(), "isValid", packBean); return packBean; } From 76b96540ca2aab07b8dacef37d4b45466be377b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 2 Jun 2020 11:21:07 +0800 Subject: [PATCH 04/72] =?UTF-8?q?=E3=80=901926=20=E7=9B=B2=E6=A3=80?= =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 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 631fd67..07ac37c 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 @@ -2888,18 +2888,18 @@ public class MesHqlPack { return result; } -// public static DdlPackBean getMesBlindRule(MesBlindRule mesBlindRule) { -// DdlPackBean packBean = getAllBaseData(mesBlindRule.getOrganizeCode()); -// DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarType(), "carType", packBean); -// DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarColor(), "carColor", packBean); -// DdlPreparedPack.getStringLikerPack(mesBlindRule.getPartCode(), "partCode", packBean); -// DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartName(), "partName", packBean); -// DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarConfig(), "carConfig", packBean); -// DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarLevel(), "carLevel", packBean); -// DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartColor(), "partColor", packBean); -// DdlPreparedPack.getNumEqualPack(mesBlindRule.getIsValid(), "isValid", packBean); -// return packBean; -// } + public static DdlPackBean getMesBlindRule(MesBlindRule mesBlindRule) { + DdlPackBean packBean = getAllBaseData(mesBlindRule.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarType(), "carType", packBean); + DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarColor(), "carColor", packBean); + DdlPreparedPack.getStringLikerPack(mesBlindRule.getPartCode(), "partCode", packBean); + DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartName(), "partName", packBean); + DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarConfig(), "carConfig", packBean); + DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarLevel(), "carLevel", packBean); + DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartColor(), "partColor", packBean); + DdlPreparedPack.getNumEqualPack(mesBlindRule.getIsValid(), "isValid", packBean); + return packBean; + } public static DdlPackBean getMesBlindTopicSetting(MesBlindTopicSetting mesBlindTopicSetting) { DdlPackBean packBean = getAllBaseData(mesBlindTopicSetting.getOrganizeCode()); From 215ffc080b0c2f10787f59a3a397f837f5f7d988 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 2 Jun 2020 13:52:01 +0800 Subject: [PATCH 05/72] ptl --- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 2 +- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 77 ++++++++++++++++++++++ .../pojo/ptl/bean/PtlRouteStatusErrorRecord.java | 16 +++-- .../i3plus/pojo/ptl/model/CommonMsgModel.java | 7 +- 4 files changed, 94 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index c2732ee..58d22b3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -19,7 +19,7 @@ public class AndonEnumUtil { public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE { INNER(10, "内部处理"), OUTER(20, "外部处理"), - REVIEW(30, "人工审核"); + REVIEW(30, "人工确认"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 8791cb5..679e650 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -14,6 +14,83 @@ import static cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil.MONITOR_PROCESS_ public class PtlPcnEnumUtil { /** + * 状态机异常处理方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE { + INNER(10, "内部处理"), + OUTER(20, "外部处理"), + REVIEW(30, "人工确认"); + + private int value; + private String description; + + ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 状态机异常处理状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS { + TRUE(10, "已处理"), + FALSE(20, "未处理"); + + private int value; + private String description; + + ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 状态机异常缓存标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG { + FALSE(10, "否"), + TRUE(20, "是"), + ORIGINAL(30, "原先"); + + private int value; + private String description; + + ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** * 控制器状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java index ec94e86..1795f20 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java @@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -56,9 +55,16 @@ public class PtlRouteStatusErrorRecord extends BaseBean implements Serializable @ApiParam(value = "缓存标识") private Integer cacheFlag; - @Lob - @Column(name = "CONTENT") - @ApiParam(value = "内容") - private String content; + @Column(name = "CACHE_KEY") + @ApiParam(value = "缓存KEY") + private String cacheKey; + + @Column(name = "HANDLE_TYPE") + @ApiParam(value = "处理方式") + private Integer handleType; + + @Column(name = "HANDLE_STATUS") + @ApiParam(value = "处理状态") + private Integer handleStatus; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java index c079dc1..249a802 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java @@ -48,7 +48,10 @@ public class CommonMsgModel implements Serializable { @ApiModelProperty("外部触发事件") private String triggerEvent; - @ApiModelProperty("流程类型") - private Integer routeType; + @ApiModelProperty("缓存KEY") + private String cacheKey; + + @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true") + private boolean errorInnerAction = false; } From 31c26017c1c25ac70ae49dac905d0396ea14e2df Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 2 Jun 2020 13:52:28 +0800 Subject: [PATCH 06/72] =?UTF-8?q?=E3=80=902009=20=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3WMS-=E6=8A=A5=E8=A1=A8-=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E5=88=A9=E7=94=A8=E7=8E=87=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 75 ++++++++++++++++++++++ .../i3plus/pojo/model/wms/WmsLocateModel.java | 67 +++++++++++++++++++ 2 files changed, 142 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateModel.java 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 de4805e..5d01942 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 @@ -7397,4 +7397,79 @@ public class WmsEnumUtil { return null; } } + + /** + * 库位利用率 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOCATE_PROPORTION { + ZERO(10, "ZERO", "0%"), + GENERAL(20, "GENERAL", "0%-30%"), + MEDIUM(30, "MEDIUM", "30%-60%"), + WELL(40, "WELL", "60%-100%"); + + private int value; + private String code; + private String description; + + LOCATE_PROPORTION(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static LOCATE_PROPORTION codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateModel.java new file mode 100644 index 0000000..99d5669 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateModel.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-02 9:27 + * @Modify: + **/ +@Data +public class WmsLocateModel implements Serializable { + + private static final long serialVersionUID = 2433931236774158401L; + + @ApiParam(value = "箱数") + public Long snBoxQty; + + @ApiParam(value = "最大包装数量") + public Integer maxPackageQty; + + @ApiParam(value = "库位利用率值") + public Double proportionValue; + + @ApiParam(value = "库位代码") + public String locateNo; + + @ApiParam(value = "库位名称") + public String locateName; + + @ApiParam(value = "存储区代码") + public String zoneNo; + + @ApiParam(value = "存储区名称") + public String zoneName; + + @ApiParam(value = "仓库代码") + public String whNo; + + @ApiParam(value = "仓库名称") + public String whNoName; + + @ApiParam(value = "组织代码") + public String organizeCode; + + @ApiParam(value = "库位利用率") + public Integer proportion; + + public WmsLocateModel(Long snBoxQty, Integer maxPackageQty, Double proportionValue, + String locateNo, String locateName, String zoneNo, + String zoneName, String whNo, String whNoName, String organizeCode) { + this.snBoxQty = snBoxQty; + this.maxPackageQty = maxPackageQty; + this.proportionValue = proportionValue; + this.locateNo = locateNo; + this.locateName = locateName; + this.zoneNo = zoneNo; + this.zoneName = zoneName; + this.whNo = whNo; + this.whNoName = whNoName; + this.organizeCode = organizeCode; + } +} From 6e70e3257be9d71dd2a84abd121af862a22915d8 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 2 Jun 2020 13:57:09 +0800 Subject: [PATCH 07/72] =?UTF-8?q?=E3=80=902009=20=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3WMS-=E6=8A=A5=E8=A1=A8-=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E5=88=A9=E7=94=A8=E7=8E=87=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/WmsLocate.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index b9bb342..efdb745 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -175,6 +175,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", private Integer destBoxQty; @Transient + @ApiParam(value = "库位利用率") + public Integer proportion; + + @Transient @ApiParam(value = "错误信息", example = "-1") private String errorMsg; From a4ba058ee328e3ca9def6712262445af5695fbdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 2 Jun 2020 14:25:25 +0800 Subject: [PATCH 08/72] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=20Rest=E6=98=AF=E9=80=82=E9=85=8D=E5=99=A8?= =?UTF-8?q?=20requestBody?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index 7ade95c..c220ed2 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -403,8 +403,8 @@ public final class FormHqlPack { public static DdlPackBean packHqlBfCascade(BfCascade bfCascade){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfCascade); - DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "objectName", ddlPackBean); - DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "objectClassName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "cascadeName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "cascadeDescription", ddlPackBean); return ddlPackBean; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java index 5fcea3e..eb8b13c 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java @@ -46,6 +46,12 @@ public class BsSuitCaseREST extends BaseBean { @AnnoOutputColumn(refClass = CommonEnumUtil.HTTP_METHOD_TYPE.class) private Integer requestMethodId; + //CommonEnumUtil.TRUE_OR_FALSE + @Column(name = "IS_REQUEST_BODY") + @ApiParam(value = "是否使用requestBody") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + private Integer isRequestBody; + @Transient @ApiParam(value = "请求头转换") private List requestHeaderList; From 7b83f8fa500704e01792d8a8efb9fbeeaf375da0 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 2 Jun 2020 14:40:15 +0800 Subject: [PATCH 09/72] =?UTF-8?q?=E6=96=B0=E5=A2=9Eaps=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8C=96id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 1 + 49 files changed, 49 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java index 527cbea..1d24b39 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java @@ -25,6 +25,7 @@ import javax.persistence.Table; @Table(name = "APS_ASSIST_RESOURCE_SET_TIME") @Api("副资源设置时间") public class AssistResourceSetTime extends BaseAPS { + private static final long serialVersionUID = 901172392855536686L; @Column(name="RES_CODE") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index 7c2d0ac..e87a86a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -34,6 +34,7 @@ import java.util.List; @ExcludeImportExport @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class BaseOrder extends BaseAPS { + private static final long serialVersionUID = -2571085172798608026L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java index a0f6d02..0142e58 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java @@ -24,6 +24,7 @@ import javax.persistence.MappedSuperclass; @Api("规则参数基类") @ExcludeImportExport public class BaseRule extends BaseAPS { + private static final long serialVersionUID = -1818853814377611968L; @Column(name="CODE") @ApiParam(value ="规则编码") @FieldAnnotation(popSearch = true, mainkey = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java index 23159bc..5dc8c0c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java @@ -22,6 +22,7 @@ import javax.persistence.Table; @Table(name = "APS_CANCEL_PLAN_RULE") @Api("取消计划规则") public class CancelPlanRule extends BaseRule { + private static final long serialVersionUID = 2674055522875545446L; @Column(name="WORK_FILTERS") @ApiParam(value ="工作筛选") private String workFilters; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java index aa07354..0d537d2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java @@ -25,6 +25,7 @@ import javax.persistence.Table; @Table(name = "APS_DATA_LINK") @Api("数据集成数据连接信息") public class DataLink extends BaseAPS { + private static final long serialVersionUID = 8324774871058505466L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java index acdf7e4..c6dc31a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("班次") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class DayShift extends BaseAPS { + private static final long serialVersionUID = 7964370027924366093L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java index 156673e..ea42942 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java @@ -25,6 +25,7 @@ import javax.persistence.Table; @Table(name = "APS_DYNAMIC_SET_TIME") @Api("动态设置时间") public class DynamicSetTime extends BaseAPS { + private static final long serialVersionUID = -1696499471488104793L; @Column(name="RES_CODE") @ApiParam(value ="资源代码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java index 31196db..e859fe8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @Api("数据导出明细") public class ExportDetail extends BaseAPS { + private static final long serialVersionUID = -8898414164032180539L; @Column(name="OUT_NAME") @ApiParam(value ="外部表名") private String outName; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java index 8183437..bf6ca40 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java @@ -29,6 +29,7 @@ import java.util.List; @Table(name = "APS_EXPORT_PROJECT") @Api("数据导出明细集合") public class ExportProject extends BaseAPS { + private static final long serialVersionUID = -7281303629295174330L; @Column(name="NAME") @ApiParam(value ="标识名") private String name; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java index 5ffa2de..cff475c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java @@ -23,6 +23,7 @@ import javax.persistence.Table; @Table(name = "APS_EXPRESSION_RECORD") @Api("表达式记录") public class ExpressionRecord extends BaseAPS { + private static final long serialVersionUID = 4038954046132896632L; @Column(name="BEAN_NAME") @ApiParam(value ="表名") private String beanName; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index 194075b..b8ed589 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -35,6 +35,7 @@ import java.sql.JDBCType; @Api("字段信息") @ExcludeImportExport public class FieldInfo extends BaseAPS { + private static final long serialVersionUID = -6195036426929675850L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java index 00ba1ea..9a6c5e3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java @@ -24,6 +24,7 @@ import javax.persistence.Table; @Table(name = "APS_FIELD_SET_RULE") @Api("属性赋值规则") public class FieldSetRule extends BaseRule { + private static final long serialVersionUID = 6880145972942618559L; @Column(name="BEAN") @ApiParam(value ="实体名") private ApsEnumUtil.FIELD_SET_BEAN bean; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java index 0d5f15e..57deab2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java @@ -31,6 +31,7 @@ import javax.validation.constraints.Min; @Api("炉容量") public class FurnaceCapacity extends BaseAPS { + private static final long serialVersionUID = -5657804042629460659L; @Column(name="RES_CODES") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java index 9d8340d..ed046aa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java @@ -32,6 +32,7 @@ import java.util.List; @Api("炉资源计划") public class FurnacePlan extends BaseAPS { + private static final long serialVersionUID = 6816465736285211114L; @Column(name="CAPACITY", columnDefinition = "decimal(18,8)") @ApiParam(value ="已占用的能力") private Double capacity; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java index 40835b2..d31c13f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api("组炉设置") public class FurnaceSetting extends BaseAPS { + private static final long serialVersionUID = -4566911526487268870L; @Column(name="RES_CODES") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java index 4199073..58997dc 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java @@ -24,6 +24,7 @@ import javax.persistence.Table; @Table(name = "APS_HEURISTIC_RULE") @Api("排程运算规则") public class HeuristicRule extends BaseRule { + private static final long serialVersionUID = -4856714428377308150L; @Column(name="WORK_FILTER") @ApiParam(value ="工作筛选") private String workFilter; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index 0eaaeaa..ecb13e1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("数据导入明细") public class ImportDetail extends BaseAPS { + private static final long serialVersionUID = 1264030397500660450L; @Column(name="OUT_NAME") @ApiParam(value ="外部表名") private String outName; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java index 6cc2b67..35aaf50 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java @@ -28,6 +28,7 @@ import java.util.List; @Table(name = "APS_IMPORT_PROJECT") @Api("数据导入明细集合") public class ImportProject extends BaseAPS { + private static final long serialVersionUID = -1899074765155621438L; @Column(name="NAME") @ApiParam(value ="标识名") private String name; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java index 741324f..8fab6d1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java @@ -26,6 +26,7 @@ import javax.persistence.Table; @Table(name = "APS_INVENTORY") @Api("库存") public class Inventory extends BaseOrder { + private static final long serialVersionUID = 2378846162007550439L; @Column(name="SPECIFY_TOP_ORDER") @ApiParam(value ="指定顶层订单") private String specifyTopOrder; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java index 95baac0..a8a491e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java @@ -24,6 +24,7 @@ import javax.persistence.Table; @Table(name = "APS_MAT_CALC_RULE") @Api("物料运算规则") public class MatCalcRule extends BaseRule { + private static final long serialVersionUID = 2102986260688118982L; @Column(name="MATERIAL_FILTER") @ApiParam(value ="物料筛选") private String materialFilter; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index 7c7c313..effc70e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -34,6 +34,7 @@ import java.util.List; @Api("物料") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class Material extends BaseAPS { + private static final long serialVersionUID = -7928225487946173108L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java index e362742..779b527 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java @@ -25,6 +25,7 @@ import javax.persistence.Table; @Table(name = "APS_MATERIAL_SET_TIME") @Api("物料设置时间") public class MaterialSetTime extends BaseAPS { + private static final long serialVersionUID = -7996431489447641539L; @Column(name="RES_CODE") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index 11cedff..2d389fa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -29,6 +29,7 @@ import java.util.List; @Table(name = "APS_OPER_INPUT") @Api("工序输入") public class OperInput extends BaseAPS { + private static final long serialVersionUID = 6653235155693766804L; @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java index 476d45b..e17e69d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java @@ -28,6 +28,7 @@ import java.util.List; @Table(name = "APS_OPER_OUTPUT") @Api("工序输出") public class OperOutput extends BaseAPS { + private static final long serialVersionUID = 3185682762290147209L; @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java index b6923c0..e054949 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java @@ -29,6 +29,7 @@ import java.util.List; @Table(name = "APS_OPER_RESOURCE") @Api("工序资源") public class OperResource extends BaseAPS { + private static final long serialVersionUID = -8683889582369342606L; @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index 274574b..218f7f3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -29,6 +29,7 @@ import java.util.List; @Table(name = "APS_OPERATION") @Api("工序") public class Operation extends BaseAPS { + private static final long serialVersionUID = 4394179144091116858L; @Column(name="NUMBER") @ApiParam(value ="工序号") @FieldAnnotation(notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java index 0c6a9a5..b5dad6b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java @@ -24,6 +24,7 @@ import java.util.Date; @Api("订单树") @ExcludeImportExport public class OrderTree extends BaseAPS { + private static final long serialVersionUID = -7505923374791695738L; @ApiParam(value ="物料编码") private String material; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java index 0281199..2c394a3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java @@ -26,6 +26,7 @@ import java.util.Date; @Table(name = "APS_OVERTIME_CALENDAR") @Api("加班日历") public class OvertimeCalendar extends BaseAPS { + private static final long serialVersionUID = -501715721073189464L; @Column(name="RES_CODES") @ApiParam(value ="资源代码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java index 9756426..6fbd9d1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java @@ -32,6 +32,7 @@ import java.util.List; @Api("父工作") @ExcludeImportExport public class ParentWork extends BaseAPS { + private static final long serialVersionUID = 8792781216193806606L; @Column(name="count", columnDefinition = "decimal(18,8)") @ApiParam(value ="数量") private Double count; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java index 860e0a3..8855d00 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @Api("工作反馈") public class PlanFeedback extends BaseAPS { + private static final long serialVersionUID = 2520555825093741381L; @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index 37548d8..dee531b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -30,6 +30,7 @@ import java.util.List; @Table(name = "APS_PRODUCT_ORDER") @Api("生产订单") public class ProductOrder extends BaseOrder { + private static final long serialVersionUID = 6900226668783662736L; @Column(name="EST") @ApiParam(value ="最早开始时间") private Date est; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java index 06ac508..a109c6a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java @@ -33,6 +33,7 @@ import java.util.List; @Api("工艺路线") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class ProductRouting extends BaseAPS { + private static final long serialVersionUID = 4905294866468216722L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java index b6687d9..bee905c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @Table(name = "APS_PURCHASE_ORDER") @Api("采购订单") public class PurchaseOrder extends BaseOrder { + private static final long serialVersionUID = 4699381603433121631L; @Column(name="SPECIFY_TOP_ORDER") @ApiParam(value ="指定顶层订单") private String specifyTopOrder; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java index 96de9d2..d37f81a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java @@ -29,6 +29,7 @@ import java.util.List; @Table(name = "APS_RES_CALENDAR") @Api("日历") public class ResCalendar extends BaseAPS { + private static final long serialVersionUID = 8338930205816433211L; @Column(name="RES_CODES") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index 515cd7b..7733715 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -33,6 +33,7 @@ import java.util.List; @Api("资源") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class Resource extends BaseAPS { + private static final long serialVersionUID = 3304084329600816457L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java index df02228..31fb91b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @ExcludeImportExport public class RuleDetail extends BaseAPS { + private static final long serialVersionUID = -6433950357039396107L; @Column(name="TYPE") @ApiParam(value ="规则类型") private ApsEnumUtil.RULE_TYPE type; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java index 85b3191..28e424e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java @@ -29,6 +29,7 @@ import java.util.List; @Api("规则组合") @ExcludeImportExport public class RuleGroup extends BaseAPS { + private static final long serialVersionUID = 4741897751041891075L; @Column(name="CODE") @ApiParam(value ="编码") private String code; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index d973fb4..7baa32a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -28,6 +28,7 @@ import java.util.Date; @Table(name = "APS_SALES_ORDER") @Api("销售订单") public class SalesOrder extends BaseOrder { + private static final long serialVersionUID = -511784925441907538L; @Column(name="LOW_EST") @ApiParam(value ="底阶最早开始时间") private Date lowEst; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java index fbe37f0..6d0f976 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java @@ -26,6 +26,7 @@ import javax.persistence.Table; @ExcludeImportExport public class SerialNumber extends BaseAPS { + private static final long serialVersionUID = 312483211086701109L; @Column(name="NUMBER") @ApiParam(value ="流水号") private Integer number; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java index 6b83309..bc0ec95 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @Api("运输时间") public class ShippingTime extends BaseAPS { + private static final long serialVersionUID = -8698904420363808737L; @Column(name="PREV_RES_CODE") @ApiParam(value ="前资源编码") @FieldAnnotation(relation = "PrevRes") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index b24c7aa..48ace75 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api("标准工序") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class StandOperation extends BaseAPS { + private static final long serialVersionUID = -6869403951765771775L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 2a24fcb..669df55 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -26,6 +26,7 @@ import java.util.Date; @Table(name = "APS_SYS_PARAM") @Api("系统参数") public class SysParam extends BaseAPS { + private static final long serialVersionUID = 3115620726438869596L; @Column(name="BASE_TIME") @ApiParam(value ="基准时间") private Date baseTime; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 472b69c..9b898b5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -34,6 +34,7 @@ import java.util.List; @Api("工作") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class Work extends BaseAPS { + private static final long serialVersionUID = 6471740978550523187L; @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true, modify = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index 94e1a71..4390af5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java @@ -29,6 +29,7 @@ import java.util.List; @Table(name = "APS_WORK_INPUT") @Api("工作输入") public class WorkInput extends BaseAPS { + private static final long serialVersionUID = 2654389476284740183L; @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(relation = "Work") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java index ef453ce..7f04aba 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java @@ -31,6 +31,7 @@ import java.util.List; @Api("工作输出") public class WorkOutput extends BaseAPS { + private static final long serialVersionUID = 6031001499619328313L; @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(relation = "Work") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 455ae2c..53c1be7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -35,6 +35,7 @@ import java.util.List; @Api("工作计划") public class WorkPlan extends BaseAPS { + private static final long serialVersionUID = 5489548115780676195L; @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(relation = "Work") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index 1bfbecf..607a948 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("工作关联") public class WorkRelation extends BaseAPS { + private static final long serialVersionUID = -5824884364328962956L; @Column(name="MATERIAL_ID") @ApiParam(value ="物料") @FieldAnnotation(relation = "Material", modify = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index 795117a..727c9a2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("工作资源") public class WorkResource extends BaseAPS { + private static final long serialVersionUID = 4791940404968841144L; @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(relation = "Work") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index 96ba229..9c98bdb 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -25,6 +25,7 @@ import java.util.HashMap; @MappedSuperclass @ExcludeImportExport public abstract class BaseAPS extends BaseBean { + private static final long serialVersionUID = -8638842158403944318L; @JsonIgnore @Lob @FieldAnnotation(property = false) From b2d97414535fadb51acd193373737d64f644503d Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 2 Jun 2020 14:58:19 +0800 Subject: [PATCH 10/72] =?UTF-8?q?=E3=80=902009=20=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3WMS-=E6=8A=A5=E8=A1=A8-=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E5=88=A9=E7=94=A8=E7=8E=87=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateModel.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateModel.java index 99d5669..d3c3112 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateModel.java @@ -47,9 +47,15 @@ public class WmsLocateModel implements Serializable { @ApiParam(value = "组织代码") public String organizeCode; - @ApiParam(value = "库位利用率") + @ApiParam(value = "库位利用率查询") public Integer proportion; + @ApiParam(value = "库位利用率") + public String proportionValueStr; + + public WmsLocateModel() { + } + public WmsLocateModel(Long snBoxQty, Integer maxPackageQty, Double proportionValue, String locateNo, String locateName, String zoneNo, String zoneName, String whNo, String whNoName, String organizeCode) { From 1102513fb791ecc2bf72e3cf9bc64d8f355dd1c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 2 Jun 2020 18:22:13 +0800 Subject: [PATCH 11/72] =?UTF-8?q?=E3=80=901926=20=E7=9B=B2=E6=A3=80?= =?UTF-8?q?=E5=B7=A5=E6=AD=A5=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/MesBlindRule.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java | 3 +++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java index 1d8bdde..147e91c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindRule.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -62,4 +63,8 @@ public class MesBlindRule extends BaseBean implements Serializable { @ApiParam("零件颜色") private String partColor; + @Transient + @ApiParam("零件颜色") + private String rightKey; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java index 8944231..01e2d64 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java @@ -36,4 +36,7 @@ public class MesBlindProbleModel extends BaseBean { @ApiParam(value = "工厂代码") private String organizeCode; + @ApiParam("序号") + private String topicId; + } From 868e82d83a0a0a142d551fad84cb1a195f62f039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 2 Jun 2020 18:22:58 +0800 Subject: [PATCH 12/72] Start Task #2019 Cost:16h Left:0h Finish Task #2019 Cost:16h --- .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 57 ++++++++++++++++++++ .../pojo/model/mes/MesElectricDataModel.java | 54 +++++++++++++++++++ .../pojo/model/mes/MesElectricMarkUpDataModel.java | 61 ++++++++++++++++++++++ 3 files changed, 172 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricMarkUpDataModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 6c67531..ce8771b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -10,6 +10,9 @@ import cn.estsh.i3plus.pojo.mes.bean.*; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; +import java.util.ArrayList; +import java.util.List; + /** * @Description: * @Reference: Mes 条件封装 @@ -541,4 +544,58 @@ public class MesPcnHqlPack { return packBean; } + /** + * 得到分页后的数据 + * + * @return 分页数据 + */ + public static List getPage(List totalList, int currentPage, int pageSize, int totalPage) { + if (currentPage <= 0) { + currentPage = 1; + } + + if (currentPage >= totalPage) { + currentPage = totalPage; + } + + List subList = new ArrayList<>(); + if (null != totalList) { + subList.addAll(totalList.subList(getStartIndex(totalList, currentPage, pageSize, totalPage), + getEndIndex(totalList, currentPage, pageSize, totalPage))); + } + + return subList; + } + + private static int getStartIndex(List totalList, int currentPage, int pageSize, int totalRecord) { + if (null == totalList) { + return 0; + } + int startIndex = (currentPage - 1) * pageSize; + if (startIndex > totalRecord) { + startIndex = totalRecord; + } + if (startIndex < 0) { + startIndex = 0; + } + return startIndex; + } + + private static int getEndIndex(List totalList, int currentPage, int pageSize, int totalRecord) { + if (null == totalList) { + return 0; + } + int endIndex = getStartIndex(totalList, currentPage, pageSize, totalRecord) + pageSize; + if (endIndex < 0) { + endIndex = 0; + } + if (endIndex < getStartIndex(totalList, currentPage, pageSize, totalRecord)) { + endIndex = getStartIndex(totalList, currentPage, pageSize, totalRecord); + } + if (endIndex > totalRecord) { + endIndex = totalRecord; + } + return endIndex; + } + } 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 new file mode 100644 index 0000000..3dbf05e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.model.mes; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description : Mes电检检测实体字段Model信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-01 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class MesElectricDataModel implements Serializable { + + private static final long serialVersionUID = -6376845639646546495L; + + @ApiParam(value = "车型") + public String carType; + + @ApiParam(value = "颜色代码") + public String colorCode; + + @ApiParam(value = "日期时间") + private String dateTime; + + @ApiParam(value = "生产序号") + private String productSeq; + + @ApiParam(value = "车型信息") + private String carTypeInfo; + + @ApiParam(value = "生产模式") + private String productModel; + + @ApiParam(value = "产品生产号") + private String productNumber; + + @ApiParam(value = "备用") + private String spare; + + @ApiParam(value = "所有零件信息包括所有选配信息") + private String other; + + @ApiParam(value = "电检结果") + private String electricResult; + + @ApiParam(value = "文件名称") + private String ftpFileName; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricMarkUpDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricMarkUpDataModel.java new file mode 100644 index 0000000..70d7af5 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricMarkUpDataModel.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.model.mes; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : Mes电检检测补录数据实体字段Model信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-02 09:53 + * @Modify: + **/ +@Data +public class MesElectricMarkUpDataModel implements Serializable { + + private static final long serialVersionUID = -6376845779646546495L; + + @ApiParam(value = "工作中心代码") + public String workCenterCode; + + @ApiParam(value = "工作单元代码") + public String workCellCode; + + @ApiParam(value = "过程条码") + private String serialNumber; + + @ApiParam(value = "产品生产号") + private String productNumber; + + @ApiParam(value = "电检结果") + private String electricResult; + + @ApiParam(value = "测试时间") + private String testDateTime; + + @ApiParam(value = "是否补录") + private Integer isMarkUp; + + @ApiParam(value = "补录时间") + private String markUpDateTime; + + @ApiParam(value = "开始时间") + private String startDateTimeStr; + + @ApiParam(value = "结束时间") + private String endDateTimeStr; + + public MesElectricMarkUpDataModel(String workCenterCode, String workCellCode, String serialNumber, String productNumber, + String electricResult, String testDateTime, Integer isMarkUp, String markUpDateTime) { + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.serialNumber = serialNumber; + this.productNumber = productNumber; + this.electricResult = electricResult; + this.testDateTime = testDateTime; + this.isMarkUp = isMarkUp; + this.markUpDateTime = markUpDateTime; + } +} \ No newline at end of file From d3f2434aa02558cd460119fa6b1cade4388ded01 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 2 Jun 2020 18:55:30 +0800 Subject: [PATCH 13/72] Fix bug#8752,8753 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 253c121..ea17689 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -663,7 +663,7 @@ public class WmsStockSn extends BaseBean { String partNameRdd, String shippingFlag, String leftCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.organizeCode = organizeCode; - this.batchNo = partNo; + this.batchNo = batchNo; this.sn = sn; this.workCenterCode = workCenterCode; this.partNo = partNo; From 570be85b8da3d9f4f7da2211e1e852a87d37506b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 2 Jun 2020 20:21:59 +0800 Subject: [PATCH 14/72] Fix Bug #8744 --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 534547d..c34d351 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -2555,6 +2555,7 @@ public class MesPcnEnumUtil { CUSTOM_DIALOG("custom_dialog", "定制弹窗"), FORM("form", "文本按钮"), SPEC_TEXT("spec_text", "工步弹框文本"), + IMAGE_LIST("image_list", "图片列表"), SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格"); private String value; From 6061f89d43525d02e18e878efddf1093b181b4d8 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 3 Jun 2020 11:34:50 +0800 Subject: [PATCH 15/72] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..11691be 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..8ef99a3 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 807bef5..577686d 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b948580..f714b7d 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index e12eaee..b7991cc 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index c338f71..0648e9f 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..f10cf39 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 7637865..3b9e57a 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d98b7d8..b1911ec 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index bf96e57..56d54cb 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index a758a6a..830caa5 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index efacfd2..fb51da0 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index dba12cc..78bbdef 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 81670b2..fb44d00 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26a7311..dc4ea86 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index eaf2544..8571a5f 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 0f615b6..e36258d 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 9e5f745..9915420 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 0fea52b..61027b2 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc8fce6..c2104bf 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 7414b76d8578e32c15a42b19466a55a29637ec0b Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 3 Jun 2020 13:43:13 +0800 Subject: [PATCH 16/72] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f9717e..807bef5 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index a9e288f..b948580 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index a44418c..e12eaee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 2de88b5..c338f71 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 50ab2c2..7637865 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 7f94617..d98b7d8 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index d800ecf..bf96e57 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 60fc467..a758a6a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index d65e031..efacfd2 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index a785f21..dba12cc 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index d6d2f8e..81670b2 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 0fbfb69..26a7311 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 76739f9..eaf2544 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 0368700..0f615b6 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index b2eedd4..9e5f745 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 5fcd08a..0fea52b 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 2eddf76..cc8fce6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 01e7224d1ec034495278189478bb0870993444aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 3 Jun 2020 13:46:39 +0800 Subject: [PATCH 17/72] =?UTF-8?q?=E3=80=90=E5=90=88=E5=B9=B6=E5=86=B2?= =?UTF-8?q?=E7=AA=81=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java index be8e632..5bcc4c8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -81,4 +82,12 @@ public class MesProdModelCfg extends BaseBean implements Serializable { @Column(name = "PROCESS_LABEL_TEMPLATE") @ApiParam("过程标签模板") private String processLabelTemplate; + + @Transient + @ApiParam("产品颜色") + private String produceColor; + + @Transient + @ApiParam("Vin") + private String vinCode; } From 1a079a1b898b04f736becc939edd8d3fa9e8bbaf Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 28 May 2020 16:07:24 +0800 Subject: [PATCH 18/72] =?UTF-8?q?feat(=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8):=20=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Pojo 实体创建 2. Service 实现唯一校验 3. 使用CRUD Controller 实现API 接口 --- .../estsh/i3plus/pojo/report/bean/BrCssStyle.java | 45 ++++++++++++++++++++++ .../report/repository/BrCssStyleRepository.java | 15 ++++++++ 2 files changed, 60 insertions(+) create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrCssStyleRepository.java diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java new file mode 100644 index 0000000..05eb399 --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.report.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:33 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BR_CSS_STYLE") +@Api(value="自定义样式") +public class BrCssStyle extends BaseBean { + + private static final long serialVersionUID = 8651392479116992679L; + + @Column(name="STYLE_CODE") + @ApiParam(value ="样式编码") + private String styleCode; + + @Column(name="STYLE_CONTENT") + @ApiParam(value ="样式内容") + private String styleContent; + + @Column(name="STYLE_DESCRIPTION") + @ApiParam(value ="样式描述") + private String styleDescription; + +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrCssStyleRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrCssStyleRepository.java new file mode 100644 index 0000000..6123774 --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrCssStyleRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.report.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.report.bean.BrCssStyle; +import cn.estsh.i3plus.pojo.report.bean.BrElement; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface BrCssStyleRepository extends BaseRepository { +} From adb95f100fbb5aa4561259c1b1334e71b98a2fcc Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 1 Jun 2020 15:24:14 +0800 Subject: [PATCH 19/72] =?UTF-8?q?Ics=20=E6=97=A5=E5=BF=97=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/common/ThreadModel.java | 31 ++++++++++++++++++++++ .../pojo/platform/platbean/SysLogConsole.java | 5 ++++ .../i3plus/pojo/softswitch/bean/BsSuitCase.java | 2 +- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ThreadModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ThreadModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ThreadModel.java new file mode 100644 index 0000000..2244887 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ThreadModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.model.common; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-29 下午3:40 + * @Modify: + **/ +@Data +public class ThreadModel implements Serializable { + + @ApiParam(value ="自定义调用ID") + private Long requestId; + @ApiParam(value ="当前用户ID") + private Long userId; + @ApiParam(value ="当前用户名称") + private String userName; + @ApiParam(value ="用户登录IP") + private String userHost; + @ApiParam(value ="用户登录浏览器") + private String userBrowser; + @ApiParam(value ="用户登录操作系统") + private String userOs; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java index b9e2fea..da9d71f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java @@ -47,6 +47,7 @@ public class SysLogConsole extends BaseBean { @Column(name="LOG_PID") @ApiParam(value ="应用PID") + @JsonSerialize(using = ToStringSerializer.class) private Long logPid; @Column(name="LOG_PORT") @@ -89,6 +90,10 @@ public class SysLogConsole extends BaseBean { private String userLoginName; /******** 日志信息 ********/ + @Column(name="REQUEST_ID") + @ApiParam(value ="请求ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long requestId; @Column(name="EXECUTE_THREAD_ID") @ApiParam(value ="执行线程") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index b06be17..a515e18 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -109,7 +109,7 @@ public class BsSuitCase extends BaseBean { @ApiParam(value = "是否推送MQ") private Integer isPushMQ; - @Column(name = "RESULT_SOFT_TYPE") + @Column(name = "RESULT_SOFT_TYPE",columnDefinition = "int default 0") @ApiParam(value = "同步调用微服务") private Integer resultSoftType; public String getResultSoftTypeTxt() { From d753bdc5b6381b5de330d8783b78dca7d18bd55d Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 3 Jun 2020 13:50:44 +0800 Subject: [PATCH 20/72] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=B1=82):=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=93=8D=E4=BD=9C=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?AOP=E5=AF=B9DAO=E7=9A=84=E6=96=B9=E6=B3=95=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=88=86=E5=88=87=E6=95=B0=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 62b5ceb..b43dcc8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -2519,4 +2519,12 @@ public class CommonEnumUtil { return tmp; } } + + /** + * 业务表：库存条码状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DYNAMIC_DATA_SOURCE_TYPE { + MASTER,NODE + } } From 0727370002a06958deec661d56e62424abf53803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 3 Jun 2020 17:31:13 +0800 Subject: [PATCH 21/72] =?UTF-8?q?8660=20MES-202005-PCN=E9=A6=96=E6=A3=80?= =?UTF-8?q?=E3=80=81=E5=B7=A1=E6=A3=80=E9=9C=80=E8=A6=81=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E4=BA=A7=E5=93=81=E6=9D=A1=E7=A0=81=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E6=A3=80=E6=B5=8B=E5=80=BC-20200527?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 26afb75..5dd373d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -116,4 +116,8 @@ public class MesQcOrder extends BaseBean implements Serializable { @Transient private String mesWorkNo; + @Transient + @ApiParam("产品条码") + private String productSn; + } From 523e4b7b3bec5acdfcd2cc8bc665497da7b5564a Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 3 Jun 2020 18:31:26 +0800 Subject: [PATCH 22/72] =?UTF-8?q?=E3=80=902016=09BH-=E5=9B=9E=E4=BC=A0?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E7=BB=93=E6=9E=9C=E8=87=B3MES=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 74 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 4 ++ .../mes/dbinterface/MesInterfaceDataMapper.java | 2 +- .../i3plus/pojo/wms/bean/WmsTestResultSummary.java | 6 +- .../wms/dbinterface/WmsInterfaceDataMapper.java | 2 +- 5 files changed, 85 insertions(+), 3 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 5fcd724..196d4e9 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 @@ -7397,4 +7397,78 @@ public class WmsEnumUtil { return null; } } + + /** + * BH同步标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_SUMMARY_IS_SYNC { + INIT(10, "INIT", "初始化"), + WAIT_SYNC(20, "WAIT_SYNC", "待同步"), + FINISH_SYNC(30, "FINISH_SYNC", "已同步"); + + private int value; + private String code; + private String description; + + BH_SUMMARY_IS_SYNC(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static BH_SUMMARY_IS_SYNC codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 26afb75..126dda8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -100,6 +100,10 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("发运时间") private String deliveryDate; + @Column(name = "CUST_DELIVERY_LOCATION") + @ApiParam("客户发往地") + private String custDeliveryLocation; + @ApiParam(value = "检测结果") @Transient private String reulstStatus; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java index 6fe17fb..a37e754 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java @@ -99,7 +99,7 @@ public class MesInterfaceDataMapper extends BaseBean { /** * 接口分组名称 - * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS + * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS,WMS2MES */ @Column(name = "GROUP_NAME") public String groupName; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java index d8f9637..84ddd8f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -79,6 +79,10 @@ public class WmsTestResultSummary extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer pickResult; + @Column(name = "IS_SYNC", nullable = false) + @ApiParam("是否同步") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_SUMMARY_IS_SYNC.class, refForeignKey = "value", value = "description") + public Integer isSync = WmsEnumUtil.BH_SUMMARY_IS_SYNC.INIT.getValue(); @Transient @ApiParam("BH类型") @@ -128,7 +132,7 @@ public class WmsTestResultSummary extends BaseBean { this.bhType = bhType; } - public WmsTestResultSummary() { + public WmsTestResultSummary() { } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index 2541e40..9dfdc8c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -104,7 +104,7 @@ public class WmsInterfaceDataMapper extends BaseBean { /** * 接口分组名称 - * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS + * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS,WMS2MES */ @Column(name = "GROUP_NAME") public String groupName; From 36f9068e4c1fac7f36e2cf9fedc694c1825f44fc Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 3 Jun 2020 18:35:42 +0800 Subject: [PATCH 23/72] =?UTF-8?q?=E3=80=90=E5=86=B2=E7=AA=81=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java index 84ddd8f..29121cc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -134,6 +134,4 @@ public class WmsTestResultSummary extends BaseBean { public WmsTestResultSummary() { } - } - } From a8dd9831e028c5fff042a3fadae544dbe303c30f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 3 Jun 2020 19:23:19 +0800 Subject: [PATCH 24/72] Start Task #2021,2022 Cost:8h Left:8h --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 46 ++++++++++++++ .../i3plus/pojo/mes/bean/MesAgvStopRecord.java | 72 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesDefect.java | 4 ++ .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 4 ++ .../mes/repository/MesAgvStopRecordRepository.java | 14 +++++ 5 files changed, 140 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAgvStopRecordRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 50621d2..17bcbcd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -4099,4 +4099,50 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 停机类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STOP_MACHINE_TYPE { + TIMER_TIME_OUT(10, "计时器超时停机"), + DELAY_HELP(20, "延时帮助停机"), + URGENT_STOP(30, "急停停机"); + + private int value; + private String description; + + STOP_MACHINE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java new file mode 100644 index 0000000..fb1dcd3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java @@ -0,0 +1,72 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :停机记录表 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-03 15:38 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_AGV_STOP_RECORD") +@Api("MES_停机记录表") +public class MesAgvStopRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -8961182851767690154L; + @Column(name = "STOP_TYPE") + @ApiParam("停机类型") + private Integer stopType; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "STOP_START_TIME") + @ApiParam("停机开始时间") + private String stopStartTime; + + @Column(name = "STOP_END_TIME") + @ApiParam("停机结束时间") + private String stopEndTime; + + @Column(name = "STOP_REASON") + @ApiParam("停机原因") + private String stopReason; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java index fddbb26..cb0f1b4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java @@ -44,6 +44,10 @@ public class MesDefect extends BaseBean implements Serializable { @ApiParam("缺陷类型") private String defectType; + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + @Transient @ApiParam("缺陷类型名称") private String defectTypeName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 57687ae..bd996b0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -132,6 +132,10 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("队列类型名称") private String queueTypeName; + @Transient + @ApiParam("产品颜色") + private String colorName; + public int getStatusVal() { return this.status == null ? 0 : this.status; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAgvStopRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAgvStopRecordRepository.java new file mode 100644 index 0000000..4acb5ea --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAgvStopRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesAgvStopRecord; + +/** + * @Description: 停机记录数据操作层 + * @Reference: + * @Author: siliter.yuan + * @CreateDate: 2020\06\03 10:34 + * @Modify: + **/ +public interface MesAgvStopRecordRepository extends BaseRepository { +} From 3c1f8cf6b19e5af248ef88e81983c58f49a8cec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 3 Jun 2020 19:48:08 +0800 Subject: [PATCH 25/72] Finish Task #1889 Cost:24h --- .../i3plus/pojo/mes/bean/MesProdBindRecord.java | 3 ++ .../i3plus/pojo/mes/model/DefectTypeModel.java | 19 ++++++++ .../pojo/mes/model/RepairAndDefectModel.java | 56 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/ScatterBomModel.java | 26 ++++++++++ .../i3plus/pojo/mes/model/SkinCheckModel.java | 40 ++++++++++++++++ 5 files changed, 144 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RepairAndDefectModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterBomModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkinCheckModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index 61a2dc8..90a96f1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -112,6 +112,9 @@ public class MesProdBindRecord extends BaseBean implements Serializable { @ApiParam("原材料零件名称") private String itemPartName; + @ApiParam("生产队列号") + private String orderNo; + public int getIsFeedVal() { return this.isFeed == null ? 0 : this.isFeed; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeModel.java new file mode 100644 index 0000000..3620dd2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeModel.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class DefectTypeModel implements Serializable { + + // 缺陷/维修 + @ApiParam("业务类型") + private String busiType; + + @ApiParam("List结果集") + private List resultList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RepairAndDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RepairAndDefectModel.java new file mode 100644 index 0000000..247288e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RepairAndDefectModel.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class RepairAndDefectModel implements Serializable { + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("生产工单号") + private String workOrderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("缺陷代码") + private String defectCode; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷位置") + private String defectLocation; + + @ApiParam("面位") + private String sideLocation; + + @ApiParam("维修状态") + private Integer repairStatus; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("维修代码") + private String repairCode; + + @ApiParam("维修名称") + private String repairName; + + @ApiParam("缺陷原因代码") + private String dcCode; + + @ApiParam("缺陷原因描述") + private String dcName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterBomModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterBomModel.java new file mode 100644 index 0000000..6fe1eaf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterBomModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ScatterBomModel implements Serializable { + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("个数") + private Double qty; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkinCheckModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkinCheckModel.java new file mode 100644 index 0000000..1f6afc7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkinCheckModel.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesProduceCtgyPicture; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class SkinCheckModel implements Serializable { + + @ApiParam("主队列编号") + private String orderNo; + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("生产号") + private String vinCode; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("车型") + private String prodCfgTypeCode; + + @ApiParam("等级") + private String gradeCode; + + @ApiParam("面位") + private String sideLocation; + + // 产品位置图片 + private List produceCtgyPictureList; + +} From 9975335acbbb7e6f28cbe43f2278d549101370a3 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 4 Jun 2020 09:25:40 +0800 Subject: [PATCH 26/72] Finish Task #2033 Cost:8h --- .../cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 10 ++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 16 ++++++++++++++++ .../pojo/wms/dbinterface/WmsInterfaceEnumUtil.java | 10 +++++----- 5 files changed, 35 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index dbf14e7..a427d3a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -589,7 +589,8 @@ public class SwebEnumUtil { UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"), TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"), EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"), - LOADING_ORDER(530, "LOADING_ORDER", "装车单"); + LOADING_ORDER(530, "LOADING_ORDER", "装车单"), + SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途"); private int value; private String code; private String description; 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 0011042..850874c 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 @@ -725,7 +725,8 @@ public class WmsEnumUtil { UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"), TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"), EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"), - LOADING_ORDER(530, "LOADING_ORDER", "装车单"); + LOADING_ORDER(530, "LOADING_ORDER", "装车单"), + SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途"); private int value; private String code; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index 184bdff..edb96e4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -113,6 +113,16 @@ public class WmsBom extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String terminalNo; + @Column(name = "SEQ_NO") + @ApiParam(value = "父位置号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String seqNo; + + @Column(name = "ITEM_SEQ_NO") + @ApiParam(value = "子位置号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String itemSeqNo; + @Column(name = "BOM_TYPE") @ApiParam(value = "BOM类型") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 5398ffd..01e7b12 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -184,6 +184,22 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "销售单据号") private String soOrderNo; + @Column(name = "MEL_TYPE") + @ApiParam(value = "材料类型") + private String melType; + + @Column(name = "PROJECT_NO") + @ApiParam(value = "项目号") + private String projectNo; + + @Column(name = "PRODUCTION_GROUP") + @ApiParam(value = "生产小组") + private String productionGroup; + + @Column(name = "CUST_PART_NO") + @ApiParam(value = "客户零件号") + private String custPartNo; + @Transient @ApiParam(value = "替代物料编码") private String subPartNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index 752e8bb..c7e33b8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -6,11 +6,11 @@ public class WmsInterfaceEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DIRECTION_TYPE { - SAP2WMS(10, "SAP2WMS", "SAP --> WMS"), - WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), - MES2WMS(30, "MES2WMS", "MES --> WMS"), - WMS2MES(40, "WMS2MES", "WMS --> MES"), - SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"); + SAP2WMS(10, "SAP2WMS-2", "SAP --> WMS"), + WMS2SAP(20, "WMS2SAP-2", "WMS --> SAP"), + MES2WMS(30, "MES2WMS-2", "MES --> WMS"), + WMS2MES(40, "WMS2MES-2", "WMS --> MES"), + SWEB2WMS(50, "SWEB2WMS-2", "SWEB --> WMS"); private int value; private String name; From 6d4a1b6975fe63430ed412900d6cf7069f04d8ce Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 4 Jun 2020 10:01:08 +0800 Subject: [PATCH 27/72] =?UTF-8?q?BH-CODE=20=E5=87=BA=E5=BA=93=EF=BC=8C?= =?UTF-8?q?=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDocMovementDetails.java | 7 +++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 53 +++++++++++----------- .../pojo/wms/bean/WmsLogisticExpenseRecords.java | 1 + .../wms/bean/WmsLogisticExpenseRecordsDetails.java | 15 +++++- .../i3plus/pojo/wms/bean/WmsLogisticsCosts.java | 2 +- .../pojo/wms/bean/WmsLogisticsFreightApproval.java | 29 +++++++++++- .../pojo/wms/bean/WmsShortLogisticsCosts.java | 2 +- .../i3plus/pojo/wms/bean/WmsTmsShippingExt.java | 4 -- .../pojo/wms/bean/WmsTmsShippingExtDetail.java | 8 ++-- .../pojo/wms/modelbean/WmsTmsShippingExtModel.java | 1 - .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 +++++++ 11 files changed, 99 insertions(+), 40 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 01e7b12..dba43e2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -340,6 +342,11 @@ public class WmsDocMovementDetails extends BaseBean { public Integer isSn; + @Column(name = "REF_SRC") + @ApiParam("关联单号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String refSrc; + public WmsDocMovementDetails () { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 5128c4e..81578e5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -188,30 +188,6 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "QAD发运单据类型") private String erpSrcType; - @Transient - @ApiParam(value = "发运单号") - private String shipOrderNo; - - @Transient - @ApiParam(value = "打印时间") - private String printDate; - - @Transient - @ApiParam("类型名称") - public String busiTypeName; - - @Transient - @ApiParam("物料编号") - public String partNo; - - @ApiParam(value = "标题") - @Transient - public String title; - - @Transient - @ApiParam("物料编号组") - public String[] partNos; - @ApiParam("是否正常运输") @Column(name = "IS_NORMAL_TRANSPORTATION") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") @@ -230,7 +206,7 @@ public class WmsDocMovementMaster extends BaseBean { //正常运输 和非正常运输 @Column(name = "BUSINESS_TYPE") - @ApiParam(value = "业务类型") + @ApiParam(value = "运输方式") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL") @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class) private Integer businessType; @@ -242,11 +218,36 @@ public class WmsDocMovementMaster extends BaseBean { private Integer isTransportationCreation; @Column(name = "IS_GOOD_PRODUCT") - @ApiParam(value = "运输信息创建") + @ApiParam(value = "是否良品") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class) private Integer isGoodProduct; + @Transient + @ApiParam(value = "发运单号") + private String shipOrderNo; + + @Transient + @ApiParam(value = "打印时间") + private String printDate; + + @Transient + @ApiParam("类型名称") + public String busiTypeName; + + @Transient + @ApiParam("物料编号") + public String partNo; + + @ApiParam(value = "标题") + @Transient + public String title; + + @Transient + @ApiParam("物料编号组") + public String[] partNos; + + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java index 1c7a2f8..0f53480 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecords.java @@ -78,6 +78,7 @@ public class WmsLogisticExpenseRecords extends BaseBean { public WmsLogisticExpenseRecords(WmsDocMovementMaster docMovementMaster) { // this.organizeName = docMovementMaster.getorganizeName; this.orderNo = docMovementMaster.getOrderNo(); + this.organizeCode = docMovementMaster.getOrganizeCode(); this.shippingFlag = docMovementMaster.getFlagNo(); this.busiType = docMovementMaster.getBusiType(); this.transportType = docMovementMaster.getTransportType(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecordsDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecordsDetails.java index f2ffc17..711686f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecordsDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticExpenseRecordsDetails.java @@ -1,8 +1,10 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -51,6 +53,11 @@ public class WmsLogisticExpenseRecordsDetails extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String partName; + @Column(name = "PART_UNIT") + @ApiParam(value = "物料单位") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partUnit; + @Column(name = "unit") @ApiParam(value = "计量单位") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, @@ -77,5 +84,11 @@ public class WmsLogisticExpenseRecordsDetails extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String endTime; - + /** + * 状态:N=正常,C=行取消 + */ + @Column(name = "ITEM_STATUS") + @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") + private Integer itemStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java index 6ae56d3..acc1cb6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java @@ -64,7 +64,7 @@ public class WmsLogisticsCosts extends BaseBean { private String salesUnit; @Column(name = "TRANSPORT_TYPE") - @ApiParam(value = "运输类型") + @ApiParam(value = "运输方式") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL") @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class) private Integer transportType; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java index 443acee..c641bc9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsFreightApproval.java @@ -102,6 +102,29 @@ public class WmsLogisticsFreightApproval extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer isUrgent; + @Column(name = "SRC_WH_NO") + @ApiParam("源仓库代码") + public String assignSrcWhNo; + + @Column(name = "REMAKE") + @ApiParam("备注") + public String remake; + + @Column(name = "DEST_WH_NO") + @ApiParam("目标仓库代码") + public String assignDestWhNo; + + @Column(name = "FLAG_NO") + @ApiParam(value = "客户发往地编号") + private String flagNo; + + //正常运输 和非正常运输 + @Column(name = "BUSINESS_TYPE") + @ApiParam(value = "运输方式") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL") + @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class) + private Integer businessType; + public WmsLogisticsFreightApproval(WmsDocMovementMaster docMovementMaster) { this.orderNo = docMovementMaster.getOrderNo(); this.organizeCode = docMovementMaster.getOrganizeCode(); @@ -114,10 +137,12 @@ public class WmsLogisticsFreightApproval extends BaseBean { this.logisticsVendorNo = docMovementMaster.getLogisticsVendorNo(); this.transportType = docMovementMaster.getTransportType(); this.placeOfOriginCode = docMovementMaster.getFlagNo(); -// this.placeOfOriginDesc = placeOfOriginDesc; this.custDeliveryCode = docMovementMaster.getAssignSrcWhNo(); -// this.custDeliveryDesc = custDeliveryDesc; this.isUrgent = WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + this.assignSrcWhNo = docMovementMaster.getAssignSrcWhNo(); + this.assignDestWhNo = docMovementMaster.getAssignDestWhNo(); + this.flagNo = docMovementMaster.getFlagNo(); + this.businessType = docMovementMaster.getBusinessType(); } public WmsLogisticsFreightApproval() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java index 793d252..928d2d4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java @@ -69,7 +69,7 @@ public class WmsShortLogisticsCosts extends BaseBean { private String logisticsVendorNo; @Column(name = "TRANSPORT_TYPE") - @ApiParam(value = "运输类型") + @ApiParam(value = "运输方式") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL") @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class) private Integer transportType; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java index befe9e5..4b47141 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java @@ -106,10 +106,6 @@ public class WmsTmsShippingExt extends BaseBean { @ApiParam("物料编码") private String partNo; - @Transient - @ApiParam("关联单号") - private String refOrderNo; - @Column(name="PATH_URL") @ApiParam("回执单地址") private String pathUrl; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java index bc5e86b..1f49ba2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java @@ -60,9 +60,9 @@ public class WmsTmsShippingExtDetail extends BaseBean { @ApiParam("单位") public String unit; - @Column(name = "ORDER_NO") - @ApiParam("订单号") - public String orderNo; + @Column(name = "REF_ORDER_NO") + @ApiParam("关联单号") + private String refOrderNo; @Column(name = "SRC_WH_NO") @ApiParam("源仓库代码") @@ -308,7 +308,6 @@ public class WmsTmsShippingExtDetail extends BaseBean { this.item = docMovementDetails.getItem(); this.qty =docMovementDetails.getQty(); this.unit = docMovementDetails.getUnit(); - this.orderNo = docMovementDetails.getOrderNo(); this.srcWhNo = docMovementDetails.getSrcWhNo(); this.srcZoneNo = docMovementDetails.getSrcZoneNo(); this.srcLocateNo = docMovementDetails.getSrcLocateNo(); @@ -331,6 +330,7 @@ public class WmsTmsShippingExtDetail extends BaseBean { this.destAreaNo = docMovementDetails.getDestAreaNo(); this.lotNo = docMovementDetails.getLotNo(); this.srcItem = docMovementDetails.getSrcItem(); + this.refOrderNo = docMovementDetails.getOrderNo(); this.custOrderNo = docMovementDetails.getCustOrderNo(); this.assignDateCode = docMovementDetails.getAssignDateCode(); this.actualLot = docMovementDetails.getActualLot(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java index e1103b4..2ab29c1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java @@ -127,7 +127,6 @@ public class WmsTmsShippingExtModel { this.shippingTime=wmsTmsShippingExt.getCreateDatetime(); this.shippingUser=wmsTmsShippingExt.getCreateUser(); this.defectiveAllocation=wmsTmsShippingExt.getDefectiveAllocation(); - this.refOrderNo=wmsTmsShippingExt.getRefOrderNo(); this.orderDate=wmsTmsShippingExt.getCreateDatetime(); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index cf8d1d1..6d8b3d7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -14,6 +14,7 @@ import cn.estsh.i3plus.pojo.wms.bean.plugin.BasPlugin; import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplate; import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; +import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipDto; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; @@ -3371,6 +3372,22 @@ public class WmsHqlPack { return packBean; } + /** + * 装车单 传输类 + * + * @param model + * @return + */ + public static DdlPackBean packHqlTmsShip(WmsTmsShipDto model) { + + DdlPackBean packBean = WmsHqlPack.packHqlWms(model.getOrganizeCode()); + DdlPreparedPack.getNumEqualPack(model.getOrderStatus(), "orderStatus", packBean); + DdlPreparedPack.getStringEqualPack(model.getMoveNo(), "moveNo", packBean); + DdlPreparedPack.getOrderByPack( + new Object[]{CommonEnumUtil.FALSE}, + new String[]{"createDatetime"}, packBean); + return packBean; + } /** * BH检测大类表查询条件 From 7e712c5553a11968d4200a22bc8afd78ce98b283 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 4 Jun 2020 11:11:19 +0800 Subject: [PATCH 28/72] =?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 3428e74..932bdd9 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-PROD-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 6232d14e6184ca7c350aa4d64bab63b76bb9ec96 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 4 Jun 2020 11:44:14 +0800 Subject: [PATCH 29/72] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A2066=EF=BC=8C?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9C=BA=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonRouteStatus.java | 12 ---- .../andon/bean/AndonRouteStatusErrorRecord.java | 10 --- .../i3plus/pojo/andon/model/CommonMsgModel.java | 3 - .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 71 +++++++++------------- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 52 ---------------- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 52 ---------------- .../estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java | 13 ---- .../pojo/ptl/bean/PtlRouteStatusErrorRecord.java | 10 --- .../i3plus/pojo/ptl/model/CommonMsgModel.java | 3 - .../estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java | 10 +++ 10 files changed, 40 insertions(+), 196 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java index c74a432..bf2755c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java @@ -85,10 +85,6 @@ public class AndonRouteStatus extends BaseBean implements Serializable { private Long alarmRouteId; @Transient - @ApiParam("状态机异常时默认不缓存") - private boolean cacheFlag = false; - - @Transient @ApiParam("当前状态点的触发组件集默认未执行") private boolean actionAmgIdFalg = false; @@ -100,12 +96,4 @@ public class AndonRouteStatus extends BaseBean implements Serializable { @ApiParam("每个组件执行完成根据业务设置下个触发事件，如果需要外部告知下个触发事件则设置null，一个组件集执行完毕后将这个值赋给CommonMsgModel的triggerEvent") private String nextTriggerEvent; - @Transient - @ApiParam("在一个组件集中默认继续执行下一个组件，当组件集中一个组件执行失败或者根据业务需要跳出去进去下个状态点，则设置未false(即这个组件集中剩余的组件停止执行),同时配置下个状态点的触发事件nextTriggerEvent") - private boolean execNextModuleFlag = true; - - @Transient - @ApiParam("默认异常未处理，业务异常抛出后，如果需要缓存，则设置cacheFlag为true，因为会被catch捕获，所以这里需要设置为true，避免异常重复被处理") - private boolean doErrorFlag = false; - } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java index 153b1ad..a71f88e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.andon.bean; - import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -17,7 +16,6 @@ import java.io.Serializable; * @date 2020/2/12 17:41 * @desc */ - @Data @Entity @DynamicInsert @@ -61,18 +59,10 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl @ApiParam(value = "安灯来源类型") private String sourceType; - @Column(name = "CACHE_FLAG") - @ApiParam(value = "缓存标识") - private Integer cacheFlag; - @Column(name = "CACHE_KEY") @ApiParam(value = "缓存KEY") private String cacheKey; - @Column(name = "HANDLE_TYPE") - @ApiParam(value = "处理方式") - private Integer handleType; - @Column(name = "HANDLE_STATUS") @ApiParam(value = "处理状态") private Integer handleStatus; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java index 8efdfa3..c677396 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java @@ -42,9 +42,6 @@ public class CommonMsgModel implements Serializable { @ApiModelProperty("触发事件") private String triggerEvent; - @ApiModelProperty("缓存KEY") - private String cacheKey; - @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true") private boolean errorInnerAction = false; 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 b30f6cd..b56e7c1 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 @@ -1,46 +1,6 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; -import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule; -import cn.estsh.i3plus.pojo.andon.bean.AndonActionModuleParam; -import cn.estsh.i3plus.pojo.andon.bean.AndonActionRoute; -import cn.estsh.i3plus.pojo.andon.bean.AndonActor; -import cn.estsh.i3plus.pojo.andon.bean.AndonActorRule; -import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause; -import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmDetailType; -import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmResponseCfg; -import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRoute; -import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType; -import cn.estsh.i3plus.pojo.andon.bean.AndonBroadCast; -import cn.estsh.i3plus.pojo.andon.bean.AndonBroadCastCfg; -import cn.estsh.i3plus.pojo.andon.bean.AndonCellAlarmCause; -import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventCause; -import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventMethod; -import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventPhenomenon; -import cn.estsh.i3plus.pojo.andon.bean.AndonCellGroupCfg; -import cn.estsh.i3plus.pojo.andon.bean.AndonConfig; -import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalCfg; -import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalMaintenCfg; -import cn.estsh.i3plus.pojo.andon.bean.AndonEventCause; -import cn.estsh.i3plus.pojo.andon.bean.AndonEventMethod; -import cn.estsh.i3plus.pojo.andon.bean.AndonEventPhenoMenon; -import cn.estsh.i3plus.pojo.andon.bean.AndonHaltCfg; -import cn.estsh.i3plus.pojo.andon.bean.AndonHaltType; -import cn.estsh.i3plus.pojo.andon.bean.AndonKnowledgeBase; -import cn.estsh.i3plus.pojo.andon.bean.AndonManageQueue; -import cn.estsh.i3plus.pojo.andon.bean.AndonManageRecord; -import cn.estsh.i3plus.pojo.andon.bean.AndonMessageRecord; -import cn.estsh.i3plus.pojo.andon.bean.AndonMessageType; -import cn.estsh.i3plus.pojo.andon.bean.AndonPLC; -import cn.estsh.i3plus.pojo.andon.bean.AndonQueueAttach; -import cn.estsh.i3plus.pojo.andon.bean.AndonResponse; -import cn.estsh.i3plus.pojo.andon.bean.AndonResponseObject; -import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRoute; -import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRouteDetail; -import cn.estsh.i3plus.pojo.andon.bean.MesArea; -import cn.estsh.i3plus.pojo.andon.bean.MesEquipment; -import cn.estsh.i3plus.pojo.andon.bean.MesShift; -import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell; -import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter; +import cn.estsh.i3plus.pojo.andon.bean.*; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -1086,6 +1046,12 @@ public class AndonHqlPack { return packBean; } + /** + * 作业流程 + * @param actionRoute + * @param organizeCode + * @return + */ public static DdlPackBean packHqlAndonActionRoute(AndonActionRoute actionRoute, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(actionRoute, organizeCode); DdlPreparedPack.getStringLikerPack(actionRoute.getRouteCode(), "routeCode", packBean); @@ -1094,6 +1060,12 @@ public class AndonHqlPack { return packBean; } + /** + * 安灯作业流程配置 + * @param alarmRoute + * @param organizeCode + * @return + */ public static DdlPackBean packHqlAndonAlarmRoute(AndonAlarmRoute alarmRoute, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(alarmRoute, organizeCode); DdlPreparedPack.getStringLikerPack(alarmRoute.getRouteCode(), "routeCode", packBean); @@ -1101,4 +1073,21 @@ public class AndonHqlPack { DdlPreparedPack.getNumEqualPack(alarmRoute.getRouteType(), "routeType", packBean); return packBean; } + + /** + * 流程状态异常记录 + * @param routeStatusErrorRecord + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonRouteStatusErrorRecord(AndonRouteStatusErrorRecord routeStatusErrorRecord, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(routeStatusErrorRecord, organizeCode); + DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getRouteCode(), "routeCode", packBean); + DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getStatusCode(), "statusCode", packBean); + DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getAndonOrderNo(), "andonOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(routeStatusErrorRecord.getAlarmCode(), "alarmCode", packBean); + DdlPreparedPack.getStringEqualPack(routeStatusErrorRecord.getSourceType(), "sourceType", packBean); + DdlPreparedPack.getNumEqualPack(routeStatusErrorRecord.getHandleStatus(), "handleStatus", packBean); + return packBean; + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 58d22b3..8775387 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -13,32 +13,6 @@ import org.apache.commons.lang3.StringUtils; public class AndonEnumUtil { /** - * 状态机异常处理方式 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE { - INNER(10, "内部处理"), - OUTER(20, "外部处理"), - REVIEW(30, "人工确认"); - - private int value; - private String description; - - ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - } - - /** * 状态机异常处理状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -64,32 +38,6 @@ public class AndonEnumUtil { } /** - * 状态机异常缓存标识 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG { - FALSE(10, "否"), - TRUE(20, "是"), - ORIGINAL(30, "原先"); - - private int value; - private String description; - - ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - } - - /** * 状态机执行方法 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 679e650..7889a71 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -14,32 +14,6 @@ import static cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil.MONITOR_PROCESS_ public class PtlPcnEnumUtil { /** - * 状态机异常处理方式 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE { - INNER(10, "内部处理"), - OUTER(20, "外部处理"), - REVIEW(30, "人工确认"); - - private int value; - private String description; - - ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - } - - /** * 状态机异常处理状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -65,32 +39,6 @@ public class PtlPcnEnumUtil { } /** - * 状态机异常缓存标识 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG { - FALSE(10, "否"), - TRUE(20, "是"), - ORIGINAL(30, "原先"); - - private int value; - private String description; - - ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - } - - /** * 控制器状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java index d81607b..319d501 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java @@ -77,10 +77,6 @@ public class PtlRouteStatus extends BaseBean implements Serializable { private Integer statusType; @Transient - @ApiParam("默认不缓存") - private boolean cacheFlag = false; - - @Transient @ApiParam("触发组件集默认未执行") private boolean actionAmgIdFalg = false; @@ -92,13 +88,4 @@ public class PtlRouteStatus extends BaseBean implements Serializable { @ApiParam("组件执行完成根据业务设置下个触发事件，如果是外部告知下个触发事件则设置null，一个组件集执行完毕后这个值赋给CommonMsgModel的triggerEvent") private String nextTriggerEvent; - @Transient - @ApiParam("默认继续执行下个组件，当组件集中一个组件根据业务需要跳出去进去下个状态点，则设置未false,同时配置下个状态点的触发事件nextTriggerEvent") - private boolean execNextModuleFlag = true; - - @Transient - @ApiParam("默认异常未处理") - private boolean doErrorFlag = false; - - } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java index 1795f20..cc36903 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.ptl.bean; - import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -19,7 +18,6 @@ import java.io.Serializable; * @date 2020/2/12 17:41 * @desc */ - @Data @Entity @DynamicInsert @@ -51,18 +49,10 @@ public class PtlRouteStatusErrorRecord extends BaseBean implements Serializable @ApiParam("区域代码") private String areaNo; - @Column(name = "CACHE_FLAG") - @ApiParam(value = "缓存标识") - private Integer cacheFlag; - @Column(name = "CACHE_KEY") @ApiParam(value = "缓存KEY") private String cacheKey; - @Column(name = "HANDLE_TYPE") - @ApiParam(value = "处理方式") - private Integer handleType; - @Column(name = "HANDLE_STATUS") @ApiParam(value = "处理状态") private Integer handleStatus; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java index 249a802..1f9945f 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java @@ -48,9 +48,6 @@ public class CommonMsgModel implements Serializable { @ApiModelProperty("外部触发事件") private String triggerEvent; - @ApiModelProperty("缓存KEY") - private String cacheKey; - @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true") private boolean errorInnerAction = false; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 3fc6e54..c40e78d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -341,4 +341,14 @@ public class PtlHqlPack { DdlPreparedPack.getStringLikerPack(area.getAreaName(), "areaName", packBean); return packBean; } + + public static DdlPackBean getPtlRouteStatusErrorRecord(PtlRouteStatusErrorRecord routeStatusErrorRecord, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(routeStatusErrorRecord, organizeCode); + DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getRouteCode(), "routeCode", packBean); + DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getStatusCode(), "statusCode", packBean); + DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getTaskNo(), "taskNo", packBean); + DdlPreparedPack.getStringEqualPack(routeStatusErrorRecord.getAreaNo(), "areaNo", packBean); + DdlPreparedPack.getNumEqualPack(routeStatusErrorRecord.getHandleStatus(), "handleStatus", packBean); + return packBean; + } } From 16f1ed34a58f1fe70074059ad1fd6f6b041611e5 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 4 Jun 2020 15:10:14 +0800 Subject: [PATCH 30/72] Fix bug#8780 --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 5 +++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 01e7b12..441efce 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -156,6 +156,11 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "任务生成数量", example = "1") private Double taskGenerateQty; + @Column(name = "TASK_GENERATE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "剩余打印数量") + private Double printGenerateQty; + @Column(name = "SRC_AREA_NO") @ApiParam("源库存地代码") public String srcAreaNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 0f8d64f..1f57cde 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -10,7 +10,11 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库存移动单处理成功后的记录，通过监听交易成功队列写入 @@ -191,6 +195,10 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("是否预收货") public Integer priorRC = 2; + @Column(name = "ERP_SRC_NO") + @ApiParam(value = "ERP单号") + private String erpSrcNo; + @Column(name = "ERP_SRC_TYPE",columnDefinition = "varchar(50) default ''") @ApiParam(value = "QAD发运单据类型") From 454de274c70cb39bfc472a4201a6379ac6c8d052 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 4 Jun 2020 15:49:15 +0800 Subject: [PATCH 31/72] Fix bug#8780 --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 9cc882e..028c43f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -158,7 +158,7 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "任务生成数量", example = "1") private Double taskGenerateQty; - @Column(name = "TASK_GENERATE_QTY", columnDefinition = "decimal(18,8)") + @Column(name = "PRINT_GENERATE_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "剩余打印数量") private Double printGenerateQty; From 414b8118716e63b5505403ad6b0354999b06c8ce Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 4 Jun 2020 17:01:13 +0800 Subject: [PATCH 32/72] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 5 +++++ sonar-project.properties | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index b8ed589..49cf675 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -16,6 +16,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.lang.reflect.Method; import java.sql.JDBCType; @@ -122,11 +123,15 @@ public class FieldInfo extends BaseAPS { private Boolean notEmpty; @JsonIgnore + @Transient private transient Class clazz; @JsonIgnore + @Transient private transient Class typeClass; @JsonIgnore + @Transient private transient Method getMethod; @JsonIgnore + @Transient private transient Method setMethod; } diff --git a/sonar-project.properties b/sonar-project.properties index 3428e74..55e4e84 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-PROD-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From e57acfacee52d06dc76a561a146a0d7eef39fded Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 4 Jun 2020 17:56:06 +0800 Subject: [PATCH 33/72] =?UTF-8?q?BH=20BUG=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index c7e33b8..752e8bb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -6,11 +6,11 @@ public class WmsInterfaceEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DIRECTION_TYPE { - SAP2WMS(10, "SAP2WMS-2", "SAP --> WMS"), - WMS2SAP(20, "WMS2SAP-2", "WMS --> SAP"), - MES2WMS(30, "MES2WMS-2", "MES --> WMS"), - WMS2MES(40, "WMS2MES-2", "WMS --> MES"), - SWEB2WMS(50, "SWEB2WMS-2", "SWEB --> WMS"); + SAP2WMS(10, "SAP2WMS", "SAP --> WMS"), + WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), + MES2WMS(30, "MES2WMS", "MES --> WMS"), + WMS2MES(40, "WMS2MES", "WMS --> MES"), + SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"); private int value; private String name; From b946ca7fa1e16c4e5bc04e4cbece654c9ea080f9 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 4 Jun 2020 19:45:59 +0800 Subject: [PATCH 34/72] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A2066=EF=BC=8C?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9C=BA=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java | 2 +- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java index a71f88e..ceaea06 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java @@ -40,7 +40,7 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl public String andonOrderNo; @Column(name = "ERROR_DESC") - @ApiParam(value = "失败描述") + @ApiParam(value = "异常描述") public String errorDesc; @Column(name = "WORK_CENTER_CODE") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java index cc36903..4e4d276 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java @@ -42,7 +42,7 @@ public class PtlRouteStatusErrorRecord extends BaseBean implements Serializable private String taskNo; @Column(name = "ERROR_DESC") - @ApiParam(value = "失败描述") + @ApiParam(value = "异常描述") public String errorDesc; @Column(name = "AREA_NO") From a2ef35082eb091266044857b5ccda35676da5864 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 4 Jun 2020 20:00:16 +0800 Subject: [PATCH 35/72] =?UTF-8?q?=E3=80=901794=20=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3WMS-=E6=8A=A5=E8=A1=A8-=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E5=88=A9=E7=94=A8=E7=8E=87=E7=9C=8B=E6=9D=BF=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/WmsLocate.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index efdb745..0876d86 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -202,6 +202,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", @ApiParam(value = "库龄") private String age; + @Transient + @ApiParam(value = "库位箱数") + private Long qty; + public WmsLocate() { } @@ -252,6 +256,12 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", this.z=z; } + public WmsLocate(Long qty, Integer status, String zoneNo) { + this.qty = qty; + this.status = status; + this.zoneNo = zoneNo; + } + public Integer getMaxPackageQty() { return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue(); } From 4fc8c2a80df5197962565bfe8f6ba5af04a2e269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 4 Jun 2020 20:40:17 +0800 Subject: [PATCH 36/72] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=80=82=E9=85=8D=E5=8F=91=E9=80=81=E6=8A=A5=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 3 ++- .../i3plus/pojo/model/softswitch/SuitClientModel.java | 6 ++++++ .../pojo/softswitch/bean/BsSuitCaseDataSourceTable.java | 17 +++++++++++++---- .../i3plus/pojo/softswitch/bean/BsSuitCaseREST.java | 8 ++++++++ .../estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java | 5 +++++ 5 files changed, 34 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 35431f8..0b8c98b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -876,7 +876,8 @@ public class BlockSoftSwitchEnumUtil { SUIT_MESSAGE(10, "适配信息"), REQUEST_ORGIN_PARAM(20, "请求原始参数"), ORIGINAL_MESSAGE(30, "原始报文"), - CONVERTED_MESSAGE(40, "转换报文"); + CONVERTED_MESSAGE(40, "转换报文"), + SUIT_SEND_MESSAGE(50, "适配发送报文"); private int value; private String description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index 7241fe9..eac5415 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -56,6 +56,12 @@ public class SuitClientModel implements Serializable { private String suitMessage; /** + * 适配发送报文信息 + */ + @XStreamCDATA + private String suitSendMessage; + + /** * 请求来源 */ private Integer requestSource; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java index decd680..74734ce 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -9,6 +11,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @@ -41,15 +44,21 @@ public class BsSuitCaseDataSourceTable extends BaseBean { @Column(name = "OPERATE_TYPE_ID") @ApiParam(value = "操作类型") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.DATABASE_OPERATE_TYPE.class) private Integer operateTypeId; - public int getOperateTypeIdVal(){ - if(operateTypeId == null){ + public int getOperateTypeIdVal() { + if (operateTypeId == null) { return -1; } return operateTypeId.intValue(); } + + public String getOperateTypeIdTxt() { + return operateTypeId == null ? "无" : BlockSoftSwitchEnumUtil.DATABASE_OPERATE_TYPE.valueOfDescription(operateTypeId); + } + @Column(name = "EXECUTE_SQL") @ApiParam(value = "执行sql") private String executeSql; @@ -62,8 +71,8 @@ public class BsSuitCaseDataSourceTable extends BaseBean { @ApiParam(value = "是否有返回") private Integer isReturn; - public int getIsReturnVal(){ - if(isReturn == null){ + public int getIsReturnVal() { + if (isReturn == null) { return -1; } return isReturn.intValue(); diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java index eb8b13c..2ccf61d 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java @@ -46,12 +46,20 @@ public class BsSuitCaseREST extends BaseBean { @AnnoOutputColumn(refClass = CommonEnumUtil.HTTP_METHOD_TYPE.class) private Integer requestMethodId; + public String getRequestMethodIdTxt(){ + return requestMethodId == null ? "无" : CommonEnumUtil.HTTP_METHOD_TYPE.valueOfDescription(requestMethodId); + } + //CommonEnumUtil.TRUE_OR_FALSE @Column(name = "IS_REQUEST_BODY") @ApiParam(value = "是否使用requestBody") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) private Integer isRequestBody; + public int getIsRequestBodyVal() { + return isRequestBody == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isRequestBody; + } + @Transient @ApiParam(value = "请求头转换") private List requestHeaderList; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index 6a46fc7..469b391 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -120,6 +120,11 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "适配信息 longDataId") private String suitMessage; + // 移动至记录数据表 + @Column(name = "SUIT_SEND_MESSAGE") + @ApiParam(value = "适配发送报文") + private String suitSendMessage; + @Column(name = "PROCESS_STATE") @ApiParam(value = "处理状态") private Integer processState; From 5a0fea01cad7e5f9ece3e4e852eeaa49b2b9f01b Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 4 Jun 2020 20:53:10 +0800 Subject: [PATCH 37/72] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index 7eba5df..a343b51 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -132,6 +132,14 @@ public class SwebPurchaseOrderDetails extends BaseBean { @ApiParam("是否为钢卷料") private Integer isSteel; + @Column(name = "PLAN_DATE") + @ApiParam("计划交货日期") + private String planDate; + + @Column(name = "PLAN_TIME") + @ApiParam("计划交货时间") + private String planTime; + /** * 不冗余主表数据 */ From f357293ca5d11f5a46ece645be37c736e448a7dc Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 5 Jun 2020 11:47:03 +0800 Subject: [PATCH 38/72] =?UTF-8?q?plc=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 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 d115557..fb7b204 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 @@ -5741,16 +5741,18 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PLC_DATA_TYPE { - - INT("int", "数字"), - STRING("string", "字符串"), - BOOLEAN("boolean", "布尔"); + STRING("10", "String", "字符串"), + BOOLEAN("20","Boolean", "布尔"), + WORD("30", "Word", "整形-Word"), + DWORD("40","Dword", "整形-DWord"); private String value; + private String code; private String description; - PLC_DATA_TYPE(String value, String description) { + PLC_DATA_TYPE(String value, String code,String description) { this.value = value; + this.code = code; this.description = description; } From 9f6ecf72a006451a60d36408a3931670d2e45e49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 5 Jun 2020 14:07:57 +0800 Subject: [PATCH 39/72] =?UTF-8?q?=E3=80=902002=20=E6=B3=B0=E5=9B=BD?= =?UTF-8?q?=E5=86=85=E9=A5=B0=E7=94=9F=E4=BA=A7=E4=BD=9C=E4=B8=9A-?= =?UTF-8?q?=E6=8C=89=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95=EF=BC=8C=E5=8D=95?= =?UTF-8?q?=E4=BB=B6=E7=94=9F=E4=BA=A7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 45 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 4 ++ .../i3plus/pojo/mes/bean/MesQueueOrderBom.java | 4 ++ .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 4 ++ .../pojo/mes/bean/MesQueueShippingDetail.java | 2 +- .../pojo/mes/model/SpQueueShippingModel.java | 2 +- .../i3plus/pojo/mes/model/StationRequestBean.java | 3 ++ .../i3plus/pojo/mes/model/StationResultBean.java | 3 ++ 8 files changed, 65 insertions(+), 2 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 d115557..967bb24 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 @@ -6194,4 +6194,49 @@ public class MesEnumUtil { return tmp; } } + + /** + * 选配类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OPTION_TYPE { + OPTION(10, "选配件"), + BOM_DISASSEMBLY(20, "BOM拆解"); + + private int value; + private String description; + + OPTION_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 26afb75..5dd373d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -116,4 +116,8 @@ public class MesQcOrder extends BaseBean implements Serializable { @Transient private String mesWorkNo; + @Transient + @ApiParam("产品条码") + private String productSn; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java index 9906cd4..5a00f18 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java @@ -57,4 +57,8 @@ public class MesQueueOrderBom extends BaseBean implements Serializable { @Column(name = "COLOR_CODE") @ApiParam("颜色代码") private String colorCode; + + @Column(name = "OPTION_TYPE") + @ApiParam("选配类型") + private Integer optionType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 1e9fc97..fa22aa7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -92,6 +92,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品颜色") private String produceColor; + @Column(name = "PRODUCE_COLOR_CODE") + @ApiParam("产品颜色代码") + private String produceColorCode; + @Column(name = "OPTION_CODE") @ApiParam("选项代码") private String optionCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java index ab58514..6f0005e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java @@ -77,5 +77,5 @@ public class MesQueueShippingDetail extends BaseBean implements Serializable { @Column(name = "PRODUCE_COLOR") @ApiParam("产品颜色") - private Double produceColor; + private String produceColor; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SpQueueShippingModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SpQueueShippingModel.java index 82c0ac6..88da5e1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SpQueueShippingModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SpQueueShippingModel.java @@ -29,6 +29,6 @@ public class SpQueueShippingModel { private String gradeCode; @ApiParam("产品颜色") - private Double produceColor; + private String produceColor; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 3a4d2ed..bb6d667 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -138,6 +138,9 @@ public class StationRequestBean implements Serializable { @ApiParam("工步弹框状态") private Boolean stepDialogStatus = false; + @ApiParam("特殊展示数据") + private Map specialDisplayMap = new HashMap<>(); + @Override public String toString() { return "StationRequestBean{" + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java index 7740053..46db502 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java @@ -55,4 +55,7 @@ public class StationResultBean implements Serializable { @ApiParam("定制页面名称") private String customPageName; + + @ApiParam("特殊展示数据") + private Object specialDisplayData; } From fd45d66968442c4222b17f24ba23144ed4fb13cc Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 5 Jun 2020 14:37:14 +0800 Subject: [PATCH 40/72] =?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 --- .../cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java index cfbb3d7..db9f5bc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java @@ -52,10 +52,10 @@ public class WmsReportTransDetailModel extends BaseBean { @ApiParam(value = "数量") private Double qty; - @ApiParam(value = "包规") + @ApiParam(value = "供应商批次") private String dateCode; - @ApiParam(value = "供应商批次") + @ApiParam(value = "包规") private Double snp; @ApiParam(value = "收货批次") From 3c53d8a2f278d59f41a2202b4b916146c344a53e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 5 Jun 2020 15:20:20 +0800 Subject: [PATCH 41/72] Finish Task #2064 Cost:24h --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 +- .../i3plus/pojo/mes/bean/MesBoardWorkCell.java | 91 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/model/BoardModel.java | 11 ++- .../mes/repository/MesBoardWorkCellRepository.java | 15 ++++ 4 files changed, 115 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardWorkCellRepository.java 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 967bb24..6243570 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 @@ -5091,7 +5091,8 @@ public class MesEnumUtil { public enum BOARD_TYPE { BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"), BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"), - BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"); + BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"), + BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"); private String code; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java new file mode 100644 index 0000000..59d5305 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.fasterxml.jackson.annotation.JsonProperty; +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; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description : MES_看板工位信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_BOARD_WORK_CELL") +@Api("MES_看板工位信息") +public class MesBoardWorkCell extends BaseBean implements Serializable { + private static final long serialVersionUID = 6251886604848913685L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "X_AXES") + @ApiParam("横坐标") + private Double xAxes = 0d; + + @Column(name = "Y_AXES") + @ApiParam("纵坐标") + private Double yAxes = 0d; + + @Column(name = "WORK_CELL_IP") + @ApiParam("工位IP") + private String workCellIp; + + @Transient + @ApiParam("看板工位状态") + private Boolean boardWorkCellStatus; + + @JsonProperty("xAxes") + public Double getxAxes() { + return xAxes; + } + + public void setxAxes(Double xAxes) { + this.xAxes = xAxes; + } + + @JsonProperty("yAxes") + public Double getyAxes() { + return yAxes; + } + + public void setyAxes(Double yAxes) { + this.yAxes = yAxes; + } + + public double getXAxes() { + return this.xAxes == null ? 0.0d : this.xAxes; + } + + public double getYAxes() { + return this.yAxes == null ? 0.0d : this.yAxes; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java index a115e99..8076ead 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java @@ -1,9 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model; -import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquDetail; -import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquStatus; -import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCapacity; -import cn.estsh.i3plus.pojo.mes.bean.MesOee; +import cn.estsh.i3plus.pojo.mes.bean.*; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -41,6 +38,9 @@ public class BoardModel { @ApiParam("看板图片路径") private String pictureUrl; + @ApiParam("当天停机时间(min)") + private String theDayShutDownTime; + @ApiParam("看板时段计划产量") private List boardShiftSectionCapacityList; @@ -52,4 +52,7 @@ public class BoardModel { @ApiParam("oee") private List oeeList; + + @ApiParam("工位状态监控明细") + private List boardWorkCellList; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardWorkCellRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardWorkCellRepository.java new file mode 100644 index 0000000..f403ceb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardWorkCellRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardWorkCell; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: adair.song + * @Date: 2020/06/04 13:23 + * @Modify: + */ +@Repository +public interface MesBoardWorkCellRepository extends BaseRepository { +} From 7f0b99297f8b8765ea3fbad132b2c9a0d9ea4c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 5 Jun 2020 18:17:25 +0800 Subject: [PATCH 42/72] Start Task #2019 Cost:16h Left:0h Finish Task #2019 Cost:16h --- .../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 3dbf05e..fd4a786 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 @@ -51,4 +51,7 @@ public class MesElectricDataModel implements Serializable { @ApiParam(value = "文件名称") private String ftpFileName; + + @ApiParam(value = "FTP文件") + private Object ftpFile; } \ No newline at end of file From 2133908ff541d49a6b8b7a43b6a726b7f8a1a4de Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 6 Jun 2020 09:54:51 +0800 Subject: [PATCH 43/72] Finish Task #2024 Cost:8h --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 028c43f..610d57b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -160,7 +160,7 @@ public class WmsDocMovementDetails extends BaseBean { @Column(name = "PRINT_GENERATE_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") - @ApiParam(value = "剩余打印数量") + @ApiParam(value = "已打印数量") private Double printGenerateQty; @Column(name = "SRC_AREA_NO") @@ -207,6 +207,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "客户零件号") private String custPartNo; + @Column(name = "SEQ_NO") + @ApiParam(value = "父位置号") + private String seqNo; + @Transient @ApiParam(value = "替代物料编码") private String subPartNo; @@ -296,6 +300,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("执行") private Integer isMakeUp; + @Transient + @ApiParam(value = "子位置号") + private String itemSeqNo; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } @@ -352,6 +360,7 @@ public class WmsDocMovementDetails extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String refSrc; + public WmsDocMovementDetails () { } From bcb70400eb8bed475a23593ce19ef8bcea2d9b9d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sun, 7 Jun 2020 10:35:06 +0800 Subject: [PATCH 44/72] Finish Task #2027 Cost:10h --- .../cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java | 24 ++++++ .../estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 5 +- .../pojo/wms/bean/WmsDocMovementDetails.java | 12 +++ .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 12 ++- .../estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 4 + .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 93 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 +- 7 files changed, 153 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java index 250b6a7..c9084f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java @@ -118,7 +118,31 @@ public class SapDocFgSum extends BaseBean { @Transient public Long wdfdId; + @Column(name = "BOM_VERSION") + @ApiParam(value = "BOM版本号") + private String bomVersion; + public SapDocFgSum(){} + + public SapDocFgSum(Long wdfdId, Double qty, String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo, + String itemPartNo, String itemPartName, String itemUnit, Double itemQty, String outAreaNo, String src, Integer isLock, String effStartTime, String bomVersion) { + this.wdfdId = wdfdId; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.unit = unit; + this.erpWorkCenter = erpWorkCenter; + this.inAreaNo = inAreaNo; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.itemUnit = itemUnit; + this.outAreaNo = outAreaNo; + this.itemQty = itemQty; + this.src = src; + this.isLock = isLock; + this.effStartTime = effStartTime; + this.bomVersion = bomVersion; + } public SapDocFgSum(Long wdfdId, Double qty,String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo, String itemPartNo, String itemPartName, String itemUnit, Double itemQty,String outAreaNo, String src, Integer isLock, String effStartTime) { this.wdfdId = wdfdId; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 44e8a69..08e50e1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -104,7 +104,6 @@ public class WmsDocFgDetail extends BaseBean { @Column(name="SID") @ApiParam("SID") public String sid; - /** * 状态:10=新建,20=已处理,30=处理出错 */ @@ -150,4 +149,8 @@ public class WmsDocFgDetail extends BaseBean { @Column(name = "BATCH_NO") @ApiParam("批号") private String batchNo; + + @Column(name = "BOM_VERSION") + @ApiParam(value = "BOM版本号") + private String bomVersion; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 610d57b..dc56c0d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -207,6 +207,18 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "客户零件号") private String custPartNo; + @Column(name = "MATERIAL_TYPE") + @ApiParam(value = "物料类型") + private String materialType; + + @Column(name = "PART_SPEC") + @ApiParam(value = "简称") + private String partSpec; + + @Column(name = "WORK_ORDER_CODE") + @ApiParam(value = "工单码") + private String workOrderCode; + @Column(name = "SEQ_NO") @ApiParam(value = "父位置号") private String seqNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 87ab093..108496e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -13,7 +13,12 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.persistence.Version; /** * @Description : 库存移动单明细信息 @@ -176,6 +181,11 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String groupNo; + @Column(name = "BOM_VERSION") + @ApiParam(value = "BOM版本号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String bomVersion; + @ApiParam(value = "待出库数量", example = "0") @Transient private Long waitingCounts; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 1f57cde..4cf215f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -199,6 +199,10 @@ public class WmsMoveToERP extends BaseBean { @ApiParam(value = "ERP单号") private String erpSrcNo; + @Column(name = "BOM_VERSION") + @ApiParam(value = "BOM版本号") + private String bomVersion; + @Column(name = "ERP_SRC_TYPE",columnDefinition = "varchar(50) default ''") @ApiParam(value = "QAD发运单据类型") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index ea17689..2203cc7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -458,6 +458,41 @@ public class WmsStockSn extends BaseBean { @ApiParam("挑选状态") public Integer pickResult; + @Transient + @ApiParam("位置号") + public String positionNo; + + + @Transient + @ApiParam(value = "材料类型") + private String melType; + + @Transient + @ApiParam(value = "项目号") + private String projectNo; + + @Transient + @ApiParam(value = "生产小组") + private String productionGroup; + + @Transient + @ApiParam(value = "客户零件号") + private String custPartNo; + + @Transient + @ApiParam(value = "物料类型") + private String materialType; + + @Transient + @ApiParam(value = "工单码") + private String workOrderCode; + + @Transient + @ApiParam(value = "ERP单号") + private String erpSrcNo; + + + public WmsStockSn() { } @@ -694,5 +729,63 @@ public class WmsStockSn extends BaseBean { } + public WmsStockSn(String organizeCode, Long id, String sn, String partNo, String partNameRdd, String unit, Integer snStatus, + Integer qcStatus, Double qty, String locateNo, String zoneNo, String whNo, String lotNo, + String dateCode, String leftCode, String fixLotNo, String vendorNo, String vendorNameRdd, + String qualityDate, String custNo, String custSn, String sn2d, + String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser, + String positionNo, Date pdate, Integer printed, String refSrc, String refType, + String shippingFlag, String workCenterCode, Integer snType, + String packagePartNo, Integer useCount, Integer seqNo, + String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc, + String prodCfgTypeName, String custNameRdd) { + this.organizeCode = organizeCode; + this.id = id; + this.sn = sn; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.snStatus = snStatus; + this.qcStatus = qcStatus; + this.qty = qty; + this.locateNo = locateNo; + this.zoneNo = zoneNo; + this.whNo = whNo; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.leftCode = leftCode; + this.fixLotNo = fixLotNo; + this.vendorNo = vendorNo; + this.vendorNameRdd = vendorNameRdd; + this.qualityDate = qualityDate; + this.custNo = custNo; + this.custSn = custSn; + this.sn2d = sn2d; + this.packageNo = packageNo; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + this.positionNo = positionNo; + this.pdate = pdate; + this.printed = printed; + this.refSrc = refSrc; + this.refType = refType; + this.shippingFlag = shippingFlag; + this.workCenterCode = workCenterCode; + this.snType = snType; + this.packagePartNo = packagePartNo; + this.useCount = useCount; + this.seqNo = seqNo; + + this.whNameRdd = whNameRdd; + this.locateNameRdd = locateNameRdd; + this.zoneNameRdd = zoneNameRdd; + this.partTypeDesc = partTypeDesc; + this.prodCfgTypeName = prodCfgTypeName; + this.custNameRdd = custNameRdd; + this.vendorNameRdd = vendorNameRdd; + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 6d8b3d7..6c69ad7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -56,7 +56,11 @@ public class WmsHqlPack { DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true); } // 封装有效状态、删除状态、创建人和创建时间 - DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + if (StringUtil.isEmpty(bean.getIsValid())) { + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", hqlStr); + } else { + DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + } DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); return hqlStr; From 1ce748eecb606447138b18bdf0c3fee6f4696370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sun, 7 Jun 2020 15:15:58 +0800 Subject: [PATCH 45/72] Fix Bug #8771 --- .../pojo/mes/model/ProductInfoManageModel.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java index e9d38ab..6041e75 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java @@ -54,4 +54,38 @@ public class ProductInfoManageModel { @ApiParam("切换时间") private String switchTime; + + @ApiParam("工厂") + private String organizeCode; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("队列类型") + private Integer queueType; + + @ApiParam("工单类型") + private String workType; + + @ApiParam("待生产序列") + private Integer prodNum; + + @ApiParam("主队列序列") + private Double queueSeq; + + @ApiParam("明细队列序列") + private Double queDetailSeq; + + public ProductInfoManageModel() { + } + + public ProductInfoManageModel(String vinCode, String prodCfgTypeCode, String gradeCode, String produceColor) { + this.vinCode = vinCode; + this.prodCfgTypeCode = prodCfgTypeCode; + this.gradeCode = gradeCode; + this.produceColor = produceColor; + } } From 47a318f2385f8b8a403a52eb7c87f4ff3b9fcc9a Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sun, 7 Jun 2020 15:32:46 +0800 Subject: [PATCH 46/72] =?UTF-8?q?=E5=96=9C=E5=BE=B7BUG=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java index c9084f6..c13b717 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java @@ -122,10 +122,14 @@ public class SapDocFgSum extends BaseBean { @ApiParam(value = "BOM版本号") private String bomVersion; + @Column(name = "FG_ORDER_NO") + @ApiParam(value = "产品报工orderNo") + private String fGOrderNo; + public SapDocFgSum(){} public SapDocFgSum(Long wdfdId, Double qty, String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo, - String itemPartNo, String itemPartName, String itemUnit, Double itemQty, String outAreaNo, String src, Integer isLock, String effStartTime, String bomVersion) { + String itemPartNo, String itemPartName, String itemUnit, Double itemQty, String outAreaNo, String src, Integer isLock, String effStartTime, String bomVersion, String fGOrderNo) { this.wdfdId = wdfdId; this.partNo = partNo; this.partNameRdd = partNameRdd; @@ -142,6 +146,7 @@ public class SapDocFgSum extends BaseBean { this.isLock = isLock; this.effStartTime = effStartTime; this.bomVersion = bomVersion; + this.fGOrderNo = fGOrderNo; } public SapDocFgSum(Long wdfdId, Double qty,String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo, String itemPartNo, String itemPartName, String itemUnit, Double itemQty,String outAreaNo, String src, Integer isLock, String effStartTime) { From 86363b20123640834a230c05dcce2e309f9b595e Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sun, 7 Jun 2020 17:13:40 +0800 Subject: [PATCH 47/72] Finish Task #2098 Cost:8h --- .../cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java | 39 ++++++++++++++++++++++ .../pojo/mes/repository/MesSubPartRepository.java | 14 ++++++++ .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 20 ++++++----- 3 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSubPartRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java new file mode 100644 index 0000000..e0a1558 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/6/7 15:20 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SUB_PART") +@Api("数据同步死信") +public class MesSubPart extends BaseBean implements Serializable { + private static final long serialVersionUID = 4636507477301700549L; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "SUB_PART_NO") + @ApiParam("替代料") + private String subPartNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSubPartRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSubPartRepository.java new file mode 100644 index 0000000..5a4ca58 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSubPartRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesSubPart; +import org.springframework.stereotype.Repository; + +/** + * @author Wynne.Lu + * @date 2020/6/7 15:23 + * @desc + */ +@Repository +public interface MesSubPartRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 6c67531..b777cee 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -88,7 +88,7 @@ public class MesPcnHqlPack { * @param mesLabelTemplate * @return */ - public static DdlPackBean getLabelTemplate( MesLabelTemplate mesLabelTemplate) { + public static DdlPackBean getLabelTemplate(MesLabelTemplate mesLabelTemplate) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean); return packBean; @@ -113,20 +113,20 @@ public class MesPcnHqlPack { * 获取原材料扫描信息的对应工序BOM * * @param stationBom - * @param rawPartSn + * @param rawPartNo * @return */ - public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) { + public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, String rawPartNo) { DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean); DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean); DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean); - DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean); + DdlPreparedPack.getStringEqualPack(rawPartNo, "itemPartNo", packBean); return packBean; } - public static DdlPackBean getStationBom(String org,String workCenter,String workCell,String partNo) { + public static DdlPackBean getStationBom(String org, String workCenter, String workCell, String partNo) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(workCenter, "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(workCell, "workCellCode", packBean); @@ -180,7 +180,7 @@ public class MesPcnHqlPack { } // 工单管理，查询下达，启动，暂停状态 - if (!CollectionUtils.isEmpty(mesWorkOrder.getStatusList())){ + if (!CollectionUtils.isEmpty(mesWorkOrder.getStatusList())) { DdlPreparedPack.getInPackList(mesWorkOrder.getStatusList(), "workOrderStatus", packBean); } @@ -316,6 +316,7 @@ public class MesPcnHqlPack { /** * 按条件分页查询产品条码补打印数据 + * * @param mesProduceSn * @return */ @@ -355,6 +356,7 @@ public class MesPcnHqlPack { /** * 按条件分页查询包装条码补打印数据 + * * @param mesPackage * @return */ @@ -417,9 +419,9 @@ public class MesPcnHqlPack { } - /** * 按条件分页查询类型信息数据 + * * @param typeCfg * @return */ @@ -451,8 +453,8 @@ public class MesPcnHqlPack { DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getCheckType(), "checkType", packBean); DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getCheckItemType(), "checkItemType", packBean); - if(mesQcOrderDetail.getCheckType() == MesPcnEnumUtil.MES_QC_CHECK_TYPE.FIRST_CHECK.getValue()){ - DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getFinishQty()+1, "itemNo", packBean); + if (mesQcOrderDetail.getCheckType() == MesPcnEnumUtil.MES_QC_CHECK_TYPE.FIRST_CHECK.getValue()) { + DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getFinishQty() + 1, "itemNo", packBean); } return packBean; } From 5c40073169ac077fe21483540b6f386d4d48ccea Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 8 Jun 2020 12:24:51 +0800 Subject: [PATCH 48/72] =?UTF-8?q?=E5=96=9C=E5=BE=B7BUG=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 4 ---- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 17 ++++++++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 4cf215f..1f57cde 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -199,10 +199,6 @@ public class WmsMoveToERP extends BaseBean { @ApiParam(value = "ERP单号") private String erpSrcNo; - @Column(name = "BOM_VERSION") - @ApiParam(value = "BOM版本号") - private String bomVersion; - @Column(name = "ERP_SRC_TYPE",columnDefinition = "varchar(50) default ''") @ApiParam(value = "QAD发运单据类型") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 2203cc7..3b790fb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -459,9 +459,13 @@ public class WmsStockSn extends BaseBean { public Integer pickResult; @Transient - @ApiParam("位置号") + @ApiParam("位置号-打印用") public String positionNo; + @Transient + @ApiParam("父位置号") + public String parentPositionNo; + @Transient @ApiParam(value = "材料类型") @@ -491,7 +495,9 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "ERP单号") private String erpSrcNo; - + @Transient + @ApiParam(value = "检测结果ID") + private Long summaryId; public WmsStockSn() { } @@ -713,7 +719,7 @@ public class WmsStockSn extends BaseBean { } public WmsStockSn(String organizeCode, String batchNo, Integer bhType, String locateNo, String partNo, - String partNameRdd, String workCenterCode, String createUser, String createDatetime, + String partNameRdd, Long summaryId, String workCenterCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.organizeCode = organizeCode; this.batchNo = batchNo; @@ -721,6 +727,7 @@ public class WmsStockSn extends BaseBean { this.locateNo = locateNo; this.partNo = partNo; this.partNameRdd = partNameRdd; + this.summaryId = summaryId; this.workCenterCode = workCenterCode; this.createUser = createUser; this.createDatetime = createDatetime; @@ -734,7 +741,7 @@ public class WmsStockSn extends BaseBean { String dateCode, String leftCode, String fixLotNo, String vendorNo, String vendorNameRdd, String qualityDate, String custNo, String custSn, String sn2d, String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser, - String positionNo, Date pdate, Integer printed, String refSrc, String refType, + String parentPositionNo, Date pdate, Integer printed, String refSrc, String refType, String shippingFlag, String workCenterCode, Integer snType, String packagePartNo, Integer useCount, Integer seqNo, String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc, @@ -766,7 +773,7 @@ public class WmsStockSn extends BaseBean { this.createUser = createUser; this.modifyDatetime = modifyDatetime; this.modifyUser = modifyUser; - this.positionNo = positionNo; + this.parentPositionNo = parentPositionNo; this.pdate = pdate; this.printed = printed; this.refSrc = refSrc; From 08c52dc09f737411ac475a2dce83fd2dd7fbfef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 8 Jun 2020 13:31:07 +0800 Subject: [PATCH 49/72] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E4=BC=98=E5=8C=96=E6=89=A9=E5=B1=95=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0go-fastdfs=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/bean/DdlPackBean.java | 6 +- .../cn/estsh/i3plus/pojo/base/bean/ImppFile.java | 66 ++++++++++++++++++++++ 2 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/ImppFile.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index 8654728..fdd275f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -76,9 +76,9 @@ public class DdlPackBean { public static DdlPackBean getDdlPackBean(String organizeCode, int isValid){ DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); - DdlPreparedPack.getNumEqualPack(isValid,"isValid",result); - DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlPreparedPack.getNumEqualPack(isValid, "isValid", result); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", result); return result; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/ImppFile.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/ImppFile.java new file mode 100644 index 0000000..afb605a --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/ImppFile.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.base.bean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : 文件基础信息 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-06-01 20:33 + * @Modify: + **/ +@Data +@ApiModel("文件基础信息") +public class ImppFile { + + /******* 文件基础信息 ******/ + + @ApiModelProperty("文件名称") + private String name; //文件名 + + @ApiModelProperty("文件内容") + private byte[] content; //内容 + + @ApiModelProperty("文件后缀名称") + private String ext; //文件类型 + + public void setExt(String ext) { + if(ext.indexOf(".") != 0){ + ext ="."+ext; + } + this.ext = ext; + } + + @ApiModelProperty("文件md5") + private String md5; + + @ApiModelProperty("文件创建时间") + private String createDateTime; + + @ApiModelProperty("文件作者") + private String author; //作者 + + /******* 文件系统唯一信息 ******/ + + @ApiModelProperty("文件系统-组名称") + private String dfsGroupName; + + @ApiModelProperty("文件系统-名称") + private String dfsFileName; + + @ApiModelProperty("文件系统-唯一键") + private String dfsFileKey; + + /******* 构造方法 ******/ + + public ImppFile() { + } + + public ImppFile(String name, byte[] content, String ext) { + this.name = name; + this.content = content; + this.setExt(ext); + } +} From 79429024cf93b38d8576f8e95383daf79fc2e894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 8 Jun 2020 13:36:02 +0800 Subject: [PATCH 50/72] =?UTF-8?q?MDM=E5=9F=BA=E7=A1=80=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 1 + .../i3plus/pojo/base/enumutil/MdmEnumUtil.java | 165 ++++ .../i3plus/pojo/mdm/bean/base/BaseMdmBean.java | 56 +- .../pojo/mdm/bean/base/BaseMdmBusiExtdBean.java | 49 ++ .../pojo/mdm/bean/base/BaseMdmBusiModelBean.java | 64 ++ .../i3plus/pojo/mdm/bean/base/BaseMdmExtdBean.java | 30 - .../pojo/mdm/bean/base/DdlPackMdmModelBean.java | 271 +++++++ .../i3plus/pojo/mdm/bean/base/MdmSyncData.java | 74 ++ .../mdm/bean/busi/core/MdmGearCoreBusiExtd.java | 51 ++ .../pojo/mdm/bean/busi/core/MdmGearCoreExtd.java | 31 - .../estsh/i3plus/pojo/mdm/bean/master/MdmGear.java | 14 + .../pojo/mdm/bean/model/core/MdmGearCoreModel.java | 19 - .../pojo/mdm/jpa/dao/MdmBusiModelRepository.java | 112 +++ .../jpa/daoimpl/MdmBusiModelRepositoryImpl.java | 840 +++++++++++++++++++++ .../i3plus/pojo/mdm/model/MdmPagerQueryModel.java | 27 + .../pojo/mdm/model/core/MdmGearCoreBusiModel.java | 22 + .../core/MdmGearCoreRepository.java | 21 + .../i3plus/pojo/mdm/repository/MdmHqlPack.java | 51 ++ .../busi/core/MdmGearCoreBusiModelRepository.java | 16 + .../mdm/repository/master/MdmGearRepository.java | 16 + .../pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java | 699 +++++++++++++++++ 21 files changed, 2544 insertions(+), 85 deletions(-) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java delete mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmExtdBean.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/DdlPackMdmModelBean.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java delete mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreExtd.java delete mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/model/core/MdmGearCoreModel.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/dao/MdmBusiModelRepository.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/daoimpl/MdmBusiModelRepositoryImpl.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/MdmPagerQueryModel.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/core/MdmGearCoreBusiModel.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/modelrepository/core/MdmGearCoreRepository.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/core/MdmGearCoreBusiModelRepository.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmGearRepository.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 62b5ceb..a43cc1f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -59,6 +59,7 @@ public class CommonEnumUtil { /** 平台服务 */ CORE(2, 8100, 4, 101000000L, "i3core", "i3业务平台"), + MDM(29, 8150, 22, 0, "i3mdm", "数据中心MDM"), /** 调试服务 */ DEV(9999, 0000, 0, 120000000L, "Development", "系统调试"); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java new file mode 100644 index 0000000..e8c5618 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java @@ -0,0 +1,165 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * @Description : Model Pojo 枚举 + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2018-11-21 15:50 + * @Modify: + **/ +public class MdmEnumUtil { + + /** + * 操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MDM_OPERATE_TYPE { + INSERT(1, "新增"), + UPDATE(2, "修改"); + + private int value; + private String description; + + private MDM_OPERATE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static MdmEnumUtil.MDM_OPERATE_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } + + /** + * hql实体类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum HQL_ENTITY_TYPE { + MASTER(1, "master", "主数据"), + BUSI(2, "busi", "业务数据"); + + private int value; + private String alias; + private String description; + + private HQL_ENTITY_TYPE(int value, String alias, String description) { + this.value = value; + this.alias = alias; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getAlias() { + return alias; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfAlias(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].alias; + } + } + return tmp; + } + + public static MdmEnumUtil.HQL_ENTITY_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } + + /** + * mdm + */ + public enum MDM_SYNC_TYPE{ + INSERT(1, "新增"), + UPDATE(2, "修改"), + DELETE(2, "删除"); + + private int value; + private String description; + + private MDM_SYNC_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static MdmEnumUtil.MDM_SYNC_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java index f220dc7..859a6b3 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java @@ -3,10 +3,15 @@ package cn.estsh.i3plus.pojo.mdm.bean.base; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.persistence.Column; +import javax.persistence.MappedSuperclass; import javax.persistence.Transient; /** @@ -17,30 +22,71 @@ import javax.persistence.Transient; * @Modify: **/ @Data +@MappedSuperclass @ApiModel("MDM基础bean") -public class BaseMdmBean extends BaseBean { +public abstract class BaseMdmBean extends BaseBean { private static final long serialVersionUID = 3957595289035947441L; @Transient @ApiModelProperty("是否主数据") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) - public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); + public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); + @Column(name = "MDM_VERSION") @ApiModelProperty("mdm数据版本") + @JsonSerialize(using = ToStringSerializer.class) private Long mdmVersion; - public long getMdmVersion() { + public long getMdmVersionVal() { return mdmVersion == null ? 0 : mdmVersion; } // 版本递增 public long nextMdmVersion() { - return mdmVersion = getMdmVersion() + 1; + mdmVersion = getMdmVersionVal() + 1; + return mdmVersion; } + @Column(name = "IS_MDM_PUBLISHED") @ApiModelProperty("是否发布") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) - private Integer isPublished; + private Integer isMdmPublished; + @Column(name = "MDM_OPERATE_TYPE") + @ApiModelProperty("操作类型") + @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class) + private Integer mdmOperateType; + + public Integer getMdmOperateTypeVal() { + return mdmOperateType == null ? MdmEnumUtil.MDM_OPERATE_TYPE.INSERT.getValue() : mdmOperateType; + } + + @Column(name = "MDM_REF_ID") + @ApiModelProperty("关联id") + @JsonSerialize(using = ToStringSerializer.class) + private Long mdmRefId; + + //排序方式 + @Override + public String orderBy() { + String result = ""; + if (orderByParam != null && orderByParam.trim().length() > 0) { + result = " order by "; + if (CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == isMdmMaster) { + result += "master."; + } else { + result += "busi."; + } + + result += orderByParam; + + if (ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + result += " asc"; + } else { + result += " desc"; + } + } + return result; + } } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java new file mode 100644 index 0000000..96d8c16 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mdm.bean.base; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.MappedSuperclass; +import javax.persistence.Transient; + +/** + * @Description : MDM业务基础bean + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-12 17:30 + * @Modify: + **/ +@Data +@MappedSuperclass +@ApiModel("MDM业务基础bean") +public class BaseMdmBusiExtdBean extends BaseMdmBean { + + private static final long serialVersionUID = 4267453020130810967L; + + @Transient + @ApiModelProperty("是否主数据") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @Transient + @ApiModelProperty("主数据Class") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + public static Class mdmMasterClass = BaseMdmBean.class; + + @Transient + @ApiModelProperty("软件模块") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + public static Integer mdmSoftType; + + @Column(name = "MDM_MASTER_ID") + @ApiModelProperty("主数据id") + @JsonSerialize(using = ToStringSerializer.class) + private Long mdmMasterId; + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java new file mode 100644 index 0000000..3aafc4b --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mdm.bean.base; + +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description :MDM模型bean + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-18 20:52 + * @Modify: + **/ +public abstract class BaseMdmBusiModelBean { + + @ApiModelProperty("主数据") + private M mdmMasterBean; + + @ApiModelProperty("业务扩展") + private B mdmBusiBean; + + public BaseMdmBusiModelBean() { + } + + public BaseMdmBusiModelBean(M mdmMasterBean, B mdmBusiBean) { + this.mdmMasterBean = mdmMasterBean; + this.mdmBusiBean = mdmBusiBean; + } + + /** + * 获取主数据m + * + * @return + */ + public M getMaster() { + return mdmMasterBean; + } + + /** + * 获取业务扩展数据 + * + * @return + */ + public B getBusi() { + return mdmBusiBean; + } + + /** + * 设置主数据m + * + * @return + */ + public void setMaster(M baseMdmBean) { + this.mdmMasterBean = baseMdmBean; + } + + /** + * 设置业务扩展数据 + * + * @return + */ + public void setBusi(B baseMdmBusiExtdBean) { + this.mdmBusiBean = baseMdmBusiExtdBean; + } + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmExtdBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmExtdBean.java deleted file mode 100644 index 957a91e..0000000 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmExtdBean.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.estsh.i3plus.pojo.mdm.bean.base; - -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.persistence.Transient; - -/** - * @Description : MDM业务基础bean - * @Reference : - * @Author : yunhao - * @CreateDate : 2020-05-12 17:30 - * @Modify: - **/ -@Data -@ApiModel("MDM业务基础bean") -public class BaseMdmExtdBean extends BaseMdmBean { - - private static final long serialVersionUID = 4267453020130810967L; - - @Transient - @ApiModelProperty("软件模块") - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) - public static Integer mdmSoftType; - - -} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/DdlPackMdmModelBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/DdlPackMdmModelBean.java new file mode 100644 index 0000000..22475d9 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/DdlPackMdmModelBean.java @@ -0,0 +1,271 @@ +package cn.estsh.i3plus.pojo.mdm.bean.base; + + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import cn.estsh.i3plus.pojo.mdm.sqlpack.DdlMdmModelPreparedPack; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description : hql脚本封装类 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2019-03-29 15:57 + * @Modify: + **/ +public class DdlPackMdmModelBean { + + /** + * 条件实体 + */ + List entityTypeList; + + /** + * 条件属性名称 + */ + List keyList; + + /** + * 条件值 + */ + List valueList; + + //是否是hql + private boolean isHql; + + //手动hql，尽量避免直接传参，使用？代替 + private String hqlAppend; + + //where后跟着的hql/sql + private StringBuilder whereAppend; + + //排序内容 + private String orderByStr; + + //需要拼接的hql + private StringBuilder sb = null; + + public DdlPackMdmModelBean() { + this.isHql = true; + whereAppend = new StringBuilder(); + entityTypeList = new ArrayList<>(); + keyList = new ArrayList<>(); + valueList = new ArrayList<>(); + } + + public DdlPackMdmModelBean(boolean isHql) { + this.isHql = isHql; + whereAppend = new StringBuilder(); + entityTypeList = new ArrayList<>(); + keyList = new ArrayList<>(); + valueList = new ArrayList<>(); + } + + /** + * 查询制定组织有效的数据 + * + * @param organizeCode + * @return + */ + public static DdlPackMdmModelBean getDdlPackBean(String organizeCode) { + DdlPackMdmModelBean result = new DdlPackMdmModelBean(); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + DdlMdmModelPreparedPack.getStringEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, organizeCode, "organizeCode", result); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + DdlMdmModelPreparedPack.getStringEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, organizeCode, "organizeCode", result); + + return result; + } + + /** + * 查询指定组织、指定是否有效的数据 + * + * @param organizeCode + * @param isValid + * @return + */ + public static DdlPackMdmModelBean getDdlPackBean(String organizeCode, int isValid) { + DdlPackMdmModelBean result = new DdlPackMdmModelBean(); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, isValid, "isValid", result); + DdlMdmModelPreparedPack.getStringEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, organizeCode, "organizeCode", result); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, isValid, "isValid", result); + DdlMdmModelPreparedPack.getStringEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, organizeCode, "organizeCode", result); + + return result; + } + + public static DdlPackMdmModelBean getDdlPackBean() { + DdlPackMdmModelBean result = new DdlPackMdmModelBean(); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + + return result; + } + + public static DdlPackMdmModelBean getDdlPackBean(BaseMdmBusiModelBean bean) { + DdlPackMdmModelBean result = new DdlPackMdmModelBean(); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + + if (bean != null) { + if (bean.getBusi() != null) { + result.setOrderByStr(bean.getBusi().orderBy()); + } else if (bean.getMaster() != null) { + result.setOrderByStr(bean.getMaster().orderBy()); + } + } + + return result; + } + + public boolean isHql() { + return isHql; + } + + public void setHql(boolean hql) { + isHql = hql; + } + + public String getOrderByStr() { + return orderByStr; + } + + public void setOrderByStr(String orderByStr) { + this.orderByStr = orderByStr; + } + + public String getHqlAppend() { + return hqlAppend; + } + + public void setHqlAppend(String hqlAppend) { + this.hqlAppend = hqlAppend; + } + + public String getWhereAppend() { + return whereAppend.toString(); + } + + public void setWhereAppend(String whereAppend) { + this.whereAppend = new StringBuilder(whereAppend); + } + + public List getEntityTypeList() { + return entityTypeList; + } + + public void setEntityTypeList(List entityTypeList) { + this.entityTypeList = entityTypeList; + } + + public List getKeyList() { + return keyList; + } + + public void setKeyList(List keyList) { + this.keyList = keyList; + } + + public List getValueList() { + return valueList; + } + + public void setValueList(List valueList) { + this.valueList = valueList; + } + + /** + * 添加查询条件 + * + * @param hql + * @param val + */ + public void addColumnQuery(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String column, String hql, Object val) { + if (entityTypeList == null) { + entityTypeList = new ArrayList<>(); + } + if (keyList == null) { + keyList = new ArrayList<>(); + } + if (valueList == null) { + valueList = new ArrayList<>(); + } + if (entityType != null && column != null && val != null) { + entityTypeList.add(entityType); + keyList.add(column); + valueList.add(val); + } + + whereAppend.append(hql); + } + + /** + * 需要查询属性的数量 + * + * @return + */ + public int getColumnSize() { + return keyList.size(); + } + + /** + * 获取包含hql的最终的ddl + * + * @return + */ + public String getPackedHqlAll() { + sb = new StringBuilder(); + if (hqlAppend != null) { + sb.append(hqlAppend); + } + if (whereAppend != null) { + sb.append(whereAppend); + } + if (orderByStr != null) { + sb.append(orderByStr); + } + return sb.toString(); + } + + /** + * 获取最终的ddl + * + * @return + */ + public String getPackedHql() { + sb = new StringBuilder(); + if (whereAppend != null) { + sb.append(whereAppend); + } + if (orderByStr != null) { + sb.append(orderByStr); + } + return sb.toString(); + } +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java new file mode 100644 index 0000000..95fd969 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java @@ -0,0 +1,74 @@ +package cn.estsh.i3plus.pojo.mdm.bean.base; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 数据中心同步数据 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-06-02 16:14 + * @Modify: + **/ +@Data +@ApiModel("数据中心同步数据") +public class MdmSyncData implements Serializable { + + private static final long serialVersionUID = -1642626000860074060L; + + @ApiModelProperty("同步数据类型") + @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_SYNC_TYPE.class) + private Integer syncType; + + public int getSyncTypeVal(){ + return syncType == null ? MdmEnumUtil.MDM_SYNC_TYPE.INSERT.getValue() : syncType; + } + + @ApiModelProperty("同步模块") + @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class) + private Integer syncSoftType; + + @ApiModelProperty("是否是主数据") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + private Integer isMasterData; + + public int getIsMasterDataVal() { + return isMasterData == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isMasterData; + } + + @ApiModelProperty("同步数据class") + private String syncDataClass; + + public String getSyncDataClassSimpleName(){ + if(syncDataClass == null){ + return null; + } + + return syncDataClass.trim().substring(syncDataClass.trim().lastIndexOf(".") + 1); + } + + @ApiModelProperty("同步数据id") + private List syncDataId; + + @ApiModelProperty("同步数据用户名") + private String syncDateUserName; + + @ApiModelProperty("同步时间") + private String syncDateTime; + + @ApiModelProperty("同步失败键") + private String syncFailKey; + + @ApiModelProperty("同步失败时间") + private String syncFailDateTime; + + @ApiModelProperty("同步失败信息") + private String syncFailMessage; +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java new file mode 100644 index 0000000..4e3f336 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.mdm.bean.busi.core; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiExtdBean; +import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : 主数据齿轮-平台扩展 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-12 18:09 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MDM_GEAR_CORE_EXTD") +@ApiModel("主数据齿轮-平台扩展") +public class MdmGearCoreBusiExtd extends BaseMdmBusiExtdBean { + + private static final long serialVersionUID = -3535174942277452194L; + + @Transient + @ApiModelProperty("主数据Class") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + public static Class mdmMasterClass = MdmGear.class; + + @Transient + @ApiModelProperty("软件模块") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + public static Integer mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue(); + + @Column(name = "CORE_NUM") + @ApiModelProperty("核心数量") + public String coreNum; + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreExtd.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreExtd.java deleted file mode 100644 index bbe8b58..0000000 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreExtd.java +++ /dev/null @@ -1,31 +0,0 @@ -package cn.estsh.i3plus.pojo.mdm.bean.busi.core; - -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmExtdBean; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Description : 主数据齿轮-平台扩展 - * @Reference : - * @Author : yunhao - * @CreateDate : 2020-05-12 18:09 - * @Modify: - **/ -@Data -@ApiModel("主数据齿轮-平台扩展") -public class MdmGearCoreExtd extends BaseMdmExtdBean { - - private static final long serialVersionUID = -3535174942277452194L; - - // 初始化数据 - static { - isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); - mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue(); - } - - @ApiModelProperty("核心数量") - public String coreNum; - -} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java index e20fec9..18dbcb1 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java @@ -4,6 +4,13 @@ import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; /** * @Description : 主数据齿轮 @@ -13,14 +20,21 @@ import lombok.Data; * @Modify: **/ @Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MDM_GEAR") @ApiModel("主数据齿轮") public class MdmGear extends BaseMdmBean { private static final long serialVersionUID = -7580444601811207793L; + @Column(name="NAME") @ApiModelProperty("齿轮名称") private String name; + @Column(name="GEAR_MODEL") @ApiModelProperty("齿轮规格") private String gearModel; diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/model/core/MdmGearCoreModel.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/model/core/MdmGearCoreModel.java deleted file mode 100644 index 46fd862..0000000 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/model/core/MdmGearCoreModel.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.estsh.i3plus.pojo.mdm.bean.model.core; - -import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreExtd; -import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; - -/** - * @Description : 主数据齿轮-平台model - * @Reference : - * @Author : yunhao - * @CreateDate : 2020-05-12 18:09 - * @Modify: - **/ -public class MdmGearCoreModel { - - private MdmGear mdmGear; - - private MdmGearCoreExtd mdmGearCoreExtd; - -} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/dao/MdmBusiModelRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/dao/MdmBusiModelRepository.java new file mode 100644 index 0000000..015bd8b --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/dao/MdmBusiModelRepository.java @@ -0,0 +1,112 @@ +package cn.estsh.i3plus.pojo.mdm.jpa.dao; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiExtdBean; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiModelBean; +import cn.estsh.i3plus.pojo.mdm.bean.base.DdlPackMdmModelBean; + +import java.util.List; + +/** + * @Description : 自定义Repository的方法接口 + * @Reference : 对jpaRepository进行扩展 + * @Author : alwaysfrin + * @CreateDate : 2018-09-13 10:34 + * @Modify: + **/ +public interface MdmBusiModelRepository, M extends BaseMdmBean, B extends BaseMdmBusiExtdBean> { + T getById(long id); + + List list(); + + List list(final String hql); + + List listPager(Pager pager); + + List findByPage(final DdlPackMdmModelBean packBean, final int offset, final int pageSize); + + /** + * @param hql hql入参需要用问号代替 + * @param values 按照入参问号的顺序进行赋值 + * @param offset + * @param pageSize + * @return + */ + List findByPage(final String hql, final Object[] values, final int offset, final int pageSize); + + List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value); + + List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values); + + List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value, String orderByStuff); + + List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff); + + T getByProperty(DdlPackMdmModelBean packBean); + + T getByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value); + + T getByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values); + + int listCount(); + + int findByPropertyCount(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value); + + int findByPropertyCount(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values); + + List findByPropertyPage(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value, String orderByStuff, Pager pager); + + List findByPropertyPage(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff, Pager pager); + + List findByHqlWhere(DdlPackMdmModelBean packBean); + + List findByHqlWhere(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff); + + int findByHqlWhereCount(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values); + + List findByHqlWherePage(String hqlWhere, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff); + + List findByHqlWherePage(DdlPackMdmModelBean packBean, Pager pager); + + int findByHqlWhereCount(DdlPackMdmModelBean packBean); + + int findByHqlCount(String hql); + + int findByHqlCount(String hql, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue); + + List findByHqlPage(DdlPackMdmModelBean packBean, Pager pager); + + List findByHqlPage(String hql, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue); + + double findByHqlDouble(DdlPackMdmModelBean packBean); + + long findByHqlLong(DdlPackMdmModelBean packBean); + + List findByHqlTopWhere(DdlPackMdmModelBean packBean, int topNum); + + /********************** 多表联查，返回Object[]数组根据hql查询翻页信息 开始 ****************************/ + List findByHqlObjects(String hql); + + List findByHqlObjects(String hql, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue); + + List findByHqlPageObjects(String hql, Pager pager); + + List findByHqlPageObjects(String hql, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue); + + List findBySqlObjList(String sql); + + List findBySqlObjListByPager(String sql, Pager pager); + + /****************** 部分业务处理 *******************/ + + boolean isExitByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value); + + boolean isExitByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values); + + boolean isExitByHqlWhere(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values); + + boolean isExitByHql(DdlPackMdmModelBean packBean); + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/daoimpl/MdmBusiModelRepositoryImpl.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/daoimpl/MdmBusiModelRepositoryImpl.java new file mode 100644 index 0000000..76a4cd5 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/daoimpl/MdmBusiModelRepositoryImpl.java @@ -0,0 +1,840 @@ +package cn.estsh.i3plus.pojo.mdm.jpa.daoimpl; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiExtdBean; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiModelBean; +import cn.estsh.i3plus.pojo.mdm.bean.base.DdlPackMdmModelBean; +import cn.estsh.i3plus.pojo.mdm.jpa.dao.MdmBusiModelRepository; +import org.hibernate.NonUniqueResultException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.persistence.EntityManager; +import javax.persistence.NoResultException; +import javax.persistence.Query; +import java.lang.reflect.ParameterizedType; +import java.text.MessageFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.List; + +/** + * @Description : 自定义持久化接口实现 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-21 15:05 + * @Modify: + **/ +public class MdmBusiModelRepositoryImpl, M extends BaseMdmBean, B extends BaseMdmBusiExtdBean> + implements MdmBusiModelRepository { + public static final Logger LOGGER = LoggerFactory.getLogger(MdmBusiModelRepositoryImpl.class); + + /** + * 持久化上下文 + */ + @Autowired + private EntityManager entityManager; + + private final Class modelClass; + private final Class masterClass; + private final Class busiExtdClass; + + private final String selectCount; + private final String selectAll; + private final String formStr; + + public MdmBusiModelRepositoryImpl() { + // 通过反射获取model的真实类型 + ParameterizedType pt = (ParameterizedType) this.getClass().getGenericSuperclass(); + modelClass = (Class) pt.getActualTypeArguments()[0]; + masterClass = (Class) pt.getActualTypeArguments()[1]; + busiExtdClass = (Class) pt.getActualTypeArguments()[2]; + + this.formStr = String.format("from %s as busi left join %s as master on busi.mdmMasterId = master.id ", + busiExtdClass.getName(), masterClass.getName() + ); + + this.selectCount = "select count(distinct busi) " + formStr; + this.selectAll = MessageFormat.format("select new {0}(master,busi) ", modelClass.getName()) + formStr; + } + + private void setParameter(Query query, String[] propName, Object[] propValue) { + String name = null; + Object value = null; + for (int i = 0; i < propName.length; i++) { + name = propName[i]; + value = propValue[i]; + if (value != null) { + if ((value instanceof Object[])) { + query.setParameter(name.replace(".", ""), (Object[]) value); + } else if ((value instanceof Collection)) { + query.setParameter(name.replace(".", ""), (Collection) value); + } else { + query.setParameter(name.replace(".", ""), value); + } + } + } + } + + private void appendQL(StringBuffer sb, String[] propName, Object[] propValue) { + String name = null; + Object value = null; + for (int i = 0; i < propName.length; i++) { + name = propName[i]; + value = propValue[i]; + if (((value instanceof Object[])) || ((value instanceof Collection))) { + Object[] arraySerializable = (Object[]) value; + if ((arraySerializable != null) && (arraySerializable.length > 0)) { + sb.append(" and model." + name + " in (:" + name.replace(".", "") + ")"); + } + } else if (value == null) { + sb.append(" and model." + name + " is null "); + } else { + sb.append(" and model." + name + "=:" + name.replace(".", "")); + } + } + } + + @Override + public T getById(long id) { + try { + List busiModelList = + entityManager.createQuery(selectAll + " where busi.id = :busi_id").setParameter("busi_id", id).getResultList(); + + return busiModelList.isEmpty() ? modelClass.newInstance() : busiModelList.get(0); + } catch (Exception e) { + return null; + } + } + + @Override + public List list() { + List l = entityManager.createQuery(selectAll).getResultList(); + return l; + } + + @Override + public List listPager(Pager pager) { + if (pager.getTotalRows() > 0) { + return entityManager.createQuery(selectAll) + .setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + } else { + return new ArrayList<>(); + } + } + + @Override + public List list(final String hql) { + return entityManager.createQuery(hql).getResultList(); + } + + @Override + public List findByPage(DdlPackMdmModelBean packBean, int offset, int pageSize) { + Query query = null; + String ddl = selectAll + " where 1=1 " + packBean.getPackedHql(); + + if (packBean.isHql()) { + query = entityManager.createQuery(ddl); + } else { + query = entityManager.createNativeQuery(ddl); + } + + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + + return query.setFirstResult(offset) + .setMaxResults(pageSize) + .getResultList(); + } + + @Override + public List findByPage(String hql, Object[] values, int offset, int pageSize) { + Query query = entityManager.createQuery(hql); + for (int i = 0; i < values.length; i++) { + query.setParameter(i, values[i]); + } + return query.setFirstResult(offset).setMaxResults(pageSize).getResultList(); + } + + @Override + public List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) { + String queryString = MessageFormat.format("{0} where {1}.{2}= :{3}_{4}", selectAll, entityType.getAlias(), propertyName, + entityType.getAlias(), propertyName); + return entityManager.createQuery(queryString).setParameter(entityType.getAlias() + "_" + propertyName, value).getResultList(); + } + + @Override + public List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) { + if (entityTypes.length != propertyNames.length || propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!entityTypes:" + entityTypes.length + " propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append(selectAll); + + int size = propertyNames.length; + if (size > 0) { + queryString.append("where 1=1 "); + } + + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + + Query queryObject = entityManager.createQuery(queryString.toString()); + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + } + + return queryObject.getResultList(); + } + + @Override + public List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value, String orderByStuff) { + String queryString = MessageFormat.format("{0} where {1}.{2}= :{3} {4}", selectAll, entityType.getAlias(), propertyName, propertyName, orderByStuff); + return entityManager.createQuery(queryString).setParameter(propertyName, value).getResultList(); + } + + @Override + public List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff) { + if (propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append(selectAll); + + int size = propertyNames.length; + if (size > 0) { + queryString.append("where 1=1 "); + } + + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + + queryString.append(" " + orderByStuff); + + Query queryObject = entityManager.createQuery(queryString.toString()); + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + } + + return queryObject.getResultList(); + } + + @Override + public T getByProperty(DdlPackMdmModelBean packBean) { + + try { + List list = findByHqlWhere(packBean); + return list.size() != 0 ? list.get(0) : null; + } catch (NoResultException ne) { + LOGGER.error("数据不存在，DdlPackMdmModelBean：{}", packBean); + return null; + } catch (NonUniqueResultException ex) { + LOGGER.error("查询单条记录，但出现多条。packBean：{}", packBean); + throw new RuntimeException("存在多条记录：" + ex.getMessage()); + } + } + + @Override + public T getByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) { + String queryString = + selectAll + " where " + entityType.getAlias() + "." + propertyName + "= :" + entityType.getAlias() + "_" + propertyName; + try { + List list = entityManager.createQuery(queryString) + .setParameter(entityType.getAlias() + "_" + propertyName, value) + .getResultList(); + return list.size() != 0 ? list.get(0) : null; + } catch (NoResultException ne) { + LOGGER.error("数据不存在，prop：{},value：{}", propertyName, value, ne); + return null; + } catch (NonUniqueResultException ex) { + LOGGER.error("查询单条记录，但出现多条。prop：{},value：{}", propertyName, value, ex); + throw new RuntimeException("存在多条记录：" + ex.getMessage()); + } + } + + @Override + public T getByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) { + if (propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append(selectAll); + + int size = propertyNames.length; + if (size > 0) { + queryString.append("where 1=1 "); + } + + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + + Query queryObject = entityManager.createQuery(queryString.toString()); + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + } + + try { + List list = queryObject.getResultList(); + return list.size() != 0 ? list.get(0) : null; + } catch (NoResultException ne) { + LOGGER.error("数据不存在", ne); + return null; + } catch (NonUniqueResultException ex) { + LOGGER.error("查询单条记录，但出现多条。", ex); + throw new RuntimeException("存在多条记录：" + ex.getMessage()); + } + } + + @Override + public int listCount() { + try { + Long count = entityManager.createQuery(selectCount, Long.class).getSingleResult(); + return count == null ? 0 : count.intValue(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public int findByPropertyCount(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) { + try { + String queryString = selectCount + " where " + entityType.getAlias() + "." + propertyName + + "= :" + entityType.getAlias() + "_" + propertyName; + Long count = entityManager.createQuery(queryString, Long.class) + .setParameter(entityType.getAlias() + "_" + propertyName, value) + .getSingleResult(); + return count == null ? 0 : count.intValue(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public int findByPropertyCount(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) { + if (propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append("select count(distinct model) from " + masterClass.getName() + " as model"); + + int size = propertyNames.length; + if (size > 0) { + queryString.append(" where 1=1 "); + } + + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + + Query queryObject = entityManager.createQuery(queryString.toString(), Long.class); + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryObject.setParameter(propertyNames[i], values[i]); + } + } + + try { + Long count = (Long) queryObject.getSingleResult(); + return count == null ? 0 : count.intValue(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public List findByPropertyPage(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value, String orderByStuff, Pager pager) { + if (pager.getTotalRows() > 0) { + String queryString = selectAll + " where " + entityType.getAlias() + "." + propertyName + "= :" + entityType.getAlias() + "_" + propertyName + " " + orderByStuff; + return entityManager.createQuery(queryString) + .setParameter(entityType.getAlias() + "_" + propertyName, value) + .getResultList(); + } else { + return new ArrayList<>(); + } + } + + @Override + public List findByPropertyPage(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, + String orderByStuff, Pager pager) { + if (pager.getTotalRows() > 0) { + if (propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append(selectAll); + + int size = propertyNames.length; + if (size > 0) { + queryString.append("where 1=1 "); + } + + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + + if (orderByStuff != null && orderByStuff.length() > 0) { + queryString.append(orderByStuff); + } + + Query queryObject = entityManager.createQuery(queryString.toString()); + for (int i = 0; i < size; i++) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + + return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); + } else { + return new ArrayList<>(); + } + } + + @Override + public List findByHqlWhere(DdlPackMdmModelBean packBean) { + Query query = entityManager.createQuery(selectAll + " where 1=1 " + packBean.getPackedHql()); + + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + return query.getResultList(); + } + + @Override + public List findByHqlWhere(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff) { + if (propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append(selectAll + " as where 1=1 "); + + if (hqlWhere != null && hqlWhere.length() > 0) { + queryString.append(hqlWhere); + } + + int size = propertyNames.length; + for (int i = 0; i < size; i++) { + if (propertyNames[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + + queryString.append("" + orderByStuff); + + Query queryObject = entityManager.createQuery(queryString.toString()); + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + } + return queryObject.getResultList(); + } + + @Override + public int findByHqlWhereCount(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) { + if (propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append(selectCount + " where 1=1 "); + + if (hqlWhere != null && hqlWhere.length() > 0) { + queryString.append(hqlWhere); + } + + int size = propertyNames.length; + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + + Query queryObject = entityManager.createQuery(queryString.toString()); + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + } + + try { + Long count = entityManager.createQuery(queryString.toString(), Long.class).getSingleResult(); + return count == null ? 0 : count.intValue(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public List findByHqlWherePage(String hqlWhere, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff) { + if (pager.getTotalRows() > 0) { + if (propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append(selectAll + " where 1=1 "); + + if (hqlWhere != null && hqlWhere.length() > 0) { + queryString.append(hqlWhere); + } + + int size = propertyNames.length; + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + queryString.append(" " + orderByStuff); + + Query queryObject = entityManager.createQuery(queryString.toString()).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()); + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + } + + return queryObject.getResultList(); + } else { + return new ArrayList<>(); + } + } + + @Override + public List findByHqlWherePage(DdlPackMdmModelBean packBean, Pager pager) { + if (pager.getTotalRows() > 0) { + Query query = entityManager.createQuery(selectAll + " where 1=1 " + packBean.getPackedHql()); + + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + + return query.setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + } else { + return new ArrayList<>(); + } + } + + @Override + public int findByHqlWhereCount(DdlPackMdmModelBean packBean) { + StringBuffer queryString = new StringBuffer(); + queryString.append(selectCount + " where 1=1 " + packBean.getWhereAppend()); + + Query query = entityManager.createQuery(queryString.toString(), Long.class); + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + try { + Long count = (Long) query.getSingleResult(); + return count == null ? 0 : count.intValue(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public int findByHqlCount(String hql) { + try { + Long count = entityManager.createQuery(hql, Long.class).getSingleResult(); + return count == null ? 0 : count.intValue(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public int findByHqlCount(String hql, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue) { + Query queryObject = entityManager.createQuery(hql, Integer.class); + for (int i = 0; i < paramName.length; i++) { + if (paramValue[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + paramName[i], paramValue[i]); + } + } + try { + return (int) queryObject.getSingleResult(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public List findByHqlPage(DdlPackMdmModelBean packBean, Pager pager) { + if (pager.getTotalRows() > 0) { + Query query = entityManager.createQuery(selectAll + " where 1=1 " + packBean.getPackedHql()); + + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + + return query.setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + } else { + return new ArrayList<>(); + } + } + + @Override + public List findByHqlPage(String hql, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue) { + if (pager.getTotalRows() > 0) { + Query queryObject = entityManager.createQuery(hql); + for (int i = 0; i < paramName.length; i++) { + if (paramValue[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + paramName[i], paramValue[i]); + } + } + + return queryObject.setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + } else { + return new ArrayList<>(); + } + } + + @Override + public double findByHqlDouble(DdlPackMdmModelBean packBean) { + try { + Query query = entityManager.createQuery(packBean.getPackedHqlAll(), Double.class); + + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + + Double result = (Double) query.getSingleResult(); + return result == null ? 0 : result; + } catch (NoResultException e) { + return 0; + } + } + + @Override + public long findByHqlLong(DdlPackMdmModelBean packBean) { + try { + Query query = entityManager.createQuery(selectAll + " where 1=1 " + packBean.getPackedHql(), Long.class); + + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + + return (long) query.getSingleResult(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public List findByHqlTopWhere(DdlPackMdmModelBean packBean, int topNum) { + Query query = entityManager.createQuery(selectAll + " where 1=1 " + packBean.getPackedHql()); + + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + + return query.setFirstResult(0).setMaxResults(topNum).getResultList(); + } + + @Override + public List findByHqlObjects(String hql) { + return entityManager.createQuery(hql).getResultList(); + } + + @Override + public List findByHqlObjects(String hql, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, + Object[] paramValue) { + Query queryObject = entityManager.createQuery(hql); + for (int i = 0; i < paramName.length; i++) { + if (paramValue[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + paramName[i], paramValue[i]); + } + } + + return queryObject.getResultList(); + } + + @Override + public List findByHqlPageObjects(String hql, Pager pager) { + if (pager.getTotalRows() > 0) { + return entityManager.createQuery(hql).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); + } else { + return new ArrayList(); + } + } + + @Override + public List findByHqlPageObjects(String hql, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) { + if (pager.getTotalRows() > 0) { + Query queryObject = entityManager.createQuery(hql); + for (int i = 0; i < propertyNames.length; i++) { + if (propertyNames[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + } + + return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); + } else { + return new ArrayList(); + } + } + + @Override + public List findBySqlObjList(String sql) { + return entityManager.createNativeQuery(sql).getResultList(); + } + + @Override + public List findBySqlObjListByPager(String sql, Pager pager) { + if (pager.getTotalRows() > 0) { + return entityManager.createNativeQuery(sql) + .setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + } else { + return new ArrayList(); + } + } + + /************** 部分业务 *************/ + private String getNowTime(boolean needSecond) { + return needSecond ? getNowTime("yyyy-MM-dd HH:mm:ss") : getNowTime("yyyy-MM-dd HH:mm"); + } + + private String getNowTime(String format) { + String dateTime; + try { + dateTime = (new SimpleDateFormat(format)).format(new Date()); + } catch (Exception e) { + dateTime = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(new Date()); + } + + return dateTime; + } + + @Override + public boolean isExitByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) { + //大于0，存在 + return findByPropertyCount(entityType, propertyName, value) > 0; + } + + @Override + public boolean isExitByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) { + return findByPropertyCount(entityTypes, propertyNames, values) > 0; + } + + @Override + public boolean isExitByHqlWhere(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) { + return findByHqlWhereCount(hqlWhere, entityTypes, propertyNames, values) > 0; + } + + @Override + public boolean isExitByHql(DdlPackMdmModelBean packBean) { + return findByHqlWhereCount(packBean) > 0; + } + + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/MdmPagerQueryModel.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/MdmPagerQueryModel.java new file mode 100644 index 0000000..51c84a3 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/MdmPagerQueryModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mdm.model; + + +import cn.estsh.i3plus.pojo.base.common.Pager; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-29 10:23 + * @Modify: + **/ +@Data +public class MdmPagerQueryModel { + + /** + * 实体 + */ + private T bean; + + /** + * 分页条件 + */ + private Pager pager; + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/core/MdmGearCoreBusiModel.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/core/MdmGearCoreBusiModel.java new file mode 100644 index 0000000..6768a27 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/core/MdmGearCoreBusiModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mdm.model.core; + +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiModelBean; +import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd; +import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @Description : 主数据齿轮-平台model + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-12 18:09 + * @Modify: + **/ +@Data +@ApiModel("齿轮平台业务model") +public class MdmGearCoreBusiModel extends BaseMdmBusiModelBean { + public MdmGearCoreBusiModel(MdmGear mdmMasterBean, MdmGearCoreBusiExtd mdmBusiBean) { + super(mdmMasterBean, mdmBusiBean); + } +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/modelrepository/core/MdmGearCoreRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/modelrepository/core/MdmGearCoreRepository.java new file mode 100644 index 0000000..acede04 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/modelrepository/core/MdmGearCoreRepository.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.mdm.modelrepository.core; + +import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd; +import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; +import cn.estsh.i3plus.pojo.mdm.jpa.dao.MdmBusiModelRepository; +import cn.estsh.i3plus.pojo.mdm.jpa.daoimpl.MdmBusiModelRepositoryImpl; +import cn.estsh.i3plus.pojo.mdm.model.core.MdmGearCoreBusiModel; +import org.springframework.stereotype.Component; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-25 11:42 + * @Modify: + **/ +@Component +public class MdmGearCoreRepository + extends MdmBusiModelRepositoryImpl + implements MdmBusiModelRepository { +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java new file mode 100644 index 0000000..57d3e64 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.mdm.repository; + +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean; +import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; + +import java.util.List; + +/** + * @Description : 主数据中心 HQL 包 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-20 15:23 + * @Modify: + **/ +public class MdmHqlPack { + + public static DdlPackBean getMdmPackBean(BaseMdmBean mdmBean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmBean); + + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", ddlPackBean); + return ddlPackBean; + } + + public static DdlPackBean getMdmPackBean() { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", ddlPackBean); + return ddlPackBean; + } + + + public static DdlPackBean packHqlIdList(List idList) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getInPackList(idList,"id",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlMdmGear(MdmGear mdmGear) { + DdlPackBean ddlPackBean = getMdmPackBean(mdmGear); + + DdlPreparedPack.getNumEqualPack(mdmGear.getId(),"id",ddlPackBean); + DdlPreparedPack.getStringLikerPack(mdmGear.getName(),"name",ddlPackBean); + DdlPreparedPack.timeBuilder(mdmGear.getCreateDatetime(),"createDatetime",ddlPackBean,false,true); + + return ddlPackBean; + } + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/core/MdmGearCoreBusiModelRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/core/MdmGearCoreBusiModelRepository.java new file mode 100644 index 0000000..6a6f3e9 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/core/MdmGearCoreBusiModelRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mdm.repository.busi.core; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-15 16:26 + * @Modify: + **/ +@Repository +public interface MdmGearCoreBusiModelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmGearRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmGearRepository.java new file mode 100644 index 0000000..43b555f --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmGearRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mdm.repository.master; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-15 16:26 + * @Modify: + **/ +@Repository +public interface MdmGearRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java new file mode 100644 index 0000000..b372b7b --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java @@ -0,0 +1,699 @@ +package cn.estsh.i3plus.pojo.mdm.sqlpack; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import cn.estsh.i3plus.pojo.mdm.bean.base.DdlPackMdmModelBean; +import org.apache.commons.lang3.StringUtils; + +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +/** + * @Description : 数据库脚本封装方法，封装成预加载hql，HqlPack仅限用于一些特定的sql，可能造成性能低下 + * example： name = :name + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2019-03-29 + * @Modify: + **/ +public class DdlMdmModelPreparedPack { + + /** + * 封装日期 + * + * @param startDate 开始日期 + * @param endDate 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） + * @param columnName HQL里对应的时间字段 + * @param packBean 封装的HQL对象 + * @param isShowTime 是否包含时分秒 + */ + public static void timeBuilder(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String startDate, String endDate, String columnName, + DdlPackMdmModelBean packBean, boolean isShowTime) { + if (startDate == null || startDate.trim().length() == 0) { + startDate = "1900-01-01"; + } else { + startDate = startDate.trim(); + } + if (isShowTime && startDate.trim().length() <= 11) { + startDate += " 00:00:00"; + } + if (endDate == null || endDate.trim().length() == 0) { + endDate = "2100-01-01"; + } else { + endDate = endDate.trim(); + } + if (isShowTime && endDate.trim().length() <= 11) { + endDate += " 23:59:59"; + } + + packBean.addColumnQuery(entityType, columnName + , " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName + , startDate); + packBean.addColumnQuery(entityType, "s_" + columnName + , " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName + , endDate); + } + + /** + * 封装日期 + * + * @param startDate 开始日期 + * @param endDate 结束日期 + * @param columnName 列名 + * @param isLeftContain 左闭？ + * @param isRightContain 右闭？ + * @param packBean HQL对象 + */ + public static void timeBuilder(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String startDate, String endDate, String columnName, boolean isLeftContain, boolean isRightContain, DdlPackMdmModelBean packBean) { + if (isLeftContain) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, startDate.trim()); + } else { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, startDate.trim()); + } + if (isRightContain) { + packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, endDate.trim()); + } else { + packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, endDate.trim()); + } + } + + /** + * 封装日期 + * + * @param date 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） + * @param columnName HQL里对应的时间字段 + * @param packBean 封装的HQL + * @param showTaday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有 + * @param isShowTime 是否包含时分秒 + */ + public static void timeBuilder(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String date, String columnName, DdlPackMdmModelBean packBean, Boolean showTaday, boolean isShowTime) { + if (date != null && date.trim().length() > 0) { + String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date()); + if (date.trim().length() > 0 && (date.length() == 1 || ",".equals(date))) { + //只有一个逗号 + date = ""; + } + + String[] time = date.split(","); + if (time.length == 1) { + //只有开始日期，没有结束日期 + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, "%" + time[0] + "%"); + } else if (time.length == 2 && ((time[0] != null && time[0].trim().length() > 0) + || (time[1] != null & time[1].trim().length() > 0))) { + if (time[0] == null || time[0].trim().length() == 0) { + time[0] = "1900-01-01"; + } else { + time[0] = time[0].trim(); + } + if (isShowTime && time[0].trim().length() <= 11) { + time[0] += " 00:00:00"; + } + if (time[1] == null || time[1].trim().length() == 0) { + time[1] = "2100-01-01"; + } else { + time[1] = time[1].trim(); + } + if (isShowTime && time[1].trim().length() <= 11) { + time[1] += " 23:59:59"; + } + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, time[0]); + packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, time[1]); + } else { + if (showTaday) { + if (isShowTime) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, today + " 00:00:00"); + packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, today + " 23:59:59"); + } else { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " " +">= :" + entityType.getAlias() + "_" + columnName,today); + packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, today); + } + } + } + } + } + + + /** + * 封装日期 + * + * @param date 日期，需要和时间字段的值格式相同 + * @param startColumnName HQL里对应的开始时间字段 + * @param endColumnName HQL里对应的结束时间字段 + * @param packBean 封装的HQL + * @param isShowTime 是否包含时分秒 + */ + public static void getTimeBetweenCol(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String date, String startColumnName, String endColumnName, + DdlPackMdmModelBean packBean, boolean isShowTime) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if (date == null || date.trim().length() == 0) { + date = sdf.format(new Date()); + } + if (!isShowTime) { + date = date.substring(0, 10); + packBean.addColumnQuery(entityType, null, " and '" + date + "' between substring(" + entityType.getAlias() + "." + startColumnName + + ",1,10) and substring(" + entityType.getAlias() + "." + endColumnName + ",1,10)", null); + return; + } else if (date.trim().length() <= 11) { + date += " 00:00:00"; + } + packBean.addColumnQuery(entityType, null, " and '" + date + "' between " + entityType.getAlias() + "." + startColumnName + + " and " + entityType.getAlias() + "." + endColumnName, null); + } + + /** + * 封装String对象成order by排序 + * + * @param columnName 列名 + * @param packBean + */ + public static void getOrderByPack(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, Object order[], String[] columnName, + DdlPackMdmModelBean packBean) { + String sqlStr = ""; + String orderByStr = ""; + for (int i = 0; i < order.length; i++) { + if (order[i] != null && order[i].toString().trim().length() > 0) { + if (Integer.parseInt(order[i].toString()) == 1) { + order[i] = "asc"; + } else { + order[i] = "desc"; + } + if (columnName[i].indexOf(" model.") == -1) { + sqlStr += entityTypes[i].getAlias() + "." + columnName[i]; + } else { + sqlStr += columnName[i]; + } + sqlStr += " " + order[i].toString() + ","; + } + } + + if (sqlStr.length() > 0 && sqlStr.lastIndexOf(",") == sqlStr.length() - 1) { + sqlStr = sqlStr.substring(0, sqlStr.length() - 1); + orderByStr = " order by " + sqlStr; + } + + packBean.setOrderByStr(orderByStr); + } + + /** + * 对象默认排序 + */ + public static void getOrderDefault(BaseBean bean) { + if (bean != null && StringUtils.isBlank(bean.getOrderByParam())) { + bean.setOrderByParam("modifyDatetime"); + bean.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); + } + } + + /** + * 封装String对象成like语句 + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, "%" + val + "%"); + } + } + + /** + * 封装String对象成like语句 + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikerPackOr(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " or " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, "%" + val + "%"); + } + } + + /** + * 封装String对象成like语句(右侧模糊) + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringRightLikerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, val + "%"); + } + } + + /** + * 封装String对象成like语句(左侧模糊) + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLeftLikerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, "%" + val); + } + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, val); + } + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikePack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, val); + } + } + + /** + * 封装String对象成不等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNoEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " <> :" + entityType.getAlias() + "_" + columnName, val); + } + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNotNullPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String columnName, DdlPackMdmModelBean packBean) { + packBean.addColumnQuery(entityType, null, " and " + entityType.getAlias() + "." + columnName + " is not null", null); + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNotBlanklPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String columnName, DdlPackMdmModelBean packBean) { + packBean.addColumnQuery(entityType, null, " and (" + entityType.getAlias() + "." + columnName + " is not null and " + entityType.getAlias() + "." + columnName + " !='')", null); + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringEqualPackOr(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " or " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, val); + } + } + + /** + * 封装long或者int的正整数对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Long.parseLong(data.toString()) > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 两个字段不相等 + * + * @param firstColumnName 列名 + * @param packBean + */ + public static void getNotEqueals(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String firstColumnName, String twoColumnName, DdlPackMdmModelBean packBean) { + packBean.addColumnQuery(entityType, null, " and UPPER(" + entityType.getAlias() + "." + firstColumnName + ")!= UPPER(" + entityType.getAlias() + "." + twoColumnName + ")", null); + } + + /** + * 封装long或者int的负整数对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNegativeNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPackOr(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Long.parseLong(data.toString()) > 0) { + packBean.addColumnQuery(entityType, columnName, " or " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPackOverZero(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Double.parseDouble(data.toString()) > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumWithZeroEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Double.parseDouble(data.toString()) >= 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装String对象成大于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringBiggerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装String对象成大于不等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringBiggerNotEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " > :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装String对象成小于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringSmallerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { + packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, data); + } + } + + /** + * 封装String对象成小于不等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringSmallerNotEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { + packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " < :" + entityType.getAlias() + "_s_" + columnName, data); + } + } + + /** + * 封装double对象成大于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Double.parseDouble(data.toString()) > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " > :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装double对象成大于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerPackContainsZero(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " > :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装double对象成大于等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Double.parseDouble(data.toString()) > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装double对象成小于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Double.parseDouble(data.toString()) > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " < :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装double对象成小于等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Double.parseDouble(data.toString()) > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装long或者int的整数对象成equal语句(不等于) + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumNOEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " <> :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null) { + packBean.addColumnQuery(entityType, "in_"+columnName, + " and " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", data); + } + } + + /** + * 两个提交用or拼接 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotOrIsNull(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null) { + packBean.addColumnQuery(entityType, "in_"+columnName, " and (" + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ") " + + "or " + entityType.getAlias() + "." + columnName + " is null)", data); + } + } + + + /** + * 封装in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getOrInPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null) { + packBean.addColumnQuery(entityType, "in_"+columnName," or " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", data); + } + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackArray(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object[] data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && data.length > 0) { + packBean.addColumnQuery(entityType, "in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", Arrays.asList(data)); + } + } + + /** + * 封装not in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackArray(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object[] data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && data.length > 0) { + packBean.addColumnQuery(entityType, "in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " not in (:" + entityType.getAlias() + "_in_" + columnName + ")", Arrays.asList(data)); + } + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackList(MdmEnumUtil.HQL_ENTITY_TYPE entityType, List data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && data.size() > 0) { + packBean.addColumnQuery(entityType, "in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", data); + } + } + + /** + * 封装not in List查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackList(MdmEnumUtil.HQL_ENTITY_TYPE entityType, List data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && data.size() > 0) { + packBean.addColumnQuery(entityType, "in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " not in (:" + entityType.getAlias() + "_in_" + columnName + ")", data); + } + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInOrPackString(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && data.trim().length() > 0) { + //判断最后一位是不是逗号 + if (data.lastIndexOf(",") != (data.length() - 1)) { + data += ","; + } + String[] dataArray = data.substring(0, data.length() - 1).split(","); + data = ""; + for (int i = 0; i < dataArray.length; i++) { + if (i == dataArray.length - 1) { + data += "'" + dataArray[i] + "'"; + } else { + data += "'" + dataArray[i] + "',"; + } + } + packBean.addColumnQuery(entityType, "in_"+columnName, " or " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", data); + } + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackString(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && data.trim().length() > 0) { + //判断最后一位是不是逗号 + if (data.lastIndexOf(",") != (data.length() - 1)) { + data += ","; + } + String[] dataArray = data.substring(0, data.length() - 1).split(","); + data = ""; + for (int i = 0; i < dataArray.length; i++) { + if (i == dataArray.length - 1) { + data += "'" + dataArray[i] + "'"; + } else { + data += "'" + dataArray[i] + "',"; + } + } + packBean.addColumnQuery(entityType,"in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " not in (:" + entityType.getAlias() + "_in_" + columnName + ")", data); + } + } + + /** + * 封装not in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null) { + packBean.addColumnQuery(entityType, "in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " not in (:" + entityType.getAlias() + "_in_" + columnName + ")", data); + } + } + + /** + * 转换排序列 + * + * @param columnName 列名 + * @param basisType 基本类型 + * @return + * @see CommonEnumUtil.BASIS_TYPE + */ + public static String getOrderColConvertType(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String columnName, int basisType) { + String name = " " + entityType.getAlias() + "." + columnName; + + if (basisType == CommonEnumUtil.BASIS_TYPE.INT.getValue()) { + name = " cast(" + name + " as integer)"; + } else if (basisType == CommonEnumUtil.BASIS_TYPE.DOUBLE.getValue()) { + name = " cast(" + name + " as decimal)"; + } else if (basisType == CommonEnumUtil.BASIS_TYPE.LONG.getValue()) { + name = " cast(" + name + " as long)"; + } + return name; + } +} From 2f01b41c1ef92315ca161da2baac1c30180ae166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 8 Jun 2020 13:41:44 +0800 Subject: [PATCH 51/72] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java index b9e2fea..def59a3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java @@ -54,7 +54,7 @@ public class SysLogConsole extends BaseBean { private Integer logPort; @Column(name="LOG_GROUP") - @ApiParam(value ="日志分组(控制台日志,操作日志,系统日志,定任务日志)") + @ApiParam(value ="日志分组(日志记录器名称，getLogger方法的参数值)") private String logGroup; @Column(name="LOG_LEVEL") 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 3d7d445..499d89b 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 @@ -456,7 +456,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysFile(SysFile file) { - DdlPackBean result = DdlPackBean.getDdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(file); // hql拼接 DdlPreparedPack.getStringLikerPack(file.getFileOriginalName(), "fileOriginalName", result); @@ -466,9 +466,6 @@ public class CoreHqlPack { DdlPreparedPack.getStringLikerPack(file.getFileCode(), "fileCode", result); DdlPreparedPack.timeBuilder(file.getCreateDatetime(), "createDatetime", result, false, false); - // 添加默认排序 - DdlPreparedPack.getOrderDefault(file); - return result; } From fb603db58e20a6a772026965805e3b7a53b5dfff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 8 Jun 2020 13:43:52 +0800 Subject: [PATCH 52/72] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=8B=BE=E5=8F=96?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/bean/BfElementConstraintProperty.java | 56 ------------------ .../pojo/form/bean/BfElementPickUpProperty.java | 66 ++++++++++++++++++++++ .../i3plus/pojo/form/bean/BfElementProperty.java | 4 ++ .../BfElementPickUpPropertyRepository.java | 14 +++++ 4 files changed, 84 insertions(+), 56 deletions(-) delete mode 100644 modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraintProperty.java create mode 100644 modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPickUpProperty.java create mode 100644 modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementPickUpPropertyRepository.java diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraintProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraintProperty.java deleted file mode 100644 index 839099e..0000000 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraintProperty.java +++ /dev/null @@ -1,56 +0,0 @@ -//package cn.estsh.i3plus.pojo.form.bean; -// -//import cn.estsh.i3plus.pojo.base.bean.BaseBean; -//import com.fasterxml.jackson.databind.annotation.JsonSerialize; -//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -//import io.swagger.annotations.Api; -//import io.swagger.annotations.ApiParam; -//import lombok.Data; -//import lombok.EqualsAndHashCode; -//import org.hibernate.annotations.DynamicInsert; -//import org.hibernate.annotations.DynamicUpdate; -// -//import javax.persistence.Column; -//import javax.persistence.Entity; -//import javax.persistence.Table; -// -///** -// * @Description : 元素约束属性 -// * @Reference : -// * @Author : yunhao -// * @CreateDate : 2020-03-12 13:36 -// * @Modify: -// **/ -//@Data -//@Entity -//@DynamicInsert -//@DynamicUpdate -//@EqualsAndHashCode(callSuper = true) -//@Table(name = "BF_ELEMENT_CONSTRAINT_PROPERTY") -//@Api(value = "元素约束属性", description = "元素约束属性") -//public class BfElementConstraintProperty extends BaseBean { -// -// @Column(name = "CONSTRAINT_ID") -// @ApiParam(value = "约束ID", example = "-1") -// @JsonSerialize(using = ToStringSerializer.class) -// private Long constraintId; -// -// @Column(name = "ELEMENT_PROPERTY_ID") -// @ApiParam(value = "元素属性ID", example = "-1") -// @JsonSerialize(using = ToStringSerializer.class) -// private Long elementPropertyId; -// -// @Column(name = "DATA_OBJECT_PROPERTY_ID") -// @ApiParam(value = "数据对象属性ID", example = "-1") -// @JsonSerialize(using = ToStringSerializer.class) -// private Long dataObjectPropertyId; -// -// @Column(name="PROPERTY_NAME") -// @ApiParam(value ="元素属性名称") -// private String propertyName; -// -// @Column(name="PROPERTY_CODE_RDD") -// @ApiParam(value ="元素属性代码") -// private String propertyCodeRdd; -// -//} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPickUpProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPickUpProperty.java new file mode 100644 index 0000000..8bf2d5c --- /dev/null +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPickUpProperty.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.form.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 表单拾取属性 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-27 21:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BF_ELEMENT_PICK_UP_PROPERTY") +@Api(value = "表单拾取属性", description = "表单拾取属性") +public class BfElementPickUpProperty extends BaseBean { + + @Column(name = "PICK_UP_PROPERTY_ID") + @ApiParam(value = "拾取属性id", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long pickUpPropertyId; + + @Column(name = "ELEMENT_ID") + @ApiParam(value = "对象元素ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long elementId; + + @Column(name="ELEMENT_PROPERTY_ID") + @ApiParam(value ="元素属性id") + @JsonSerialize(using = ToStringSerializer.class) + private Long elementPropertyId; + + @Column(name="ELEMENT_PROPERTY_NAME") + @ApiParam(value ="元素属性名称") + private String elementPropertyName; + + @Column(name = "PICK_UP_ELEMENT_ID") + @ApiParam(value = "拾取元素ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long pickUpElementId; + + @Column(name="PICK_UP_ELEMENT_PROPERTY_ID") + @ApiParam(value ="拾取元素属性id") + @JsonSerialize(using = ToStringSerializer.class) + private Long pickUpElementPropertyId; + + @Column(name="PICK_UP_ELEMENT_PROPERTY_NAME") + @ApiParam(value ="拾取元素属性名称") + private String pickUpElementPropertyName; + +} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java index 8cc9ca2..a89a117 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description : 数据对象 @@ -149,6 +150,9 @@ public class BfElementProperty extends BaseBean { @ApiParam(value ="是否为唯一约束字段") private transient Integer isUniqueProperty; + @Transient + @ApiParam(value ="拾取关联属性") + private List pickUpPropertyList; // public Object getFormValue() { // return propertyFormValue == null ? propertyDefaultValue : propertyFormValue; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementPickUpPropertyRepository.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementPickUpPropertyRepository.java new file mode 100644 index 0000000..99bbfc8 --- /dev/null +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementPickUpPropertyRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.form.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.form.bean.BfElementPickUpProperty; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-21 15:18 + * @Modify: + **/ +public interface BfElementPickUpPropertyRepository extends BaseRepository { +} From b9a619f4fef701253ba59001bde90a2c4cead4f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 8 Jun 2020 13:44:14 +0800 Subject: [PATCH 53/72] =?UTF-8?q?REST=E8=B0=83=E6=95=B4=E6=B7=BB=E5=8A=A0r?= =?UTF-8?q?equestBody=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java index 5fcea3e..eb8b13c 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java @@ -46,6 +46,12 @@ public class BsSuitCaseREST extends BaseBean { @AnnoOutputColumn(refClass = CommonEnumUtil.HTTP_METHOD_TYPE.class) private Integer requestMethodId; + //CommonEnumUtil.TRUE_OR_FALSE + @Column(name = "IS_REQUEST_BODY") + @ApiParam(value = "是否使用requestBody") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + private Integer isRequestBody; + @Transient @ApiParam(value = "请求头转换") private List requestHeaderList; From 47904278c5fa30e2995a1af83d1b6acdfa9db714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 8 Jun 2020 15:46:42 +0800 Subject: [PATCH 54/72] =?UTF-8?q?2092=20MES202006-=E9=A6=96=E6=A3=80?= =?UTF-8?q?=E3=80=81=E5=B7=A1=E6=A3=80=E6=A3=80=E9=AA=8C=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=94=9F=E6=88=90=E9=80=BB=E8=BE=91=E5=8F=98=E6=9B=B4-20200615?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 2 +- 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java index 8e58dec..74de05a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java @@ -98,4 +98,8 @@ public class IfQcOrder extends BaseBean implements Serializable { @ApiParam("检测类型") private Integer checkType; + @Column(name = "CUST_DELIERY_LOCATION") + @ApiParam("客户发运地") + private String custDelieryLocation; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index 3f0402c..b9c75bf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -88,6 +88,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("是否允许让步") private Integer isConcession = 0; + @Column(name = "NUMBER_FLAG") + @ApiParam("数量标识") + private String numberFlag; + @Transient @ApiParam("检测类型名称") private String checkTypeName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 5dd373d..9e98310 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -100,6 +100,10 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("发运时间") private String deliveryDate; + @Column(name = "CUST_DELIERY_LOCATION") + @ApiParam("客户发运地") + private String custDelieryLocation; + @ApiParam(value = "检测结果") @Transient private String reulstStatus; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index 3f192ac..60fae90 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -82,7 +82,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam(value = "已完成数量") @Transient - private Integer finishQty; + private Integer finishQty = 0; @ApiParam(value = "检测项类型名称") @Transient From 1afa60623c9933dee5a672600a3e99143a0f80cf Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 8 Jun 2020 18:02:24 +0800 Subject: [PATCH 55/72] Finish Task #2090 Cost:16h --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 +- .../pojo/mes/bean/MesScatterPartProdCfg.java | 4 + .../pojo/mes/model/ScatterPartProdCfgModel.java | 89 ++++++++++++++++++++++ 3 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterPartProdCfgModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index abd8d53..66b958a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -2520,7 +2520,8 @@ public class MesPcnEnumUtil { STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"), RUNNING_INFO("runningInfo", "执行信息"), STOP_PCS_CTL("stopPcsCtl", "停止监控"), - RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"); + RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"), + PROCESS_CONTENT("processContent", "过程组件内容"); private String value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java index 4e01a47..1f6001b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java @@ -161,4 +161,8 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable { @Column(name = "IS_END_SEQ") @ApiParam("是否截至顺序号") private Integer isEndSeq; + + @Column(name = "MULTIMEDIA_PLUG_QTY") + @ApiParam("多媒体插头数量") + private Double multimediaPlusQty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterPartProdCfgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterPartProdCfgModel.java new file mode 100644 index 0000000..e1cb609 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterPartProdCfgModel.java @@ -0,0 +1,89 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/6/8 1:22 下午 + * @Modify: + */ +@Data +public class ScatterPartProdCfgModel { + + private Long id; + + private String organizeCode; + + @ApiParam("配置编号") + private String cfgId; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("车型标志值") + private String modelFalgValue; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("等级代码") + private String gradeCode; + + @ApiParam("颜色代码") + private String colorCode; + + @ApiParam("标志位") + private Integer partFlagLocation; + + @ApiParam("标志值") + private String partFlagValue; + + @ApiParam("防错码") + private String pokeYokeFix; + + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @ApiParam("确认扫描次数") + private Integer checkScanCount; + + @ApiParam("组合码发送顺序") + private Integer sendSeq; + + @ApiParam("黄枪规则") + private Integer yellowGunRule; + + @ApiParam("是否截至顺序号") + private Integer isEndSeq; + + @ApiParam("多媒体插头数量") + private Double multimediaPlusQty; + + public ScatterPartProdCfgModel() {} + + public ScatterPartProdCfgModel(Long id, String workCenterCode, String workCellCode, String partNo, String partName + , String gradeCode, String colorCode, String prodCfgTypeCode, String produceCtgyCode, Double multimediaPlusQty) { + this.id = id; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.partNo = partNo; + this.partName = partName; + this.gradeCode = gradeCode; + this.colorCode = colorCode; + this.prodCfgTypeCode = prodCfgTypeCode; + this.produceCtgyCode = produceCtgyCode; + this.multimediaPlusQty = multimediaPlusQty; + } +} From 97fb0bfd29741f337cedbb2b33bb4faebd2ce20c Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 8 Jun 2020 20:45:25 +0800 Subject: [PATCH 56/72] Fix Bug #8823 --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java index 3cc6419..d85b01d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickingMovement.java @@ -56,5 +56,7 @@ public class WmsPickingMovement extends BaseBean { @AnnoOutputColumn private String planTime; - + @ApiParam(value = "ERP单号") + @AnnoOutputColumn + private String erpSrcNo; } From fb4bf4cbe22520094543217d301e5be73245e3b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Mon, 8 Jun 2020 20:51:18 +0800 Subject: [PATCH 57/72] Fix Bug #8778 --- .../java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java index 6041e75..d6bba54 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java @@ -82,10 +82,11 @@ public class ProductInfoManageModel { public ProductInfoManageModel() { } - public ProductInfoManageModel(String vinCode, String prodCfgTypeCode, String gradeCode, String produceColor) { + public ProductInfoManageModel(String vinCode, String prodCfgTypeCode, String gradeCode, String produceColor, Double queDetailSeq) { this.vinCode = vinCode; this.prodCfgTypeCode = prodCfgTypeCode; this.gradeCode = gradeCode; this.produceColor = produceColor; + this.queDetailSeq = queDetailSeq; } } From c39c9b6f70cf61559c99d2b164b3919e5c873e41 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 8 Jun 2020 23:04:44 +0800 Subject: [PATCH 58/72] ptl --- .../i3plus/pojo/base/enumutil/PtlEnumUtil.java | 25 ++++ .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 160 --------------------- .../i3plus/pojo/ptl/bean/PtlAreaActorAction.java | 11 +- .../cn/estsh/i3plus/pojo/ptl/bean/PtlMethod.java | 49 +++++++ .../repository/PtlAreaActorActionRepository.java | 15 ++ .../pojo/ptl/repository/PtlMethodRepository.java | 15 ++ 6 files changed, 112 insertions(+), 163 deletions(-) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMethod.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaActorActionRepository.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMethodRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index 128e322..9b2b76a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -11,6 +11,31 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class PtlEnumUtil { /** + * 方法类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PTL_METHOD_TYPE { + INTERFACE(10, "界面方法"), + MONITOR(20, "监听方法"); + + private int value; + private String description; + + PTL_METHOD_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** * 流程状态-触发类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 7889a71..3d1fc0d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -3,8 +3,6 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.util.StringUtils; -import static cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil.MONITOR_PROCESS_MESSAGE_TYPE.*; - /** * @author Wynne.Lu * @date 2020/2/12 17:41 @@ -732,164 +730,6 @@ public class PtlPcnEnumUtil { } /** - * 监听消息类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MONITOR_PROCESS_MESSAGE_TYPE { - CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"), - DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), - EXCEPTION_DISCONNECT_CONTROL_CMD(25, "EXCEPTION_DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), - LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "lightOnService", "亮灯命令"), - LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "lightOffService", "灭灯命令"), - CONTROL_SIGNAL_CMD(50, "CONTROL_SIGNAL_CMD", "controlSignalService", "控制器反馈信号"), - INTERFACE_SIGNAL_CMD(60, "INTERFACE_SIGNAL_CMD", "", "发送给界面actor通过websocket返回"), - REFRESH_CONTROL_CMD(70, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"); - - private int value; - private String code; - private String callClass; - private String description; - - MONITOR_PROCESS_MESSAGE_TYPE(int value, String code, String callClass, String description) { - this.value = value; - this.code = code; - this.callClass = callClass; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getCode() { - return code; - } - - public String getCallClass() { - return callClass; - } - - public String getDescription() { - return description; - } - - public static MONITOR_PROCESS_MESSAGE_TYPE getTypeByValue(String code) { - if (StringUtils.isEmpty(code)) { - return null; - } - for (MONITOR_PROCESS_MESSAGE_TYPE enums : values()) { - if (enums.getCode().equals(code)) { - return enums; - } - } - return null; - } - } - - /** - * 界面消息类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum INTERFACE_SIGNAL_MESSAGE_TYPE { - CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"), - DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), - REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"), - SCAN_CONTROL_CMD(40, "SCAN_CONTROL_CMD", "scanControlService", "扫描"), - INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"); -// UNLOCK_CONTROL_CMD(50, "UNLOCK_CONTROL_CMD", "unlockControlService", "解锁"), -// LABEL_SELF_CHECK_CONTROL_CMD(60, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"), -// LIGHT_DETAIL_CONTROL_CMD(70, "LABEL_SELF_CHECK_CONTROL_CMD", "lightDetailControlService", "亮灯明细"); - - private int value; - private String code; - private String callClass; - private String description; - - INTERFACE_SIGNAL_MESSAGE_TYPE(int value, String code, String callClass, String description) { - this.value = value; - this.code = code; - this.callClass = callClass; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getCallClass() { - return callClass; - } - - public String getCode() { - return code; - } - - public String getDescription() { - return description; - } - - public static INTERFACE_SIGNAL_MESSAGE_TYPE getTypeByValue(String code) { - if (StringUtils.isEmpty(code)) { - return null; - } - for (INTERFACE_SIGNAL_MESSAGE_TYPE enums : INTERFACE_SIGNAL_MESSAGE_TYPE.values()) { - if (enums.getCode().equals(code)) { - return enums; - } - } - return null; - } - } - - /** - * 任务消息类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum GEN_TASK_MESSAGE_TYPE { - GEN_TASK_CMD(10, "GEN_TASK_CMD", "", "生成任务"); - - private int value; - private String code; - private String callClass; - private String description; - - GEN_TASK_MESSAGE_TYPE(int value, String code, String callClass, String description) { - this.value = value; - this.code = code; - this.callClass = callClass; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getCallClass() { - return callClass; - } - - public String getCode() { - return code; - } - - public String getDescription() { - return description; - } - - public static INTERFACE_SIGNAL_MESSAGE_TYPE getTypeByValue(String code) { - if (StringUtils.isEmpty(code)) { - return null; - } - for (INTERFACE_SIGNAL_MESSAGE_TYPE enums : INTERFACE_SIGNAL_MESSAGE_TYPE.values()) { - if (enums.getCode().equals(code)) { - return enums; - } - } - return null; - } - } - - /** * websocket业务类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java index caf5c46..ad66202 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -47,7 +48,11 @@ public class PtlAreaActorAction extends BaseBean implements Serializable { @ApiParam("特定条件") private String otherWhere; - @Column(name = "AMG_ID") - @ApiParam("组件集编号") - private Long amgId; + @Column(name = "METHOD_CODE") + @ApiParam("方法代码") + private String methodCode; + + @Transient + @ApiParam("实现类") + private String callClass; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMethod.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMethod.java new file mode 100644 index 0000000..cd2ba93 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMethod.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/14 11:18 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_METHOD") +@EqualsAndHashCode(callSuper = true) +@Api("方法清单") +public class PtlMethod extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1208980343927922927L; + + @Column(name = "METHOD_CODE") + @ApiParam("方法代码") + private String methodCode; + + @Column(name = "METHOD_NAME") + @ApiParam("方法描述") + private String methodName; + + @Column(name = "CALL_CLASS") + @ApiParam("实现类") + private String callClass; + + @Column(name = "METHOD_TYPE") + @ApiParam("方法类型") + private Integer methodType; + + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaActorActionRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaActorActionRepository.java new file mode 100644 index 0000000..8eba13c --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaActorActionRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaActorAction; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlAreaActorActionRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMethodRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMethodRepository.java new file mode 100644 index 0000000..2737250 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMethodRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlMethod; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlMethodRepository extends BaseRepository { + +} From 471208d0510c92fadab0be4c4b1c6b5cb9586673 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 9 Jun 2020 13:03:57 +0800 Subject: [PATCH 59/72] =?UTF-8?q?SWEB=E6=B7=BB=E5=8A=A0=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/SwebEnumUtil.java | 53 ++++++++++++++++++++++ .../i3plus/pojo/model/wms/WmsTaskInfoModel.java | 3 ++ 2 files changed, 56 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index a427d3a..a493481 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -647,4 +647,57 @@ public class SwebEnumUtil { return valueOf(val); } } + + /** + * 单据条码状态（PO/DOC_MOVE） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORDER_SN_STATUS { + CREATE(10, "N", "创建"), + RECEIPTED(20, "R", "已完成"), + CANCEL(30, "C", "行取消"), + PRINTED(40, "C", "已打印"); + + private int value; + private String code; + private String description; + + ORDER_SN_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index e55cf6c..a42e0af 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -62,6 +62,9 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam(value = "关联单据类型") public String refType; + @ApiParam(value = "erp单号") + public String erpSrcNo; + public WmsTaskInfoModel() { } From 3173e432452235e61380020a0734842ce924acbf Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 9 Jun 2020 13:38:51 +0800 Subject: [PATCH 60/72] Fix bug#8742 --- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 25 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 108496e..4525fd2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -150,7 +150,7 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", public String destLocateNo; /** - * 状态:1=创建,10=待处理,20=已处理 + * 状态:10:创建,20:待处理,30:已处理,40:处理出错 */ @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "0") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index bb0066f..ee9d550 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -233,6 +233,31 @@ public class WmsMoveMaster extends BaseBean { this.modifyDatetime = modifyDatetime; } + public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus, + String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode, + String createDatetime, String createUser, String modifyUser, String modifyDatetime) { + this.orderNo = orderNo; + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.itemStatus = itemStatus; + this.unit = unit; + this.srcWhNo = srcWhNo; + this.srcZoneNo = srcZoneNo; + this.destWhNo = destWhNo; + this.destZoneNo = destZoneNo; + this.transQty = transQty; + this.rejectQty = rejectQty; + this.fixId = fixId; + this.busiTypeCode = busiTypeCode; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } + public WmsMoveMaster(Long itemQty , String transTypeCode , Integer orderStatus){ this.itemQty = itemQty; this.transTypeCode = transTypeCode; From 057439d050a6477ddb740b7a7a59f5c5e81321b4 Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 9 Jun 2020 16:48:33 +0800 Subject: [PATCH 61/72] Finish Task #2080 Cost:8h Finish Task #2081 Cost:12h Finish Task #2083 Cost:8h --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 88 +++++ .../estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java | 2 +- .../i3plus/pojo/wms/bean/WmsModeTransport.java | 17 +- .../pojo/wms/bean/WmsTmsShippingExtDetail.java | 358 --------------------- .../i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java | 175 ---------- .../IWmsTmsShippingExtDetailRepository.java | 17 - .../repository/IWmsTmsShippingExtSnRepository.java | 17 - 7 files changed, 101 insertions(+), 573 deletions(-) delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtDetailRepository.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtSnRepository.java 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 56d90d9..077e388 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 @@ -7547,4 +7547,92 @@ public class WmsEnumUtil { return null; } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SCAN_CATEGORY { + ASN(10, "wmsDoMovementMasterRepository", "ASN"), + PO(20, "wmsDoMovementMasterRepository", "PO"), + SO(30, "wmsDoMovementMasterRepository", "SO"), + MOVE(40, "wmsDoMovementMasterRepository", "移库单"), + IN_STOCK(50, "wmsDoMovementMasterRepository", "入库单"), + SHIPPING(60, "wmsDoMovementMasterRepository", "发运单"), + QC(70, "wmsDoMovementMasterRepository", "质检单"), + CS(80, "wmsCSOrderMasterRepository", "盘点单"), + SN(90, "wmsStockSnRepository", "条码"), + PO_SN(100, "wmsPoSnRepository", "收货条码"); + + private int value; + private String code; + private String description; + + SCAN_CATEGORY(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static SCAN_CATEGORY getByDesc(String desc) { + SCAN_CATEGORY tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i]; + } + } + return tmp; + } + + public static SCAN_CATEGORY codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java index 4ceaa41..4933c46 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java @@ -44,7 +44,7 @@ public class WmsCsStrategy extends BaseBean implements Serializable { @Column(name = "part_type") @ApiParam(value = "物料分类") @AnnoOutputColumn(refClass = WmsEnumUtil.PART_ABC.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_ABC") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "PART_ABC") private String partType; @Column(name = "STRATEGY_TYPE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java index 4816585..6ef36b6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java @@ -1,10 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -45,8 +43,17 @@ public class WmsModeTransport extends BaseBean { @Column(name = "TRANSPORT_TYPE") @ApiParam(value = "运输方式") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description") - private Integer transportType; + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, dataSrc = "TRANSPORT_TYPE") + private String transportType; + + @Column(name = "SERIAL_NUMBER") + @ApiParam(value = "序号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String serialNumber; + + @Column(name = "remake") + @ApiParam(value = "说明") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String remake; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java deleted file mode 100644 index 1f49ba2..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java +++ /dev/null @@ -1,358 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.bean; - - -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; -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; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.persistence.Version; - -/** - * @Description : 车辆信息明细 - * @Reference : - * @Author : qianhuasheng - * @CreateDate : 2019-12-06 15:58 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="WMS_TMS_SHIPPING_EXT_DETAIL") -@Api("装车单信息明细") -public class WmsTmsShippingExtDetail extends BaseBean { - private static final long serialVersionUID = -4800308354250386102L; - - @Column(name="MOVE_NO") - @ApiParam("装车单") - public String moveNo; - - @Column(name = "PART_NO") - @ApiParam("物料编码") - public String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - public String partNameRdd; - - @Column(name = "ITEM") - @ApiParam("行号") - public String item; - - @Column(name = "QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "需求数量", example = "0") - public Double qty; - - @Column(name = "UNIT") - @ApiParam("单位") - public String unit; - - @Column(name = "REF_ORDER_NO") - @ApiParam("关联单号") - private String refOrderNo; - - @Column(name = "SRC_WH_NO") - @ApiParam("源仓库代码") - public String srcWhNo; - - @Column(name = "SRC_ZONE_NO") - @ApiParam("源存储区代码") - public String srcZoneNo; - - @Column(name = "SRC_LOCATE_NO") - @ApiParam("源库位代码") - public String srcLocateNo; - - @Column(name = "DEST_WH_NO") - @ApiParam("目标仓库代码") - public String destWhNo; - - @Column(name = "DEST_ZONE_NO") - @ApiParam("目标存储区代码") - public String destZoneNo; - - @Column(name = "DEST_LOCATE_NO") - @ApiParam("目标库位代码") - public String destLocateNo; - - @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "条码打印数量", example = "1") - private Double printQty; - - @Column(name = "PLAN_DATE") - @ApiParam(value = "计划日期") - private String planDate; - - @Column(name = "PLAN_TIME") - @ApiParam(value = "计划时间") - private String planTime; - - @Column(name = "SRC_NO") - @ApiParam(value = "源单号") - private String srcNo; - /** - * 状态:N=正常,C=行取消 - */ - @Column(name = "ITEM_STATUS") - @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") - private Integer itemStatus; - - /** - * 是否免费:0=计费,1=免费 - */ - @Column(name = "IS_FREE") - @ApiParam(value = "是否免费", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") - public Integer isFree; - - @Column(name = "REMARK") - @ApiParam(value = "操作原因") - private String remark; - - @Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "已拣货数量", example = "1") - private Double pickQty; - - @Column(name = "OUT_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "已出库数量", example = "1") - private Double outQty; - - @Column(name = "REC_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "已收货数量", example = "1") - private Double recQty; - - @Column(name = "MOVE_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "已移库数量", example = "1") - private Double moveQty; - - @Column(name = "TASK_GENERATE_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "任务生成数量", example = "1") - private Double taskGenerateQty; - - @Column(name = "SRC_AREA_NO") - @ApiParam("源库存地代码") - public String srcAreaNo; - - @Column(name = "DEST_AREA_NO") - @ApiParam("目的库存地代码") - public String destAreaNo; - - @Column(name = "LOT_NO") - @ApiParam("批次") - public String lotNo; - - @Column(name="SRC_ITEM", columnDefinition="varchar(50) default ''",nullable=false) - @ApiParam("源单行号") - public String srcItem; - - @Column(name = "CUST_ORDER_NO") - @ApiParam("客户订单号") - public String custOrderNo; - - @Column(name = "ASSIGN_DATE_CODE") - @ApiParam(value = "指定生产日期") - private String assignDateCode; - - @Transient - @ApiParam("实际批次") - private String actualLot; - - @Transient - @ApiParam("实际数量") - private Double actualQty; - - @Transient - @ApiParam("推荐批次") - private String recommondLot; - - @Transient - @ApiParam("推荐库位") - private String recommondLocateNo; - - @Transient - @ApiParam("前端表格编辑使用") - private Boolean isSet = false; - - @Transient - @ApiParam("生产日期") - public String dateCode; - - @ApiParam(value = "散件移库输入移库数量") - @Transient - public Double inputMoveQty; - - @Transient - @ApiParam(value = "标准包装", example = "1") - private Double snp; - - @Transient - @ApiParam(value = "条码总数量", example = "1") - private Double detailsSnCount; - - @Transient - @ApiParam(value = "余数", example = "1") - private Double restQty; - - @Transient - @ApiParam("任务状态") - @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") - private Integer isTask; - - @Transient - @ApiParam("主表单据状态") - @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") - private Integer orderMasterStatus; - - @Transient - @ApiParam("打印状态") - @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description") - private Integer printStatus; - - @Transient - @ApiParam("优先级") - private Integer priority; - - @Transient - @ApiParam(value = "汇总需求数量", example = "0") - public Double sumQty; - - @Transient - @ApiParam(value = "汇总拣货数量", example = "0") - public Double sumPickQty; - - @Transient - @ApiParam("执行状态") - @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description") - private Integer executeStatus; - - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; - - @Transient - @ApiParam("移动类型") - public Integer moveType; - - @Transient - @ApiParam("业务类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") - public Integer busiType; - - @Column(name = "IS_SN") - @ApiParam(value = "条码生成状态", example = "20") - public Integer isSn; - - - public WmsTmsShippingExtDetail () { - - } - - - public String getRecommondLot() { - return recommondLot == null ? "无" : this.recommondLot; - } - - public Double getQty() { - return qty == null ? 0D : this.qty.doubleValue(); - } - - public Double getOutQty() { - return outQty == null ? 0D : this.outQty.doubleValue(); - } - - public Double getPickQty() { - return pickQty == null ? 0D : this.pickQty.doubleValue(); - } - - public Double getActualQty() { - return actualQty == null ? 0D : this.actualQty.doubleValue(); - } - - public Double getRecQty() { - return recQty == null ? 0D : this.recQty.doubleValue(); - } - - public Integer getIsTaskVal() { - return isTask == null ? 0 : this.isTask.intValue(); - } - - public Integer getOrderMasterStatus() { - return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue(); - } - - public WmsTmsShippingExtDetail(WmsDocMovementDetails docMovementDetails,String moveNo) { - this.moveNo = moveNo; - this.partNo = docMovementDetails.getPartNo(); - this.partNameRdd = docMovementDetails.getPartNameRdd(); - this.item = docMovementDetails.getItem(); - this.qty =docMovementDetails.getQty(); - this.unit = docMovementDetails.getUnit(); - this.srcWhNo = docMovementDetails.getSrcWhNo(); - this.srcZoneNo = docMovementDetails.getSrcZoneNo(); - this.srcLocateNo = docMovementDetails.getSrcLocateNo(); - this.destWhNo = docMovementDetails.getDestWhNo(); - this.destZoneNo = docMovementDetails.getDestZoneNo(); - this.destLocateNo = docMovementDetails.getDestLocateNo(); - this.printQty = docMovementDetails.getPrintQty(); - this.planDate = docMovementDetails.getPlanDate(); - this.planTime = docMovementDetails.getPlanTime(); - this.srcNo = docMovementDetails.getSrcNo(); - this.itemStatus = docMovementDetails.getItemStatus(); - this.isFree = docMovementDetails.getIsFree(); - this.remark = docMovementDetails.getRemark(); - this.pickQty = docMovementDetails.getPickQty(); - this.outQty = docMovementDetails.getOutQty(); - this.recQty = docMovementDetails.getRecQty(); - this.moveQty = docMovementDetails.getMoveQty(); - this.taskGenerateQty = docMovementDetails.getTaskGenerateQty(); - this.srcAreaNo = docMovementDetails.getSrcAreaNo(); - this.destAreaNo = docMovementDetails.getDestAreaNo(); - this.lotNo = docMovementDetails.getLotNo(); - this.srcItem = docMovementDetails.getSrcItem(); - this.refOrderNo = docMovementDetails.getOrderNo(); - this.custOrderNo = docMovementDetails.getCustOrderNo(); - this.assignDateCode = docMovementDetails.getAssignDateCode(); - this.actualLot = docMovementDetails.getActualLot(); - this.actualQty = docMovementDetails.getActualQty(); - this.recommondLot = docMovementDetails.getRecommondLot(); - this.recommondLocateNo = docMovementDetails.getRecommondLocateNo(); - this.isSet = docMovementDetails.getIsSet(); - this.dateCode = docMovementDetails.getDateCode(); - this.inputMoveQty = docMovementDetails.getInputMoveQty(); - this.snp = docMovementDetails.getSnp(); - this.detailsSnCount = docMovementDetails.getDetailsSnCount(); - this.restQty = docMovementDetails.getRestQty(); - this.isTask = docMovementDetails.getIsTask(); - this.orderMasterStatus = docMovementDetails.getOrderMasterStatus(); - this.printStatus = docMovementDetails.getPrintStatus(); - this.priority = docMovementDetails.getPriority(); - this.sumQty = docMovementDetails.getSumQty(); - this.sumPickQty = docMovementDetails.getSumPickQty(); - this.executeStatus = docMovementDetails.getExecuteStatus(); - this.lockVersion = docMovementDetails.getLockVersion(); - this.moveType = docMovementDetails.getMoveType(); - this.busiType = docMovementDetails.getBusiType(); - this.isSn = docMovementDetails.getIsSn(); - } -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java deleted file mode 100644 index 5c40810..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java +++ /dev/null @@ -1,175 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.bean; - - -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; -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; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; - -/** - * @Description : 车辆信息明细 - * @Reference : - * @Author : qianhuasheng - * @CreateDate : 2019-12-06 15:58 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="WMS_TMS_SHIPPING_EXT_SN") -@Api("装车单条码明细") -public class WmsTmsShippingExtSn extends BaseBean { - - private static final long serialVersionUID = 5704546384179442907L; - - @Column(name="MOVE_NO") - @ApiParam("装车单") - public String moveNo; - - @Column(name="ORDER_NO") - @ApiParam("订单号") - public String orderNo; - - @Column(name="ITEM") - @ApiParam("行号") - public String item; - - @Column(name="PART_NO") - @ApiParam("物料编码") - public String partNo; - - @Column(name="PART_NAME_RDD") - @ApiParam("物料名称") - public String partNameRdd; - - @Column(name="QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "数量", example = "0") - public Double qty; - - - @Column(name="UNIT") - @ApiParam("单位") - public String unit; - - /** - * 状态：操作状态 itemStatus - */ - @Column(name="SN_STATUS") - @ApiParam(value = "操作状态", example = "10") - @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_SN_STATUS.class,refForeignKey = "value",value = "description") - public Integer snStatus; - - @Column(name="SN") - @ApiParam("条码") - public String sn; - - @Column(name = "VENDOR_NO") - @ApiParam(value = "供应商编码") - public String vendorNo; - - @Column(name = "SN_TYPE") - @ApiParam(value = "条码类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description") - private Integer snType; - - @Transient - @ApiParam("前端表格编辑使用") - private Boolean isSet = false; - - @Transient - @ApiParam("目标库位代码") - public String destLocateNo; - - @Transient - @ApiParam("源库位代码") - public String srcLocateNo; - - @Transient - @ApiParam("生产日期") - public String dateCode; - - @ApiParam(value = "散件移库输入移库数量") - @Transient - public Double inputMoveQty; - - @Transient - @ApiParam("计划交货日期") - private String planDate; - - @Transient - @ApiParam("计划交货时间") - private String planTime; - - @Transient - @ApiParam("ERP库存地") - private String erpWhNo; - - @Transient - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") - public Integer itemStatus; - - @Transient - @ApiParam("客户零件号") - private String customerPartNo; - - @Transient - @ApiParam("父层级packcode对应的可回用零件号") - private String parentReturnPart; - - - @Transient - @ApiParam("打印模板") - private String templateNo; - - @Transient - @ApiParam("剩余箱数量") - private Long countBox; - - public WmsTmsShippingExtSn(){} - - public WmsTmsShippingExtSn(Long countBox,String partNo) { - this.countBox = countBox; - this.partNo = partNo; - } - - public WmsTmsShippingExtSn(String moveNo,WmsDocMovementSn docMovementSn) { - this.moveNo = moveNo; - this.orderNo = docMovementSn.getOrderNo(); - this.item = docMovementSn.getItem(); - this.partNo = docMovementSn.getPartNo(); - this.partNameRdd = docMovementSn.getPartNameRdd(); - this.qty = docMovementSn.getQty(); - this.unit = docMovementSn.getUnit(); - this.snStatus = docMovementSn.getSnStatus(); - this.sn = docMovementSn.getSn(); - this.vendorNo = docMovementSn.getVendorNo(); - this.snType = docMovementSn.getSnType(); - this.isSet = docMovementSn.getIsSet(); - this.destLocateNo = docMovementSn.getDestLocateNo(); - this.srcLocateNo = docMovementSn.getSrcLocateNo(); - this.dateCode = docMovementSn.getDateCode(); - this.inputMoveQty = docMovementSn.getInputMoveQty(); - this.planDate = docMovementSn.getPlanDate(); - this.planTime = docMovementSn.getPlanTime(); - this.erpWhNo = docMovementSn.getErpWhNo(); - this.itemStatus = docMovementSn.getItemStatus(); - this.customerPartNo = docMovementSn.getCustomerPartNo(); - this.parentReturnPart = docMovementSn.getParentReturnPart(); - this.templateNo = docMovementSn.getTemplateNo(); - this.countBox = docMovementSn.getCountBox(); - } -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtDetailRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtDetailRepository.java deleted file mode 100644 index 4e8030b..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtDetailRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExtDetail; -import org.springframework.stereotype.Repository; - -/** -* @Description : 装车单明细 -* @Reference : -* @author: qianhuasheng -* @date: 2019/9/19 14:22 -* @Modify: -*/ - -@Repository -public interface IWmsTmsShippingExtDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtSnRepository.java deleted file mode 100644 index 0a0065b..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtSnRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExtSn; -import org.springframework.stereotype.Repository; - -/** -* @Description : 装车单条码明细 -* @Reference : -* @author: qianhuasheng -* @date: 2019/9/19 14:22 -* @Modify: -*/ - -@Repository -public interface IWmsTmsShippingExtSnRepository extends BaseRepository { -} From 2f8b0ba5dbb566d805ba132acfe1313de6c94a14 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 9 Jun 2020 17:42:37 +0800 Subject: [PATCH 62/72] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 11691be..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 8ef99a3..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 577686d..807bef5 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index f714b7d..b948580 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index b7991cc..e12eaee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 0648e9f..c338f71 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index f10cf39..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 3b9e57a..7637865 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index b1911ec..d98b7d8 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 56d54cb..bf96e57 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 830caa5..a758a6a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index fb51da0..efacfd2 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 78bbdef..dba12cc 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index fb44d00..81670b2 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index dc4ea86..26a7311 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 8571a5f..eaf2544 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index e36258d..0f615b6 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 9915420..9e5f745 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 61027b2..0fea52b 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index c2104bf..cc8fce6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 0a5f45840aea129d56fed6c1596e3fc1bee878fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 9 Jun 2020 18:16:56 +0800 Subject: [PATCH 63/72] Fix Bug #8778 --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 35 ++++++++++++++++++++++ .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 34 --------------------- 2 files changed, 35 insertions(+), 34 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 fb7b204..2d14825 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 @@ -6196,4 +6196,39 @@ public class MesEnumUtil { return tmp; } } + + /** + * 扭矩采集 黄枪规则(10-继续采集扭矩，20-发送下一个组合码) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum YELLOW_GUN_RULE { + COLLECT_TORQUE(10, "继续采集扭矩"), + SEND_NEXT_GROUP_CODE(20, "发送下一个组合码"); + + private int value; + private String description; + + YELLOW_GUN_RULE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index abd8d53..2420721 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -3770,40 +3770,6 @@ public class MesPcnEnumUtil { } /** - * 扭矩采集 黄枪规则(10-继续采集扭矩，20-发送下一个组合码) - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum YELLOW_GUN_RULE { - COLLECT_TORQUE(10, "继续采集扭矩"), - SEND_NEXT_GROUP_CODE(20, "发送下一个组合码"); - - private int value; - private String description; - - YELLOW_GUN_RULE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - } - /** * 界面类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From 457fa08b9f7ec40fddb1beb1b74cee7af4e70b87 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 9 Jun 2020 18:31:42 +0800 Subject: [PATCH 64/72] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= 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 55e4e84..932bdd9 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 42f43c58f5994054de69f58bfc24ec2122c76f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 9 Jun 2020 19:01:21 +0800 Subject: [PATCH 65/72] Fix Bug #8778 --- .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 91597a2..632df5d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -116,16 +116,16 @@ public class MesPcnHqlPack { * 获取原材料扫描信息的对应工序BOM * * @param stationBom - * @param rawPartNo + * @param rawPartSn * @return */ - public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, String rawPartNo) { + public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) { DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean); DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean); DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean); - DdlPreparedPack.getStringEqualPack(rawPartNo, "itemPartNo", packBean); + DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean); return packBean; } From da454b39218f2a0190af51f6952918039ef3c6d7 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 9 Jun 2020 20:58:30 +0800 Subject: [PATCH 66/72] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BAerp=E5=8D=95=E5=8F=B7=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index dc56c0d..e004dde 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -121,6 +121,11 @@ public class WmsDocMovementDetails extends BaseBean { @Transient @ApiParam(value = "状态中文") private String itemStatusStr; + + @Transient + @ApiParam(value = "ERP单号") + private String erpSrcNo; + /** * 是否免费:0=计费,1=免费 */ From ae805a659611b79d9151bc176f6b511f9269c136 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 10 Jun 2020 11:08:16 +0800 Subject: [PATCH 67/72] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/SwebEnumUtil.java | 40 ++++++++++++++++++++++ .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 1 + 2 files changed, 41 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index a493481..fd9784a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -700,4 +700,44 @@ public class SwebEnumUtil { return tmp; } } + + /** + * 条码类型 10=实物条码，20=虚拟条码 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORDER_STOCK_TYPE { + SOURCE(10, "实物条码"), + TARGET(20, "虚拟条码"), + CUST_SN(30, "客户条码"); + + private int value; + private String description; + + ORDER_STOCK_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index f510f8e..459a7e8 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -179,6 +179,7 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getNumEqualPack(master.getOrderStatus(), "orderStatus", result); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); return buildHql(master, result); } From 2b791901d26594e7a2c048d645fe043e4ca24b29 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 10 Jun 2020 16:23:54 +0800 Subject: [PATCH 68/72] Fix bug#8876 --- .../estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java | 5 ++++- .../i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java | 20 +++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java index 9adf080..e92e884 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java @@ -41,6 +41,7 @@ public class WmsSerialSnTrans extends BaseBean { @Column(name="SERIAL_SN") @ApiParam("产品条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String serialSn; @Column(name="BH_TYPE") @@ -65,15 +66,17 @@ public class WmsSerialSnTrans extends BaseBean { @Column(name="SRC_STOCK_SN") @ApiParam("源库存条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String srcStockSn; @Column(name="DEST_STOCK_SN") @ApiParam("目标库存条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String destStockSn; @Column(name="TRANS_TYPE") @ApiParam("操作类型") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BACTH_TRANS_TYPE") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 1, dataSrc = "BACTH_TRANS_TYPE") @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class, refForeignKey = "value", value = "description") private Integer transType; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java index e137f64..b64d25b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.wms.modelbean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -18,26 +20,38 @@ public class WmsMoveInfoModel { @ApiParam(value = "操作时间") private String modifyDateTime; + @ApiParam(value = "物料号") private String partNo; + @ApiParam(value = "物料名称") private String partNameRdd; + @ApiParam(value = "交易类型") private String transTypeCode; + @ApiParam(value = "交易类型名称") private String transTypeName; + @ApiParam(value = "业务类型") - private String busiTypeCode; + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") + private Integer busiTypeCode; + @ApiParam(value = "处理数量") private String sumQty; + @ApiParam(value = "工厂代码") private String organizeCode; + + @ApiParam(value = "操作状态") - private String itemStatus; + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") + private Integer itemStatus; + public WmsMoveInfoModel() { } - public WmsMoveInfoModel(String modifyDateTime, String partNo, String partNameRdd, String transTypeCode, String transTypeName, String busiTypeCode, String sumQty, String organizeCode) { + public WmsMoveInfoModel(String modifyDateTime, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer busiTypeCode, String sumQty, String organizeCode) { this.modifyDateTime = modifyDateTime; this.partNo = partNo; this.partNameRdd = partNameRdd; From f4ca720ce43207d07d79a3eb3a87388cc72d8687 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 10 Jun 2020 18:49:59 +0800 Subject: [PATCH 69/72] Finish Task #2080 Cost:8h --- .../i3plus/pojo/model/wms/WmsTaskInfoModel.java | 22 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 10 +++++++++- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index a42e0af..4ab91b7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -65,11 +65,33 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam(value = "erp单号") public String erpSrcNo; + @ApiParam(value = "工厂代码") + public String organizeCode; + public WmsTaskInfoModel() { } public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc, String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo, + String createDatetime, String srcZoneNo, String createUser, String organizeCode) { + this.orderNo = orderNo; + this.taskStatus = taskStatus; + this.opTypeName = opTypeName; + this.transTypeCode = transTypeCode; + this.refSrc = refSrc; + this.busiTypeCode = busiTypeCode; + this.zdate = zdate; + this.ztime = ztime; + this.custNo = custNo; + this.vendorNo = vendorNo; + this.createDatetime = createDatetime; + this.srcZoneNo = srcZoneNo; + this.createUser = createUser; + this.organizeCode = organizeCode; + } + + public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc, + String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo, String createDatetime, String srcZoneNo, String createUser) { this.orderNo = orderNo; this.taskStatus = taskStatus; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 81578e5..1a63eb3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -247,6 +247,9 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("物料编号组") public String[] partNos; + @Transient + @ApiParam("工厂集合") + private List organizeCodeList; public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index a137f31..9132494 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -10,7 +10,11 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -104,6 +108,10 @@ public class WmsTaskInfo extends BaseBean { @ApiParam(value = "供应商编号") private String vendorNo; + @Transient + @ApiParam("工厂集合") + private List organizeCodeList; + public WmsTaskInfo(){}; public WmsTaskInfo(String orderNo ,Integer taskStatus , String zdate ,String ztime,String custNo,String vendorNo){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 6c69ad7..667156b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -224,7 +224,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); - + DdlPreparedPack.getInPackList(wmsDocMovementMaster.getOrganizeCodeList(), "organizeCode", packBean); getStringBuilderPack(wmsDocMovementMaster, packBean); return packBean; From 219471570512e34c2e9a90f62b8326c95144f0d3 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 10 Jun 2020 19:15:55 +0800 Subject: [PATCH 70/72] Fix bug#8736 --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index e004dde..f149f30 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -138,6 +138,9 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "操作原因") private String remark; + /** + * 配料数量 + **/ @Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "已拣货数量", example = "1") From 0504e58f957870e23bb67ef3ff7a2d8f456a96ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 10 Jun 2020 19:35:53 +0800 Subject: [PATCH 71/72] Fix Bug #8778 --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index cb45469..9493cae 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -2521,7 +2521,8 @@ public class MesPcnEnumUtil { RUNNING_INFO("runningInfo", "执行信息"), STOP_PCS_CTL("stopPcsCtl", "停止监控"), RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"), - PROCESS_CONTENT("processContent", "过程组件内容"); + PROCESS_CONTENT("processContent", "过程组件内容"), + TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容"); private String value; private String description; From 247589fc0d461cd422a54ab4fc8f0e5fc85e276b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 11 Jun 2020 10:28:19 +0800 Subject: [PATCH 72/72] Fix Bug #8884 --- .../i3plus/pojo/mes/bean/MesScatterPartProdCfg.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java index 1f6001b..c443ad0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java @@ -88,35 +88,35 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable { @Column(name = "PEST1") @ApiParam("PEST编码1") - private Integer pest1; + private String pest1; @Column(name = "PEST2") @ApiParam("PEST编码2") - private Integer pest2; + private String pest2; @Column(name = "PEST3") @ApiParam("PEST编码3") - private Integer pest3; + private String pest3; @Column(name = "PEST4") @ApiParam("PEST编码4") - private Integer pest4; + private String pest4; @Column(name = "PEST5") @ApiParam("PEST编码5") - private Integer pest5; + private String pest5; @Column(name = "PEST6") @ApiParam("PEST编码6") - private Integer pest6; + private String pest6; @Column(name = "PEST7") @ApiParam("PEST编码7") - private Integer pest7; + private String pest7; @Column(name = "PEST8") @ApiParam("PEST编码8") - private Integer pest8; + private String pest8; @Column(name = "TORQUE_NO") @ApiParam("扭矩枪编号")