From 31e3d54b85d9da6472beb7e27b48264b871c9484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 2 Sep 2019 22:31:22 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=BB=84=E4=BB=B6=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=B5=8B=E9=BB=98=E8=AE=A4=E5=80=BC0=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 2bdc67f..1ea54c2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -74,14 +74,6 @@ public class WmsActionGroup extends BaseBean { @ApiParam(value = "提交步骤序号") private Integer submitStepSeq; - public void setInitAmId(Long initAmId) { - this.initAmId = initAmId == null ? 0 : this.initAmId.longValue(); - } - - public void setDetailsAmId(Long detailsAmId) { - this.detailsAmId = detailsAmId == null ? 0 : this.detailsAmId.longValue(); - } - public long getInitAmIdVal() { return this.initAmId == null ? 0 : this.initAmId.longValue(); } From 2e8a70d8b46b5d1664bfcc8b7444cf095feb8005 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 4 Sep 2019 11:20:35 +0800 Subject: [PATCH 02/22] =?UTF-8?q?pom=E7=89=88=E6=9C=AC=E8=BF=98=E5=8E=9F--?= =?UTF-8?q?pojo?= 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-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/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-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 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index ebd53c3..f8fa98e 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-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index e97c0bb..d790ef1 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 90e744d..c6141da 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 0ba3645..23e5bee 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-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6706323..c1e2cb9 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 3681eb6..86d7736 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-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e388a1d..09f2c4a 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 62ebe64..82fdbe8 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 39a7704..0798953 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 e310bfd..ec9e100 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-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index e36fcf7..bd09726 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 81fb02b..4c96781 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 1f622d9..2c24e41 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 bc41914..18c811c 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 93f9732..1171f4e 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 f355cca..f220aa1 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 c9143fed9e6b9c66bac9de98cb799159aa5d6418 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 17 Sep 2019 19:42:56 +0800 Subject: [PATCH 03/22] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 0e53b60..fcf34e6 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 @@ -245,6 +245,16 @@ public class AndonEnumUtil { return tmp; } + public static String codeOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].code, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + public static int descriptionOfValue(String val) { int tmp = -1; for (int i = 0; i < values().length; i++) { From 81128be4e77666b075d53c4b849e92b8fc349911 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 19 Sep 2019 13:46:56 +0800 Subject: [PATCH 04/22] =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E5=8F=91=E7=94=9F=E9=A2=91=E6=AC=A1=EF=BC=8C=20=E5=91=A8?= =?UTF-8?q?=E5=8F=91=E7=94=9F=E9=A2=91=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index db58777..27925ec 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -325,6 +325,14 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "安灯状态集合") private List statusCodeList; + @Transient + @ApiParam(value = "日发生次数") + private int dayTime; + + @Transient + @ApiParam(value = "周发生次数") + private int weekendsTime; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; From d273159e3eafc6884b9b6c394a9682ae1bcd19be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Thu, 19 Sep 2019 16:23:37 +0800 Subject: [PATCH 05/22] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=8A=B6=E6=80=81=EF=BC=88=E8=A7=84=E5=88=99?= =?UTF-8?q?=E8=A1=A8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/engine/rule/WmsSNNextStatusRule.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/WmsSNNextStatusRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/WmsSNNextStatusRule.java index 1f74f53..f456573 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/WmsSNNextStatusRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/WmsSNNextStatusRule.java @@ -23,6 +23,8 @@ public class WmsSNNextStatusRule { private int srcSNStatusCode; // 目的条码状态 private int destSNStatusCode; + // 目的条码的质量状态 + private int destQCStatusCode; public int getTransTypeCode() { return transTypeCode; @@ -79,4 +81,12 @@ public class WmsSNNextStatusRule { public void setDefaultInStock(boolean defaultInStock) { this.defaultInStock = defaultInStock; } + + public int getDestQCStatusCode() { + return destQCStatusCode; + } + + public void setDestQCStatusCode(int destQCStatusCode) { + this.destQCStatusCode = destQCStatusCode; + } } From d82e025eb9c81fd27e5b28d3db5285d61e13a04f Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 19 Sep 2019 16:36:13 +0800 Subject: [PATCH 06/22] =?UTF-8?q?dev=E7=8E=AF=E5=A2=83pom=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9=E4=B8=BAdev?= 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-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/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-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 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index f8fa98e..ebd53c3 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-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d790ef1..e97c0bb 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 c6141da..90e744d 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 23e5bee..0ba3645 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-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index c1e2cb9..6706323 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 86d7736..3681eb6 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-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 09f2c4a..e388a1d 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 82fdbe8..62ebe64 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 0798953..39a7704 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 ec9e100..e310bfd 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-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index bd09726..e36fcf7 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 4c96781..81fb02b 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 2c24e41..1f622d9 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 18c811c..bc41914 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 1171f4e..93f9732 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 f220aa1..f355cca 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 87f8dc38a6a5aa59a72398e88af793fecd1ddc1e Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 19 Sep 2019 18:57:24 +0800 Subject: [PATCH 07/22] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= 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 +- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 46 ++++++++++++++++++++++ modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/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-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 +- 18 files changed, 63 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index ebd53c3..f8fa98e 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 b6adafd..4426ba9 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 e97c0bb..d790ef1 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-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 17335f3..1505f7f 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 @@ -106,6 +106,52 @@ public class AndonEnumUtil { } /** + * 统计方式 + * 10-是，20-否 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum COUNT_TYPE { + DAY("10","按照天统计"), + WEEKEND("20","按照周统计"); + + private String value; + private String description; + + COUNT_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = ""; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** * 按灯状态 * 10-是，20-否 */ diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 90e744d..c6141da 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 0ba3645..23e5bee 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-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6706323..c1e2cb9 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 3681eb6..86d7736 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-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e388a1d..09f2c4a 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 62ebe64..82fdbe8 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 39a7704..0798953 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 e310bfd..ec9e100 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-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index e36fcf7..bd09726 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 81fb02b..4c96781 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 1f622d9..2c24e41 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 bc41914..18c811c 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 93f9732..1171f4e 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 f355cca..f220aa1 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 b473fd1b46986feaae6d5cea490e38ae855dfd53 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 19 Sep 2019 19:36:38 +0800 Subject: [PATCH 08/22] =?UTF-8?q?pojo=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=20=20pom=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9=E4=B8=BAdev?= 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-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/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-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 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index f8fa98e..ebd53c3 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 4426ba9..b6adafd 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 d790ef1..e97c0bb 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 c6141da..90e744d 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 23e5bee..0ba3645 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-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index c1e2cb9..6706323 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 86d7736..3681eb6 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-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 09f2c4a..e388a1d 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 82fdbe8..62ebe64 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 0798953..39a7704 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 ec9e100..e310bfd 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-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index bd09726..e36fcf7 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 4c96781..81fb02b 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 2c24e41..1f622d9 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 18c811c..bc41914 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 1171f4e..93f9732 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 f220aa1..f355cca 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 9b0c5de954e17eb61ccfa731bca5a45fbd233a52 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Fri, 20 Sep 2019 08:57:10 +0800 Subject: [PATCH 09/22] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 141 +++++++++++++++++++-- .../i3plus/pojo/base/tool/DdlPreparedPack.java | 34 +++++ .../i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java | 4 + .../mes/pcn/repository/MesCellFeedRepository.java | 14 ++ .../mes/pcn/repository/MesRawPartSnRepository.java | 15 +++ .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 38 +++++- .../estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java | 7 +- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 10 +- 8 files changed, 238 insertions(+), 25 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.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 4643e50..ba4e524 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 @@ -13,13 +13,12 @@ public class MesPcnEnumUtil { /** * mes-pcn定时任务状态 - * */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_PCN_TASK_STATUS{ + public enum MES_PCN_TASK_STATUS { - OPEN(1,"OPEN"), - CLOSE(2,"CLOSE"); + OPEN(1, "OPEN"), + CLOSE(2, "CLOSE"); private int value; private String description; @@ -50,13 +49,12 @@ public class MesPcnEnumUtil { /** * mes-pcn定时任务同步结果状态 - * */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_PCN_TASK_SYNC_STATUS{ + public enum MES_PCN_TASK_SYNC_STATUS { - SUCCESS(1,"mes主服务定时任务工作清单同步成功"), - ERROR(2,"mes主服务定时任务工作清单同步失败"); + SUCCESS(1, "mes主服务定时任务工作清单同步成功"), + ERROR(2, "mes主服务定时任务工作清单同步失败"); private int value; private String description; @@ -90,10 +88,10 @@ public class MesPcnEnumUtil { * 10. */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SYNC_PATTERN{ + public enum SYNC_PATTERN { - UPDATE(1,"修改或新增"), - INSERT(2,"新增"); + UPDATE(1, "修改或新增"), + INSERT(2, "新增"); private int value; private String description; @@ -127,10 +125,10 @@ public class MesPcnEnumUtil { * 10. */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SYNC_TYPE{ + public enum SYNC_TYPE { - GET_MES_DATA(1,"pcn获取mes数据"), - DATA_TO_MES(2,"pcn推送数据至mes"); + GET_MES_DATA(1, "pcn获取mes数据"), + DATA_TO_MES(2, "pcn推送数据至mes"); private int value; private String description; @@ -232,4 +230,119 @@ public class MesPcnEnumUtil { } } + /** + * RAW_PART_TYPE 原材料类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RAW_PART_TYPE { + + RAW(10, "lotNo", "原材料"), + SEMIFINISHED(20, "fixLotNo", "半成品"); + + private int value; + private String code; + private String description; + + RAW_PART_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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; + } + } + + /** + * RAW_PART_STATUS 原材料状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RAW_PART_STATUS { + + READY(10, "待投料"), + ALREADY(20, "已投料"); + + private int value; + private String description; + + RAW_PART_STATUS(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; + } + } + + /** + * PROCESS_BOM_ISFEED 是否投料 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROCESS_BOM_ISFEED { + + FEED(1, "投料"), + NOT_FEED(2, "不投料"); + + private int value; + private String description; + + PROCESS_BOM_ISFEED(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/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 55c08ca..edb8348 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -395,6 +395,18 @@ public class DdlPreparedPack { } /** + * 封装String对象成小于不等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringSmallerNotEqualPack(Object data, String columnName, DdlPackBean packBean) { + if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { + packBean.addColumnQuery("s_"+columnName," and model." + columnName + " < :m_s_" + columnName, data); + } + } + + /** * 封装double对象成大于语句 * * @param columnName 列名 @@ -405,6 +417,17 @@ public class DdlPreparedPack { packBean.addColumnQuery(columnName," and model." + columnName + " > :m_" + columnName, data); } } + /** + * 封装double对象成大于等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerEqualPack(Object data, String columnName, DdlPackBean packBean) { + if (data != null && Double.parseDouble(data.toString()) > 0) { + packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, data); + } + } /** * 封装double对象成小于语句 @@ -417,6 +440,17 @@ public class DdlPreparedPack { packBean.addColumnQuery(columnName," and model." + columnName + " < :m_" + columnName, data); } } + /** + * 封装double对象成小于等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerEqualPack(Object data, String columnName, DdlPackBean packBean) { + if (data != null && Double.parseDouble(data.toString()) > 0) { + packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, data); + } + } /** * 封装long或者int的整数对象成equal语句(不等于) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java index f1cae75..3758a35 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java @@ -70,6 +70,10 @@ public class MesPcnSyncCfg extends BaseBean { @ApiParam(value="从数据库抽取的最大值 目前为分钟为限制") private Integer extractGap; + @Column(name="EXTRACT_CONDITION") + @ApiParam(value="从数据库抽取的条件限制") + private String extractCondition; + public int getSyncFrequencyVal() { return this.syncFrequency == null ? 0 : this.syncFrequency; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java new file mode 100644 index 0000000..462dff4 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeed; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/18 10:05 AM + * @Description: + **/ +@Repository +public interface MesCellFeedRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java new file mode 100644 index 0000000..1f048c1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeed; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRawPartSn; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/18 10:05 AM + * @Description: + **/ +@Repository +public interface MesRawPartSnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index 2ae42f4..84b0dff 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -1,10 +1,11 @@ package cn.estsh.i3plus.pojo.mes.pcn.sqlpack; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesConfig; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate; +import cn.estsh.i3plus.pojo.mes.pcn.bean.*; import org.apache.commons.lang3.StringUtils; /** @@ -16,6 +17,7 @@ import org.apache.commons.lang3.StringUtils; **/ public class MesHqlPack { + /** * 通用查询条件 * @@ -52,6 +54,7 @@ public class MesHqlPack { /** * 根据打印模板的模板代码查询模板信息 + * * @param organizeCode * @param mesLabelTemplate * @return @@ -63,4 +66,35 @@ public class MesHqlPack { return packBean; } + /** + * 获取工作中心下所有的投料数据 + * @param mesCellFeed + * @param org + * @return + */ + public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean); + return packBean; + } + + + /** + * 获取原材料扫描信息的对应工序BOM + * @param mesProcessBom + * @param mesRawPartSn + * @return + */ + public static DdlPackBean getMesProcessBomRawPartSn(MesProcessBom mesProcessBom, MesRawPartSn mesRawPartSn) { + DdlPackBean packBean = getAllBaseData(mesProcessBom.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(mesProcessBom.getPartNo(), "partNo", packBean); + DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(),"isFeed",packBean); + DdlPreparedPack.getStringEqualPack(mesRawPartSn.getPartNo(), "itemPartNo", packBean); + return packBean; + } + + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java index 5a2d40c..046faba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java @@ -57,7 +57,7 @@ public class MesPcnSyncCfg extends BaseBean { @ApiParam("同步方式") private Integer syncPattern; - @Column(name="SYNC_TYPE")//1\pcn获取mes数据 2、pcn推送数据至mes + @Column(name="SYNC_TYPE")//1.pcn获取mes数据 2.pcn推送数据至mes @ApiParam("同步类型") private Integer syncType; @@ -66,11 +66,14 @@ public class MesPcnSyncCfg extends BaseBean { @ApiParam(value ="上一同步时间") private String lastSyncTime; - @Column(name="EXTRACT_GAP") @ApiParam(value="从数据库抽取的最大值 目前为分钟为限制") private Integer extractGap; + @Column(name="EXTRACT_CONDITION") + @ApiParam(value="从数据库抽取的条件限制") + private String extractCondition; + public int getSyncFrequencyVal() { return this.syncFrequency == null ? 0 : this.syncFrequency; } 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 19d1974..2286752 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 @@ -730,6 +730,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesProcessBom.getItemPartNo(), "itemPartNo", packBean); DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getNumEqualPack(mesProcessBom.getIsFeed(), "isFeed", packBean); DdlPreparedPack.getNumNOEqualPack(mesProcessBom.getId(), "id", packBean); return packBean; } @@ -799,13 +800,8 @@ public class MesHqlPack { */ public static DdlPackBean getMesKeyData(MesKeyData keyData, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode); - if (StringUtils.isNotEmpty(keyData.getKeyDataCode())) { - DdlPreparedPack.getStringLikerPack(keyData.getKeyDataCode(), "keyDataCode", packBean); - } - if (StringUtils.isNotEmpty(keyData.getKeyDataName())) { - DdlPreparedPack.getStringLikerPack(keyData.getKeyDataName(), "keyDataName", packBean); - } - + DdlPreparedPack.getStringLikerPack(keyData.getKeyDataCode(), "keyDataCode", packBean); + DdlPreparedPack.getStringLikerPack(keyData.getKeyDataName(), "keyDataName", packBean); return packBean; } From 8570b887617877bbc4dea8f0ac84f81c837349ff Mon Sep 17 00:00:00 2001 From: wangjie Date: Fri, 20 Sep 2019 09:05:24 +0800 Subject: [PATCH 10/22] =?UTF-8?q?mes=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 8 +- .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 8 + .../cn/estsh/i3plus/pojo/mes/bean/MesStatus.java | 50 +++++ .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 12 ++ .../i3plus/pojo/mes/bean/MesWorkOrderLog.java | 222 +++++++++++++++++++++ .../pojo/mes/model/MesWorkOrderButtonModel.java | 10 +- .../mes/repository/MesWorkOrderLogRepository.java | 17 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 31 +-- 8 files changed, 338 insertions(+), 20 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStatus.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkOrderLogRepository.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 eca112e..905670b 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 @@ -394,9 +394,9 @@ public class MesEnumUtil { CREATE(10, "创建"), LANDED(20, "下达"), - OPEN(30, "开启"), + OPEN(30, "启动"), PAUSE(40, "暂停"), - CANCEL(50, "撤销"), + CANCEL(50, "取消"), CLOSE(60, "关闭"); private int value; @@ -552,7 +552,9 @@ public class MesEnumUtil { MES("MES", "来源于MES"), AMES("AMES", "来源于AMES"), - SAP("SAP", "来源于SAP"); + SAP("SAP", "来源于SAP"), + CREATE("CREATE", "手工新增"), + RESOLVE("RESOLVE", "计划分解"); private String value; private String description; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index e28e0e0..dd8dc61 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -119,6 +119,14 @@ public class MesWorkOrder extends BaseBean { @ApiParam("审批状态") private Integer approvalStatus; + @Column(name="CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name="CUST_ORDER_NO") + @ApiParam("客户订单号") + private String custOrderNo; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStatus.java new file mode 100644 index 0000000..1f1d8c2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStatus.java @@ -0,0 +1,50 @@ +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; + +/** + * @Description :mes状态配置表 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-09-19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_STATUS") +@Api("系统业务动作") +public class MesStatus extends BaseBean { + @Column(name="STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name="STATUS_NAME") + @ApiParam("状态名称") + private String statusName; + + @Column(name="STATUS_VALUE") + @ApiParam("状态值") + private Integer statusValue; + + @Column(name="STATUS_FIELD") + @ApiParam("状态字段") + private String statusField; + + public int getStatusValueVal() { + return this.statusValue == null ? 0 : this.statusValue; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 81037ba..308024e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -132,6 +132,14 @@ public class MesWorkOrder extends BaseBean { @ApiParam("审批状态") private Integer approvalStatus; + @Column(name="CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name="CUST_ORDER_NO") + @ApiParam("客户订单号") + private String custOrderNo; + /********************** 冗余字段 *********************************/ @Transient @ApiParam(value="工作中心名称") @@ -150,6 +158,10 @@ public class MesWorkOrder extends BaseBean { public String shiftName; @Transient + @ApiParam(value="班组名称") + public String shiftGroupName; + + @Transient @ApiParam(value="产品配置名称") public String prodCfgName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java new file mode 100644 index 0000000..e48bba7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java @@ -0,0 +1,222 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel; +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 javax.persistence.Transient; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-19-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_WORK_ORDER_LOG") +@Api("生产工单日志") +public class MesWorkOrderLog extends BaseBean { + @Column(name="ORDER_NO") + @ApiParam("工单号") + private String orderNo; + + @Column(name="PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name="PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name="QTY") + @ApiParam("数量") + private Double qty; + + @Column(name="COMPLETE_QTY") + @ApiParam("完成数量") + private Double completeQty; + + @Column(name="REPAIR_QTY") + @ApiParam("返修数量") + private Double repairQty; + + @Column(name="SCRAP_QTY") + @ApiParam("报废数量") + private Double scrapQty; + + @Column(name="SEQ") + @ApiParam("工单序号") + private Double seq; + + @Column(name="WO_STATUS") + @ApiParam("工单状态") + private Integer workOrderStatus; + + @Column(name="WO_TYPE") + @ApiParam("工单类型") + private Integer workOrderType; + + @Column(name="NEXT_ORDER") + @ApiParam("下一工单") + private String nextOrder; + + @Column(name="PLAN_ORDER_NO") + @ApiParam("生产计划单号") + private String planOrderNo; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name="SCHEDULE_DATE") + @ApiParam("排产日期") + private String scheduleDate; + + @Column(name="CUST_PROD_LINE_CODE") + @ApiParam("客户产线代码") + private String custProdLineCode; + + @Column(name="SHIFT_CODE") + @ApiParam("班次") + private String shiftCode; + + @Column(name="START_TIME") + @ApiParam("开始时间") + private String startTime; + + @Column(name="END_TIME") + @ApiParam("结束时间") + private String endTime; + + @Column(name="WO_SOURCE") + @ApiParam("工单来源") + private String workOrderSource; + + @Column(name="MEMO") + @ApiParam("备注") + private String memo; + + @Column(name="SHIFT_GROUP") + @ApiParam("班组") + private String shiftGroup; + + @Column(name="APPROVAL_STATUS") + @ApiParam("审批状态") + private Integer approvalStatus; + + @Column(name="CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name="CUST_ORDER_NO") + @ApiParam("客户订单号") + private String custOrderNo; + + /********************** 冗余字段 *********************************/ + @Transient + @ApiParam(value="工作中心名称") + public String workCenterName; + + @Transient + @ApiParam(value="工作单元名称") + public String workCellName; + + @Transient + @ApiParam(value="客户产线名称") + public String custProdLineName; + + @Transient + @ApiParam(value="班次名称") + public String shiftName; + + @Transient + @ApiParam(value="班组名称") + public String shiftGroupName; + + @Transient + @ApiParam(value="产品配置名称") + public String prodCfgName; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59") + public String startTimeStart; + + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划开始日期查询用，查询截至日期",example = "2018-12-31 23:59:59") + public String startTimeEnd; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划结束日期查询用，查询结束日期起始",example = "2018-12-31 23:59:59") + public String endTimeStart; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59") + public String endTimeEnd; + + @Transient + @ApiParam("mes生产工单页面按钮控制") + private MesWorkOrderButtonModel workOrderButtonModel; + + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public double getCompleteQtyVal() { + return this.completeQty == null ? 0.0d : this.completeQty; + } + + public double getRepairQtyVal() { + return this.repairQty == null ? 0.0d : this.repairQty; + } + + public double getScrapQtyVal() { + return this.scrapQty == null ? 0.0d : this.scrapQty; + } + + public double getSeqVal() { + return this.seq == null ? 0.0d : this.seq; + } + + public int getWorkOrderStatusVal() { + return this.workOrderStatus == null ? 0 : this.workOrderStatus; + } + + public int getWorkOrderTypeVal() { + return this.workOrderType == null ? 0 : this.workOrderType; + } + + public int getApprovalStatusVal() { + return this.approvalStatus == null ? 0 : this.approvalStatus; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java index 175de3e..1d37fff 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java @@ -23,14 +23,14 @@ public class MesWorkOrderButtonModel implements Serializable { @ApiParam("修改按钮") private boolean updateButton; - @ApiParam("按配置修改按钮") - private boolean updateButton4Config; +// @ApiParam("按配置修改按钮") +// private boolean updateButton4Config; @ApiParam("下达按钮") private boolean transmitButton; - @ApiParam("测试动态下达按钮") - private boolean dynamicTransmitButton4Test; +// @ApiParam("测试动态下达按钮") +// private boolean dynamicTransmitButton4Test; @ApiParam("启动按钮") private boolean startUpButton; @@ -38,7 +38,7 @@ public class MesWorkOrderButtonModel implements Serializable { @ApiParam("暂停按钮") private boolean suspendButton; - @ApiParam("撤销按钮") + @ApiParam("取消按钮") private boolean revokeButton; @ApiParam("关闭按钮") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkOrderLogRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkOrderLogRepository.java new file mode 100644 index 0000000..c8a76e4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkOrderLogRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderLog; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-19-17:13 + * @Modify: + **/ +@Repository +public interface MesWorkOrderLogRepository extends BaseRepository { +} 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 fb9eb70..f6995fd 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 @@ -154,31 +154,38 @@ public class MesHqlPack { if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean); } - if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCellCode())) { - DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCellCode(), "workCellCode", packBean); + if (mesWorkOrder.getApprovalStatus() != null) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getApprovalStatus(), "approvalStatus", packBean); } if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); } - if (StringUtils.isNotEmpty(mesWorkOrder.getProdCfgCode())) { - DdlPreparedPack.getStringEqualPack(mesWorkOrder.getProdCfgCode(), "prodCfgCode", packBean); + if (StringUtils.isNotEmpty(mesWorkOrder.getCustOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean); } if (StringUtils.isNotEmpty(mesWorkOrder.getPlanOrderNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); } + if (StringUtils.isNotEmpty(mesWorkOrder.getCreateUser())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean); + } if (mesWorkOrder.getIsValid() != null) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean); } // 时间段查询 -// DdlPreparedPack.timeBuilder( -// mesWorkOrder.getStartTimeStart(), -// mesWorkOrder.getStartTimeEnd(), -// "startTime", packBean, true); -// DdlPreparedPack.timeBuilder( -// mesWorkOrder.getEndTimeStart(), -// mesWorkOrder.getEndTimeEnd(), -// "endTime", packBean, true); + DdlPreparedPack.timeBuilder( + mesWorkOrder.getStartTimeStart(), + mesWorkOrder.getStartTimeEnd(), + "startTime", packBean, true); + DdlPreparedPack.timeBuilder( + mesWorkOrder.getEndTimeStart(), + mesWorkOrder.getEndTimeEnd(), + "endTime", packBean, true); + DdlPreparedPack.timeBuilder( + mesWorkOrder.getCreateDateTimeStart(), + mesWorkOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); DdlPreparedPack.getOrderDefault(mesWorkOrder); DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean); return packBean; From f57dd8e999f46d8e602785664433ae98280e4322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 20 Sep 2019 09:38:40 +0800 Subject: [PATCH 11/22] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=A1=A8=E3=80=81=E5=BA=93=E5=AD=98=E6=9D=A1=E7=A0=81=E3=80=81?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=E4=B8=89=E5=BC=A0=E8=A1=A8=E5=BF=AB?= =?UTF-8?q?=E7=85=A7=E6=97=B6=E9=97=B4=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 5 files changed, 20 insertions(+) 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 d16a300..9fb8432 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 @@ -177,6 +177,11 @@ public class WmsMoveDetails extends BaseBean { @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") public Integer lockVersion; + + @Transient + @ApiParam(value = "快照时间") + private String snapshotTime; + /* @JSONField(name="fPartNo") public String getfPartNo() { return fPartNo; 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 921d32d..783f5d4 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 @@ -148,6 +148,10 @@ public class WmsMoveMaster extends BaseBean { @ApiParam("获取数量大于0") private Integer qtyIdentity; + @Transient + @ApiParam(value = "快照时间") + private String snapshotTime; + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index aab7504..a43c74b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -188,6 +188,10 @@ public class WmsMoveSn extends BaseBean { @ApiParam(value = "乐观锁", example = "1") public Integer lockVersion; + @Transient + @ApiParam(value = "快照时间") + private String snapshotTime; + public WmsMoveSn() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index cc09433..542f9f4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -152,6 +152,9 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "移动单条码集合") private List wmsMoveSnList; + @Transient + @ApiParam(value = "快照时间") + private String snapshotTime; public String getAreaNo() { return areaNo; 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 6b721bd..db9b615 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 @@ -239,6 +239,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "目标数量") public Double destQty; + @Transient + @ApiParam(value = "快照时间") + private String snapshotTime; + public WmsStockSn(){} public WmsStockSn(String partNo){ From f6e9dd03b441bf2746e4d79b88f711c5ef91e6cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 20 Sep 2019 10:10:03 +0800 Subject: [PATCH 12/22] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=BF=AB=E7=85=A7job?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E3=80=90=E4=BB=BB=E5=8A=A11011=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/repository/IWmsCheckPointRepository.java | 18 ++++++++++++++++++ .../repository/IWmsMoveDetailsSnapshotRepository.java | 18 ++++++++++++++++++ .../repository/IWmsMoveMasterSnapshotRepository.java | 18 ++++++++++++++++++ .../wms/repository/IWmsMoveSnSnapshotRepository.java | 18 ++++++++++++++++++ .../repository/IWmsStockQuanSnapshotRepository.java | 17 +++++++++++++++++ .../wms/repository/IWmsStockSnSnapshotRepository.java | 18 ++++++++++++++++++ 6 files changed, 107 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsCheckPointRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveDetailsSnapshotRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveMasterSnapshotRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveSnSnapshotRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockQuanSnapshotRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockSnSnapshotRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsCheckPointRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsCheckPointRepository.java new file mode 100644 index 0000000..1ce42ce --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsCheckPointRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsCheckPoint; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsStockQuanSnapshot; +import org.springframework.stereotype.Repository; + +/** +* @Description : 快照表 +* @Reference : +* @author: amy.liu +* @date: 2019/9/19 14:22 +* @Modify: +*/ + +@Repository +public interface IWmsCheckPointRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveDetailsSnapshotRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveDetailsSnapshotRepository.java new file mode 100644 index 0000000..6cad3c1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveDetailsSnapshotRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveDetailsSnapshot; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveMasterSnapshot; +import org.springframework.stereotype.Repository; + +/** +* @Description : 快照表 +* @Reference : +* @author: amy.liu +* @date: 2019/9/19 14:22 +* @Modify: +*/ + +@Repository +public interface IWmsMoveDetailsSnapshotRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveMasterSnapshotRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveMasterSnapshotRepository.java new file mode 100644 index 0000000..dc4a0ef --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveMasterSnapshotRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveMasterSnapshot; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsStockSnSnapshot; +import org.springframework.stereotype.Repository; + +/** +* @Description : 快照表 +* @Reference : +* @author: amy.liu +* @date: 2019/9/19 14:22 +* @Modify: +*/ + +@Repository +public interface IWmsMoveMasterSnapshotRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveSnSnapshotRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveSnSnapshotRepository.java new file mode 100644 index 0000000..8e6dc83 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsMoveSnSnapshotRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveDetailsSnapshot; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsMoveSnSnapshot; +import org.springframework.stereotype.Repository; + +/** +* @Description : 快照表 +* @Reference : +* @author: amy.liu +* @date: 2019/9/19 14:22 +* @Modify: +*/ + +@Repository +public interface IWmsMoveSnSnapshotRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockQuanSnapshotRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockQuanSnapshotRepository.java new file mode 100644 index 0000000..13b4bfe --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockQuanSnapshotRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsStockQuanSnapshot; +import org.springframework.stereotype.Repository; + +/** +* @Description : 库存信息快照 +* @Reference : +* @author: amy.liu +* @date: 2019/9/19 14:22 +* @Modify: +*/ + +@Repository +public interface IWmsStockQuanSnapshotRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockSnSnapshotRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockSnSnapshotRepository.java new file mode 100644 index 0000000..4aacb33 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsStockSnSnapshotRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsCheckPoint; +import cn.estsh.i3plus.pojo.wms.bean.snapshot.WmsStockSnSnapshot; +import org.springframework.stereotype.Repository; + +/** +* @Description : 快照表 +* @Reference : +* @author: amy.liu +* @date: 2019/9/19 14:22 +* @Modify: +*/ + +@Repository +public interface IWmsStockSnSnapshotRepository extends BaseRepository { +} From 9b82b0be2a6d5c334a90e147d1f80ec645704fdf Mon Sep 17 00:00:00 2001 From: wangjie Date: Fri, 20 Sep 2019 11:47:34 +0800 Subject: [PATCH 13/22] =?UTF-8?q?mes=E7=8F=AD=E7=BB=84=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 3 --- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 308024e..13a3217 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -14,8 +13,6 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; -import java.util.Arrays; -import java.util.List; /** * @Description: 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 f6995fd..0ee655a 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 @@ -363,6 +363,24 @@ public class MesHqlPack { } /** + * MES班组信息查询条件封装 + * @param shiftGroup + * @param organizeCode + * @return + */ + public static DdlPackBean getMesShiftGroup(MesShiftGroup shiftGroup, String organizeCode) { + + DdlPackBean packBean = getAllBaseDataByNormalPro(shiftGroup, organizeCode); + if (StringUtils.isNotEmpty(shiftGroup.getGroupCode())) { + DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupCode(), "groupCode", packBean); + } + if (StringUtils.isNotEmpty(shiftGroup.getGroupName())) { + DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupName(), "groupName", packBean); + } + return packBean; + } + + /** * MES班次休息信息查询条件封装 * * @param shiftRest From 37701bed628f3fb402654f9cbba421942aff0c9a Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Fri, 20 Sep 2019 11:57:02 +0800 Subject: [PATCH 14/22] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 eca112e..5133716 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 @@ -1037,9 +1037,10 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CONFIG_TYPE { - FASTDFS_SAVE_PATH(10, "savePath"), - NGINX_IP(20, "nginxIp"); - + FASTDFS_SAVE_PATH(10, "SAVE_PATH"), + NGINX_IP(20, "NGINX_IP"), + MES_STATION_SOCKET(30,"MES_STATION_SOCKET"), + GATEWAY_IP(40,"GATEWAY_IP"); private int value; private String description; From 53dd9cface0e506ff7e76b4382bb862599e57c27 Mon Sep 17 00:00:00 2001 From: "bleakney.liu" Date: Fri, 20 Sep 2019 15:22:20 +0800 Subject: [PATCH 15/22] =?UTF-8?q?add=20=E7=89=A9=E6=B5=81=E8=B7=AF?= =?UTF-8?q?=E7=BA=BFpojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsPartRouting.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java | 13 +++++---- ...pository.java => WmsRoutingRuleRepository.java} | 2 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 32 ++++++++++++++++++++++ 4 files changed, 42 insertions(+), 7 deletions(-) rename modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/{WmsRoutingRoleRepository.java => WmsRoutingRuleRepository.java} (86%) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java index 0be04b6..5adc7d5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java @@ -37,7 +37,7 @@ public class WmsPartRouting extends BaseBean { @Column(name = "ROUTING_CODE") @ApiParam(value = "线路编号") - private String areaNo; + private String routingCode; public WmsPartRouting(){} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index d013c16..9d5414b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -51,13 +51,13 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "规则类型(10 推动规则，20 补货规则)", example ="10") private Integer ruleType; - @Column(name = "ZONE_NO_SRC") + @Column(name = "SRC_ZONE_NO") @ApiParam(value = "源存储区") - private String zoneNoSrc; + private String srcZoneNo; - @Column(name = "ZONE_NO_TARGET") + @Column(name = "DEST_ZONE_NO") @ApiParam(value = "目标存储区" , example = "2") - private String zoneNoTarget; + private String destZoneNo; @Column(name = "OP_TYPE_CODE") @ApiParam(value = "作业类型" , example = "2") @@ -79,7 +79,10 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "延迟时间单位(M:分钟，D:天)") private String delayUnit; - + @Column(name = "ROUTING_CODE") + @ApiParam(value = "线路代码") + private String routingCode; + public WmsRoutingRule(){} } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRuleRepository.java similarity index 86% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRuleRepository.java index f081961..5a8967f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRuleRepository.java @@ -12,6 +12,6 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface WmsRoutingRoleRepository extends BaseRepository { +public interface WmsRoutingRuleRepository extends BaseRepository { } 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 ced5ed7..38ae263 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 @@ -2359,4 +2359,36 @@ public class WmsHqlPack { return result; } + + + + /** + * 业务：库存查询封装 + * + * @param wmsStockQuan + * @return + */ + public static DdlPackBean packWmsRouting(WmsRouting wmsRouting) { + DdlPackBean result = new DdlPackBean(); + + + DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result); + DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result); + + getStringBuilderPack(wmsRouting, result); + + return result; + } + + public static DdlPackBean packWmsRoutingRule(WmsRoutingRule wmsRoutingRule) { + DdlPackBean result = new DdlPackBean(); + + + DdlPreparedPack.getNumEqualPack(wmsRoutingRule.getRuleType(), "ruleType", result); +// DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result); + + getStringBuilderPack(wmsRoutingRule, result); + + return result; + } } From 2d911c425768c060fb0e326addab1fd92e4d2f1e Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 20 Sep 2019 15:40:33 +0800 Subject: [PATCH 16/22] =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 2 -- 1 file changed, 2 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 1505f7f..cc0ebe0 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 @@ -363,8 +363,6 @@ public class AndonEnumUtil { } - - /** * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测 */ From 9f0f6da4c7f27fc111ac932e1685910b47908b4b Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 20 Sep 2019 18:59:04 +0800 Subject: [PATCH 17/22] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=8E=9F=E5=9B=A0?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=8F=91?= =?UTF-8?q?=E7=94=9F=E9=A2=91=E6=AC=A1=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 27925ec..e03b224 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -333,6 +333,10 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "周发生次数") private int weekendsTime; + @Transient + @ApiParam(value = "事件统计报表该事件描述的总次数") + private int acCodeTime; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; @@ -380,7 +384,9 @@ public class AndonManageQueue extends BaseBean { * @param confirmTime * @param resetTime */ - public AndonManageQueue(String workCenterCode,String workCenterNameRdd,String workCellCode,String workCellNameRdd,String alarmCode,String ecCode,String ecNameRdd,String emCode,String emNameRdd, String callTime,String confirmTime,String resetTime){ + public AndonManageQueue(String acCode, String acNameRdd, String workCenterCode,String workCenterNameRdd,String workCellCode,String workCellNameRdd,String alarmCode,String ecCode,String ecNameRdd,String emCode,String emNameRdd, String callTime,String confirmTime,String resetTime){ + this.acCode = acCode; + this.acNameRdd = acNameRdd; this.workCenterCode = workCenterCode; this.workCenterNameRdd = workCenterNameRdd; this.workCellCode = workCellCode; From adf699f6188573b34099c7e1d4583c00f13177e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 20 Sep 2019 19:01:55 +0800 Subject: [PATCH 18/22] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=E8=A1=A8?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=BF=AB=E7=85=A7=E4=B8=B4=E6=97=B6=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 8 ++++++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 7 +++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 7 +++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 7 +++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 7 +++++++ .../estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java | 3 ++- 6 files changed, 38 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 9fb8432..21a3c0b 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 @@ -182,6 +182,14 @@ public class WmsMoveDetails extends BaseBean { @ApiParam(value = "快照时间") private String snapshotTime; + @Transient + private Integer isSnapshot; + + public Integer getIsSnapshot() { + return isSnapshot == null ? 0 : isSnapshot.intValue(); + } + + /* @JSONField(name="fPartNo") public String getfPartNo() { return fPartNo; 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 783f5d4..8c3b8a2 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 @@ -152,11 +152,18 @@ public class WmsMoveMaster extends BaseBean { @ApiParam(value = "快照时间") private String snapshotTime; + @Transient + private Integer isSnapshot; + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1") // public Integer lockVersion; + public Integer getIsSnapshot() { + return isSnapshot == null ? 0 : isSnapshot.intValue(); + } + public WmsMoveMaster(){}; public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index a43c74b..d743cbe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -192,6 +192,13 @@ public class WmsMoveSn extends BaseBean { @ApiParam(value = "快照时间") private String snapshotTime; + @Transient + private Integer isSnapshot; + + public Integer getIsSnapshot() { + return isSnapshot == null ? 0 : isSnapshot.intValue(); + } + public WmsMoveSn() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 542f9f4..ffa452e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -156,6 +156,13 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "快照时间") private String snapshotTime; + @Transient + private Integer isSnapshot; + + public Integer getIsSnapshot() { + return this.isSnapshot == null ? 0 : this.isSnapshot; + } + public String getAreaNo() { return areaNo; } 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 db9b615..53adc22 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 @@ -243,12 +243,19 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "快照时间") private String snapshotTime; + @Transient + private Integer isSnapshot; + public WmsStockSn(){} public WmsStockSn(String partNo){ this.partNo = partNo; } + public Integer getIsSnapshot() { + return isSnapshot == null ? 0 : isSnapshot.intValue(); + } + public Integer getSnType() { return snType == null ? 0 : snType.intValue();} public Double getQty() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java index dddfab4..f7e6aac 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java @@ -218,7 +218,7 @@ public class WmsStockQuanSnapshot extends BaseBean { public WmsStockQuanSnapshot(String whNo, String zoneNo, String unit, String partNo, String partName, Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, - Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) { + Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty,String snapshotTime) { this.whNo = whNo; this.zoneNo = zoneNo; this.partNo = partNo; @@ -235,6 +235,7 @@ public class WmsStockQuanSnapshot extends BaseBean { this.prodCfgTypeCode = prodCfgTypeCode; this.prodCfgTypeName = prodCfgTypeName; this.scrapQty = scrapQty; + this.snapshotTime =snapshotTime; } public WmsStockQuanSnapshot(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { From a9e369e71697259d8c4f79066f35950d2bb6115e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 20 Sep 2019 19:15:03 +0800 Subject: [PATCH 19/22] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA=E8=BD=AC=E6=8D=A2=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 ++++ 1 file changed, 4 insertions(+) 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 406b93f..0137da0 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 @@ -830,6 +830,10 @@ public class WmsEnumUtil { } return tmp; } + + public static String valueOfDescription(int val) { + return valueOf(val); + } } /** From cf64f0118af02b429962cb8951f323a165cbfac6 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Fri, 20 Sep 2019 20:40:10 +0800 Subject: [PATCH 20/22] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 28 +++++++++++++--------- 1 file changed, 17 insertions(+), 11 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 8c0b5b2..e59a956 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 @@ -50,7 +50,6 @@ public class MesEnumUtil { /** * mes-pcn定时任务状态 - * */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_PCN_TASK_STATUS { @@ -115,7 +114,7 @@ public class MesEnumUtil { public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value.equals(val) ) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -932,15 +931,15 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STEP_PARAM_TYPE { - QUALIFIED(10,"number", "数字"), - DEFECTED(20, "text","字符串"), - SCRAPED(30,"select", "可选值"); + QUALIFIED(10, "number", "数字"), + DEFECTED(20, "text", "字符串"), + SCRAPED(30, "select", "可选值"); private int value; private String code; private String description; - STEP_PARAM_TYPE(int value,String code, String description) { + STEP_PARAM_TYPE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -950,7 +949,9 @@ public class MesEnumUtil { return value; } - public String getCode(){return code;} + public String getCode() { + return code; + } public String getDescription() { return description; @@ -1040,9 +1041,14 @@ public class MesEnumUtil { public enum CONFIG_TYPE { FASTDFS_SAVE_PATH(10, "SAVE_PATH"), - NGINX_IP(20, "NGINX_IP"), - MES_STATION_SOCKET(30,"MES_STATION_SOCKET"), - GATEWAY_IP(40,"GATEWAY_IP"); + NGINX_IP(20, "NGINX_HOST"), + MES_STATION_SOCKET(30, "mes_station_socket"), + GATEWAY_IP(40, "GATEWAY_HOST"), + UPDATE_SYNC_TIME(50, "UPDATE_SYNC_TIME"), + PCN_PULL(60, "PCN_PULL"), + PCN_PUSH(70, "PCN_PUSH"), + FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"); + private int value; private String description; @@ -1113,7 +1119,7 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum COMPANY_TYPE { - RULECODE("ruleCode","规则编码"), + RULECODE("ruleCode", "规则编码"), PREFIX("prefix", "前缀"), PART_NO("partNo", "物料号"), CUST_PART_NO("custPartNo", "客户物料号"), From e02f2bfeee58a4f43b5a1f6ad3e8f14a8a1a7781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Sat, 21 Sep 2019 16:17:22 +0800 Subject: [PATCH 21/22] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E4=B8=B4=E6=97=B6=E5=AD=97=E6=AE=B5=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 4dd4bc7..ba26d44 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -93,4 +93,16 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam(value = "散件移库输入移库数量") @Transient public Double inputMoveQty; + + @Transient + @ApiParam("计划交货日期") + private String planDate; + + @Transient + @ApiParam("计划交货时间") + private String planTime; + + @Transient + @ApiParam("ERP库存地") + private String erpWhNo; } From 310d0f0606d13679058218d750239baa5ce2fcea Mon Sep 17 00:00:00 2001 From: wangjie Date: Sat, 21 Sep 2019 18:30:11 +0800 Subject: [PATCH 22/22] =?UTF-8?q?mes=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 10 +++++++ .../mes/model/MesWorkOrderApprovalDetailModel.java | 29 ++++++++++++++++++++ .../pojo/mes/model/MesWorkOrderApprovalModel.java | 31 ++++++++++++++++++++++ 3 files changed, 70 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderApprovalDetailModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderApprovalModel.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 e59a956..1083bf7 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 @@ -46,6 +46,16 @@ public class MesEnumUtil { } return tmp; } + + public static String valueOfDescription2(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; + } + } + return tmp; + } } /** diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderApprovalDetailModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderApprovalDetailModel.java new file mode 100644 index 0000000..4cd8616 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderApprovalDetailModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Author: wangjie + * @CreateDate: 2019/9/20 9:19 AM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("mes生产工单审批页面数据明细封装model") +public class MesWorkOrderApprovalDetailModel implements Serializable { + + @ApiParam("id") + private Long id; + + @ApiParam("封装的数据值") + private String name; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderApprovalModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderApprovalModel.java new file mode 100644 index 0000000..8ba92d4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderApprovalModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author: wangjie + * @CreateDate: 2019/9/20 9:19 AM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("mes生产工单审批页面数据封装model") +public class MesWorkOrderApprovalModel implements Serializable { + + @ApiParam("表头列名集合") + List tableNames; + + @ApiParam("所有行数据集合：多行数据是集合，每一个所有单元格是一个集合，一个单元格含有多条数据是一个集合") + List>> detailModelsList; + + +}