From e2a7bc43afe0fbf4743a6dbc359893b75e601de6 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 26 Mar 2020 15:48:34 +0800 Subject: [PATCH 01/25] =?UTF-8?q?bug7918=E3=80=907918=20=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E8=A1=A8=E5=9C=A8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=90=8E=EF=BC=8C=E7=BC=BA=E5=B0=91=E4=B8=80=E8=A1=8C?= =?UTF-8?q?=E5=85=B3=E8=81=94=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=EF=BC=88=E6=9B=B4=E6=96=B0=E5=90=8E=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=89=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 41 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 3 +- 2 files changed, 43 insertions(+), 1 deletion(-) 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 4fd1ad6..3d0ef18 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 @@ -5301,4 +5301,45 @@ public class WmsEnumUtil { return tmp; } } + + + /** + * 推送类型单位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QAD_DOC_TYPE { + TYPE_S(10, "s","s"), TYPE_D(20, "d","d"); + + private int value; + private String code; + private String description; + + public String getCode() { + return code; + } + + QAD_DOC_TYPE(int value,String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public 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; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 8688652..468634a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -80,6 +80,7 @@ public class WmsSnOperateRecord extends BaseBean { @Column(name = "ref_sn") @ApiParam(value = "关联二维码") - private String refSN; + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String refSN; } From df1cbc9449b0a36c7211cac2a0b612987047155e Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 3 Apr 2020 11:23:56 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BE=9B=E8=B4=A7?= =?UTF-8?q?=E8=BF=BD=E8=B8=AA=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 45 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsDock.java | 4 +- .../pojo/wms/modelbean/SupplyTrackingModel.java | 23 +++++++++++ pom.xml | 2 +- 4 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/SupplyTrackingModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index fc12b72..f0508c1 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 @@ -5738,4 +5738,49 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 道口类型 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DOCK_TYPE { + WAIT_SEND(10, "收货道口"), + HAS_SENDED(20, "发运道口"); + + private int value; + private String description; + + DOCK_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static DOCK_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java index 8e638b7..2f2f3f9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDock.java @@ -46,6 +46,6 @@ public class WmsDock extends BaseBean { @Column(name="DOCK_TYPE") @ApiParam("道口类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) - private String dockType; + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "DOCK_TYPE") + private Integer dockType; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/SupplyTrackingModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/SupplyTrackingModel.java new file mode 100644 index 0000000..1ad7e14 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/SupplyTrackingModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 收货追踪地图信息 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-02 + * @Modify: + **/ +@Data +@Api("收货追踪地图信息") +public class SupplyTrackingModel { + @ApiParam("供应商经纬度") + private String vendorMap; + + @ApiParam("收货仓库经纬度") + private String rcWarehouseMap; + +} diff --git a/pom.xml b/pom.xml index d90bca1..d53bffb 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 1d16e2d9386260043758bbc9558ddea41acda070 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 3 Apr 2020 13:42:30 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 4 ++-- modules/i3plus-pojo-aps/pom.xml | 4 ++-- modules/i3plus-pojo-base/pom.xml | 4 ++-- modules/i3plus-pojo-form/pom.xml | 4 ++-- modules/i3plus-pojo-hardswitch/pom.xml | 4 ++-- modules/i3plus-pojo-jobflow/pom.xml | 4 ++-- modules/i3plus-pojo-lac/pom.xml | 4 ++-- modules/i3plus-pojo-mes-pcn/pom.xml | 4 ++-- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 4 ++-- modules/i3plus-pojo-platform/pom.xml | 4 ++-- modules/i3plus-pojo-ptl/pom.xml | 4 ++-- modules/i3plus-pojo-report/pom.xml | 4 ++-- modules/i3plus-pojo-softswitch/pom.xml | 4 ++-- modules/i3plus-pojo-sweb/pom.xml | 4 ++-- modules/i3plus-pojo-wms/pom.xml | 4 ++-- modules/i3plus-pojo-workflow/pom.xml | 4 ++-- pom.xml | 2 +- 18 files changed, 35 insertions(+), 35 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index fe8e4eb..683f2ca 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-andon jar - 1.0-${profileActive}-SNAPSHOT + diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f1e9991..9302dfc 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-aps jar - 1.0-${profileActive}-SNAPSHOT + diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f54aca..43b570e 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-${profileActive}-SNAPSHOT + diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 65c6554..712a842 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-form jar - 1.0-${profileActive}-SNAPSHOT + diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0f73e78..1b342e3 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-hardswitch jar - 1.0-${profileActive}-SNAPSHOT + diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 7e73285..d1ea30d 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-jobflow jar - 1.0-${profileActive}-SNAPSHOT + diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 232becd..2caa77a 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-lac jar - 1.0-${profileActive}-SNAPSHOT + diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e65f727..029e278 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-${profileActive}-SNAPSHOT + diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 552f97e..8eb4c89 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-${profileActive}-SNAPSHOT + diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index beba8ba..db98fb6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-${profileActive}-SNAPSHOT + diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 8f191db..0080b0c 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-platform jar - 1.0-${profileActive}-SNAPSHOT + diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index f0a5b7e..24de8cf 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-ptl jar - 1.0-${profileActive}-SNAPSHOT + diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index d9d461d..40a54a6 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-report jar - 1.0-${profileActive}-SNAPSHOT + diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 309d149..fb1816f 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-${profileActive}-SNAPSHOT + diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index f34bc03..590b56c 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-sweb jar - 1.0-${profileActive}-SNAPSHOT + diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index f9e982f..ac9e7dd 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-wms jar - 1.0-${profileActive}-SNAPSHOT + diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index d561047..f153994 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-workflow jar - 1.0-${profileActive}-SNAPSHOT + diff --git a/pom.xml b/pom.xml index 8bf0452..ff1cd2d 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 2bc62e2444f9ac72dcc4014dd632f621740e7273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 7 Apr 2020 14:23:37 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=9A#=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4=20=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E7=94=A8=E6=88=B7=E5=92=8C=E6=9B=B4=E6=96=B0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=B9=9F=E9=9C=80=E8=A6=81=E5=81=9A=E6=88=90=E5=8F=AF?= =?UTF-8?q?=E9=80=89=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 6 ++++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 249411a..a2420d6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -82,7 +82,8 @@ public abstract class BaseBean implements Serializable { @Column(name="CREATE_USER",updatable = false) @ApiParam(value = "创建用户") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, + isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name") public String createUser; @Indexed(direction = IndexDirection.DESCENDING) @@ -94,7 +95,8 @@ public abstract class BaseBean implements Serializable { @Column(name="MODIFY_USER") @ApiParam(value = "修改人") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, + isRequire = 2, entityName = "/wms/inner-order/query/user-list", listColumnName = "name", explicitColumnName = "name") public String modifyUser; @Column(name="MODIFY_DATE_TIME") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 85ec609..ee4fb0f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -177,7 +177,8 @@ public class WmsPart extends BaseBean { @Column(name = "OUT_CLOSE_VENDOR") @ApiParam("结算供应商") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", + searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") private String outCloseVendor; @Column(name = "QUALITY_DAYS") From 2e85d993805e2f307b12f745ad1c70091fa6086f Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 7 Apr 2020 18:00:17 +0800 Subject: [PATCH 05/25] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 2d3d15c..a624677 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import javax.persistence.Transient; import java.io.Serializable; @@ -74,6 +75,10 @@ public class QueueOrderModel implements Serializable { @ApiParam("料架是否已打印") private Integer isGroupPrinted; + @Column(name = "PPT_CODE") + @ApiParam("产品类型名称") + private String pptCode; + public QueueOrderModel() { } @@ -183,8 +188,9 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; } + //getWaitQueueOrderModelNoSn public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String partNo, String partNameRdd, String workType, Double finsihQty, Double qty) { + String partNo, String partNameRdd, String workType, Double finsihQty, Double qty,String pptCode) { this.serialNumber = serialNumber; this.id = id; this.queueSeq = queueSeq; @@ -198,8 +204,9 @@ public class QueueOrderModel implements Serializable { this.finsihQty = finsihQty; this.qty = qty; this.orderNo = orderNo; + this.pptCode=pptCode; } - + //getAlreadyQueueOrderModelNoSn public QueueOrderModel(String serialNumber,String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String partNo, String partNameRdd, String workType) { this.id = id; @@ -214,6 +221,7 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; this.serialNumber=serialNumber; } + //料架分组队列展示组件 public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo, Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) { From 3f3d0038e8605199d23a5aa689d421de959f1e18 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 8 Apr 2020 16:18:12 +0800 Subject: [PATCH 06/25] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1608?= =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E7=9B=91=E5=90=AC=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 78 ++++++++++++++++++++-- .../estsh/i3plus/pojo/mes/bean/MesDataWarning.java | 63 +++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesPartCheck.java | 2 +- ...skNotifyUserModel.java => NotifyUserModel.java} | 2 +- .../mes/repository/MesDataWarningRepository.java | 16 +++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 29 ++++++++ 6 files changed, 183 insertions(+), 7 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{EquTaskNotifyUserModel.java => NotifyUserModel.java} (96%) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataWarningRepository.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 c08db39..3d99d0f 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 @@ -13,6 +13,74 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * 排序方式 + */ + public enum ASC_OR_DESC { + ASC(1, "正序"), DESC(2, "倒序"); + + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private ASC_OR_DESC(int value, String description) { + this.value = value; + this.description = description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 监听任务明细-采集数据方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MONITOR_TASK_DETAIL_COLLECT_TYPE { + SELF_ADDITION(10, "自增列"), + FEED_FIELD(20, "反馈字段"); + + private int value; + private String description; + + MONITOR_TASK_DETAIL_COLLECT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * 动作-module */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -1812,10 +1880,10 @@ public class MesEnumUtil { } /** - * mes设备作业通知配置-通知方式 + * mes通知配置-通知方式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_EQU_TASK_NOTIFY_CFG_PATTERN { + public enum NOTIFY_CFG_PATTERN { EMAIL(10, "邮件"), USERPHONE(20, "手机号"); @@ -1823,7 +1891,7 @@ public class MesEnumUtil { private int value; private String description; - MES_EQU_TASK_NOTIFY_CFG_PATTERN(int value, String description) { + NOTIFY_CFG_PATTERN(int value, String description) { this.value = value; this.description = description; } @@ -4164,8 +4232,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MONITOR_TASK_OBJECT_TYPE { - PLC(10, "PLC"); -// DB(20, "DB"); + PLC(10, "PLC"), + DB(20, "DB"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java new file mode 100644 index 0000000..f422957 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java @@ -0,0 +1,63 @@ +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.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Author: wangjie + * @CreateDate: 2020/04/03 7:12 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DATA_WARNING") +@Api("数据预警配置") +public class MesDataWarning extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8328008752104417017L; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "WARNING_RULE") + @ApiParam("预警规则") + private String warningRule; + + @Column(name = "CHECK_TIME") + @ApiParam("校验时间") + private String checkTime; + + @Column(name = "QTY") + @ApiParam("数据量最大限制(分钟)") + private Integer qty; + + @Column(name = "WARNING_ITEM") + @ApiParam("预警内容项") + private String warningItem; + + @Column(name = "INFORM_MODE") + @ApiParam("通知方式") + private Integer informMode; + + @Lob + @Column(name = "INFORM_USER") + @ApiParam("通知对象") + private String informUser; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java index 13e8069..7fbe7f7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java @@ -53,7 +53,7 @@ public class MesPartCheck extends BaseBean implements Serializable { private String recordNumSpelExpress; @Column(name = "RECORD_NUM_DESC") - @ApiParam("校验表达式") + @ApiParam("校验表达式描述") private String recordNumDesc; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java similarity index 96% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java index 49202fa..9a5b3a8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java @@ -29,7 +29,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @Api("用户信息model") -public class EquTaskNotifyUserModel extends BaseBean { +public class NotifyUserModel extends BaseBean { @ApiParam(value ="账户ID") private Long userInfoId; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataWarningRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataWarningRepository.java new file mode 100644 index 0000000..54da78e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataWarningRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesDataWarning; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesDataWarningRepository 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 5d5916a..b408ff1 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 @@ -2175,9 +2175,15 @@ public class MesHqlPack { if (!StringUtils.isEmpty(monitorTaskDetail.getDataObjectNo())) { DdlPreparedPack.getStringLikerPack(monitorTaskDetail.getDataObjectNo(), "dataObjectNo", packBean); } + if (!StringUtils.isEmpty(monitorTaskDetail.getStoreObjectCode())) { + DdlPreparedPack.getStringLikerPack(monitorTaskDetail.getStoreObjectCode(), "storeObjectCode", packBean); + } if (monitorTaskDetail.getIsValid() != null) { DdlPreparedPack.getNumEqualPack(monitorTaskDetail.getIsValid(), "isValid", packBean); } + if (monitorTaskDetail.getCollectType() != null) { + DdlPreparedPack.getNumEqualPack(monitorTaskDetail.getCollectType(), "collectType", packBean); + } return packBean; } @@ -2283,4 +2289,27 @@ public class MesHqlPack { } return packBean; } + + /** + * 数据预警配置 + * @param dataWarning + * @param organizeCode + * @return + */ + public static DdlPackBean getMesDataWarning(MesDataWarning dataWarning, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(dataWarning, organizeCode); + if(!StringUtils.isEmpty(dataWarning.getObjectCode())){ + DdlPreparedPack.getStringLikerPack(dataWarning.getObjectCode(), "objectCode", packBean); + } + if(!StringUtils.isEmpty(dataWarning.getWarningRule())){ + DdlPreparedPack.getStringLikerPack(dataWarning.getWarningRule(), "warningRule", packBean); + } + if(!StringUtils.isEmpty(dataWarning.getWarningItem())){ + DdlPreparedPack.getStringLikerPack(dataWarning.getWarningItem(), "warningItem", packBean); + } + if(!StringUtils.isEmpty(dataWarning.getInformMode())){ + DdlPreparedPack.getNumEqualPack(dataWarning.getInformMode(), "informMode", packBean); + } + return packBean; + } } From e0a23b147e74e9e601ef78f5a122be17e1e4e9d7 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 8 Apr 2020 17:01:18 +0800 Subject: [PATCH 07/25] mes enum --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 3d99d0f..8e46651 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 @@ -1885,8 +1885,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum NOTIFY_CFG_PATTERN { - EMAIL(10, "邮件"), - USERPHONE(20, "手机号"); + EMAIL(10, "邮件"); +// USERPHONE(20, "手机号"); private int value; private String description; From 5a6c525d1f2ec8ac8653288514ff7c16c5a7bae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 8 Apr 2020 17:56:21 +0800 Subject: [PATCH 08/25] =?UTF-8?q?=E3=80=90MES=5F=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=A8=A1=E5=9E=8B=E5=A2=9E=E5=8A=A0=E6=97=B6?= =?UTF-8?q?=E5=88=86=E7=A7=92=E5=AD=97=E6=AE=B5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index 1454dca..28b8235 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -43,6 +43,15 @@ public class GenSerialNoModel { @ApiParam("日") private String day; + @ApiParam("时") + private String hour; + + @ApiParam("分") + private String minute; + + @ApiParam("秒") + private String second; + @ApiParam("过程条码") private String serialNumber; From 4dee474c738fe8a34d0f41766a4bd49ba75e4437 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 8 Apr 2020 20:30:11 +0800 Subject: [PATCH 09/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9POM=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= 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 | 4 ++-- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f9717e..807bef5 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index a9e288f..b948580 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index a44418c..e12eaee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 50ab2c2..7637865 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index d800ecf..bf96e57 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 8664dd2..409b79a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index d65e031..efacfd2 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index a785f21..dba12cc 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index d6d2f8e..81670b2 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 0fbfb69..26a7311 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 76739f9..eaf2544 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 0368700..0f615b6 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index b2eedd4..9e5f745 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 5fcd08a..0fea52b 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index ff1cd2d..c6f0ba4 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 b7e3aeef41e2dc115e4a62f35e3205cfaaf7cb48 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 8 Apr 2020 21:53:04 +0800 Subject: [PATCH 10/25] =?UTF-8?q?=E3=80=908014=2020011--=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A1=A8=EF=BC=8C=E6=9F=A5=E8=AF=A2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=87=8D=E5=A4=8D---0415=E3=80=91=20=E3=80=908015=202?= =?UTF-8?q?0011--=E6=8A=A5=E5=B7=A5=E8=AE=B0=E5=BD=95=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=A4=E5=88=97=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 e048183..647c116 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 @@ -318,6 +318,14 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "箱数") private Integer boxQty; + @Transient + @ApiParam(value = "是否报工") + private String isReport; + + @Transient + @ApiParam(value = "是否需要报工") + private Integer isReportPartNo; + public WmsStockSn() { } From 1d50c135ac943977970ae3e55d3da8d8ec3f34ab Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 9 Apr 2020 11:45:20 +0800 Subject: [PATCH 11/25] =?UTF-8?q?[=E9=BA=A6=E6=A0=BC=E7=BA=B3=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9A87=20=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 5 +++++ .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 6 ++++++ 2 files changed, 11 insertions(+) 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 535d711..e9f1193 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; +import java.util.List; /** * @Description: @@ -187,6 +188,10 @@ public class MesWorkOrder extends BaseBean implements Serializable { private String areaCodeName; @Transient + @ApiParam("状态-下达，启动，暂停") + private List statusList; + + @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "计划开始日期查询用，查询开始日期", example = "2018-12-31 23:59:59") public String startTimeStart; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index a0d8eaa..da8091d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -6,6 +6,7 @@ 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.bean.*; +import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; /** @@ -177,6 +178,11 @@ public class MesPcnHqlPack { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean); } + // 工单管理，查询下达，启动，暂停状态 + if (!CollectionUtils.isEmpty(mesWorkOrder.getStatusList())){ + DdlPreparedPack.getInPackList(mesWorkOrder.getStatusList(), "workOrderStatus", packBean); + } + // 时间段查询 if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) { DdlPreparedPack.timeBuilder( From 63c827d0dee43730e5add259b5b7e9de01835102 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 9 Apr 2020 14:17:05 +0800 Subject: [PATCH 12/25] =?UTF-8?q?bug8050=E3=80=908050=20=E8=BF=90=E8=BE=93?= =?UTF-8?q?=E8=A7=84=E5=88=99=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2--?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=90=E5=8A=9F=EF=BC=8C=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E6=9C=89=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=BD=86=E6=98=AF?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8D=E6=98=BE=E7=A4=BA=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java index d34d0e6..8d9a807 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java @@ -79,7 +79,7 @@ public class WmsTransportRule extends BaseBean { @ApiParam("是否安排运输") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") - public int isTransport; + public Integer isTransport; @Column(name = "REMARK",length = 255) @ApiParam("备注") From fa42a25b96ec11be5b9341735198e55a18f2a664 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 8 Apr 2020 16:37:47 +0800 Subject: [PATCH 13/25] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 2 +- .../java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 5dbc9ec..7973e88 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -38,7 +38,7 @@ public class CommonEnumUtil { HARDSWITCH(25, 0, 0, "block-hardswitch", "硬件适配器"), LAC(26, 8600, 13, "lac", "连接适配器"), ANDON(27, 8500, 14, "andon", "安灯"), - APS(28, 8400, 15, "i3aps", "高级计划与排程"), + APS(28, 8400, 15, "i3aps", "高级计划与排产"), CENTER(99, 8000, 1, "icloud-server", "注册中心"), SURFACE(98, 0, 0, "i3surface", "对外服务"), CLOUD(97, 0, 0, "i3cloud", "微服务"), diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java index e485855..2beeaa9 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java @@ -235,6 +235,15 @@ public class ReportHqlPack { return result; } + public static DdlPackBean packHqlBrPojoView(BrPojoView bean){ + DdlPackBean result = DdlPackBean.getDdlPackBean(bean); + + DdlPreparedPack.getNumEqualPack(bean.getPojoId(),"pojoId",result); + DdlPreparedPack.getNumEqualPack(bean.getViewType(),"viewType",result); + + return result; + } + public static DdlPackBean packHqlBrPojoViewAttr(BrPojoViewAttr bean){ DdlPackBean result = DdlPackBean.getDdlPackBean(bean); From 14660641baf979e13571e2f47acc4733a0c0b424 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Thu, 9 Apr 2020 16:06:46 +0800 Subject: [PATCH 14/25] =?UTF-8?q?hibernate=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java | 17 +++++++++++++++++ .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 18 ++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index 620fa7d..8141193 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -20,6 +20,23 @@ import java.util.Map; public interface BaseRepository extends JpaRepository { /** + * 清空一级缓存，可能影响service中对象的状态，慎用 + */ + void clearSession(); + + /** + * 清除一级缓存对象，设为游离态 + * @param t + */ + void detachObject(T t); + + /** + * 清除一级缓存集合，设为游离态 + * @param list + */ + void detachList(List list); + + /** * 新增对象
* 注意：如果对象id是long，并且为0，则设为 * 字符串，并且没有赋值，该方法将自动设置为uuid值 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 103be31..24c21ea 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -48,6 +48,24 @@ public class BaseRepositoryImpl extends SimpleJpaRep this.snowflakeIdMaker = snowflakeIdMaker; } + public void clearSession(){ + entityManager.clear(); + } + + public void detachObject(T t){ + entityManager.detach(t); + } + + //集合设置为游离态 + public void detachList(List list){ + if(list != null){ + for(T t : list) { + //设置对象为游离态 + entityManager.detach(t); + } + } + } + private void setParameter(Query query, String[] propName, Object[] propValue) { String name = null; Object value = null; From 01ae9caa8ce0ab76ece2cca922a1ac0391083599 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 9 Apr 2020 18:07:56 +0800 Subject: [PATCH 15/25] task:1496 --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java index e26a736..b7e6d03 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 道口预约信息 @@ -69,4 +70,8 @@ public class WmsDockOrderInfo extends BaseBean { @ApiParam("单据号") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String orderNo; + + @Transient + @ApiParam("库位代码") + private Integer masterStatus; } From 11adb5ff0908afc3098cf462742dee066ed3fab9 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 9 Apr 2020 20:23:03 +0800 Subject: [PATCH 16/25] =?UTF-8?q?[=E9=BA=A6=E6=A0=BC=E7=BA=B3=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9A111=20=E6=A3=80=E6=B5=8B=E9=A1=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8A=A5=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/QcCheckDataModel.java | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java index 1d8e6e8..e568519 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java @@ -88,6 +88,15 @@ public class QcCheckDataModel { @ApiParam(value = "修改日期") private String modifyDatetime; + @ApiParam(value = "工单开始时间") + private String startTime; + + @ApiParam(value = "工单结束时间") + private String endTime; + + @ApiParam(value = "检测时间") + private String checkTime; + public QcCheckDataModel() { } @@ -121,4 +130,44 @@ public class QcCheckDataModel { this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; } + + public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String partNo, String workCenterCode + , String workCellCode, String partName, String modifyUser, String modifyDatetime, String startTime, String endTime) { + this.id = id; + this.organizeCode = organizeCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.partNo = partNo; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.partName = partName; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.startTime = startTime; + this.endTime = endTime; + } + + public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, Integer checkType) { + this.id = id; + this.organizeCode = organizeCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.checkType = checkType; + } + + public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, Integer checkType, String checkItem, String checkStandard, String checkGuide + , String checkFrequency, String checkValue, String checkResult, String sn) { + this.id = id; + this.organizeCode = organizeCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.checkType = checkType; + this.checkItem = checkItem; + this.checkStandard = checkStandard; + this.checkGuide = checkGuide; + this.checkFrequency = checkFrequency; + this.checkValue = checkValue; + this.checkResult = checkResult; + this.sn = sn; + } } From caf8feb3743b7930bd2a81e215cb5d122c2a5769 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 9 Apr 2020 20:59:12 +0800 Subject: [PATCH 17/25] =?UTF-8?q?[=E9=87=87=E9=9B=86=E5=B7=A5=E6=AD=A5?= =?UTF-8?q?=E5=AD=98=E5=85=A5=E7=94=9F=E4=BA=A7=E6=95=B0=E6=8D=AE=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 4c9c79d..dc419c2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.mes.model.ProductDataModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -127,7 +128,7 @@ public class MesPlc extends BaseBean implements Serializable { @Transient @ApiParam("OPC值") - private String opcValue; + private List opcValue; @Column(name = "TOOLING_CODE ") @ApiParam("工装代码") From 4b3923a64d008ecf94d6b16282562a66a3664425 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 10 Apr 2020 00:30:54 +0800 Subject: [PATCH 18/25] =?UTF-8?q?bug8056=E3=80=908056=20car=5Fno,driver=5F?= =?UTF-8?q?no=E8=BF=99=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=AE=B5=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=86=99=E5=9C=A8=E4=BA=8B=E5=8A=A1=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4wms=5Fmove=5Fto=5Ferp=E4=B8=AD?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 4 ++++ 2 files changed, 8 insertions(+) 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 ec13c1e..e85e34c 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 @@ -68,6 +68,10 @@ public class WmsMoveMaster extends BaseBean { @ApiParam(value = "车牌号") private String carNo; + @Column(name = "DRIVER_NO") + @ApiParam("司机") + public String driverNo; + @Column(name = "BUSI_TYPE_CODE") @ApiParam(value = "业务类型编码") @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 2833b2f..c3f31f2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -65,6 +65,10 @@ public class WmsMoveToERP extends BaseBean { @ApiParam(value = "车牌号") private String carNo; + @Column(name = "DRIVER_NO") + @ApiParam("司机") + public String driverNo; + @Column(name="ITEM") @ApiParam(value = "行号") public String item; From 1a743635411cd77f8503c224bdbd873362a1a6ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 10 Apr 2020 11:53:45 +0800 Subject: [PATCH 19/25] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 8 ++++---- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java | 6 +++--- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java | 8 ++++---- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java | 2 +- .../i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java | 2 +- .../estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java | 2 +- .../i3plus/pojo/wms/engine/script/EngineScriptPersistence.java | 2 +- 10 files changed, 19 insertions(+), 18 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 5528099..f42fc1e 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 @@ -49,17 +49,17 @@ public class WmsActionGroup extends BaseBean { @AnnoOutputColumn private String agDescC; - @Column(name = "INIT_AM_ID", columnDefinition = "bigint(20) default 0") + @Column(name = "INIT_AM_ID", columnDefinition = "bigint default 0") @ApiParam(value = "初始化组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long initAmId; - @Column(name = "DETAILS_AM_ID", columnDefinition = "bigint(20) default 0") + @Column(name = "DETAILS_AM_ID", columnDefinition = "bigint default 0") @ApiParam(value = "明细处理组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long detailsAmId; - @Column(name = "END_AM_ID", columnDefinition = "bigint(20) default 0") + @Column(name = "END_AM_ID", columnDefinition = "bigint default 0") @ApiParam(value = "结束组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long endAmId; @@ -82,7 +82,7 @@ public class WmsActionGroup extends BaseBean { private Integer isAutoCommit; @Lob - @Column(name = "POSITION") + @Column(name = "POSITION", columnDefinition = "TEXT") @ApiParam(value = "GOJS位置") private String position; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index 2926428..095ae01 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -100,7 +100,7 @@ public class WmsActionGroupDetails extends BaseBean { @ApiParam(value = "是否预显示") private Integer preShow; - @Column(name = "SHOW_AM_ID", columnDefinition = "bigint(20) default 0") + @Column(name = "SHOW_AM_ID", columnDefinition = "bigint default 0") @ApiParam(value = "回显组件方法ID") @JsonSerialize(using = ToStringSerializer.class) private Long showAmId; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java index f3bb5e0..b96ae52 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java @@ -65,17 +65,17 @@ public class WmsActionLogData extends BaseBean { private String endTime; @Lob - @Column(name = "IN_PARAMS") + @Column(name = "IN_PARAMS", columnDefinition = "TEXT") @ApiParam(value = "输入参数") private String inParams; @Lob - @Column(name = "OUT_PARAMS") + @Column(name = "OUT_PARAMS", columnDefinition = "TEXT") @ApiParam(value = "输出参数") private String outParams; @Lob - @Column(name = "ERROR_MSG") + @Column(name = "ERROR_MSG", columnDefinition = "TEXT") @ApiParam(value = "异常信息") private String errorMsg; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java index dff5890..a941bf2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -53,7 +54,7 @@ public class WmsConfig extends BaseBean { private String configValueType; @Lob - @Column(name="CONFIG_VALUE") + @Column(name="CONFIG_VALUE", columnDefinition = "TEXT") @ApiParam(value ="参数值") private String configValue; 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 ec13c1e..2e8445e 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 @@ -56,7 +56,7 @@ public class WmsMoveMaster extends BaseBean { private String transTypeCode; @Lob - @Column(name = "ERROR_MESSAGE") + @Column(name = "ERROR_MESSAGE", columnDefinition = "TEXT") @ApiParam(value = "错误信息") private String errorMessage; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java index ef75213..f527605 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java @@ -52,12 +52,12 @@ public class WmsPushConfig extends BaseBean{ @Lob @ApiParam("查询Hql") - @Column(name = "HQL_STR") + @Column(name = "HQL_STR", columnDefinition = "TEXT") private String hqlStr; @Lob @ApiParam("查询Sql") - @Column(name = "SQL_STR") + @Column(name = "SQL_STR", columnDefinition = "TEXT") private String sqlStr; @ApiParam("脚本编号") @@ -66,12 +66,12 @@ public class WmsPushConfig extends BaseBean{ @Lob @ApiParam("标题模板") - @Column(name = "TITLE_TEMPLATE") + @Column(name = "TITLE_TEMPLATE", columnDefinition = "TEXT") private String titleTemplate; @Lob @ApiParam("消息体模板") - @Column(name = "CONTENT_TEMPLATE") + @Column(name = "CONTENT_TEMPLATE", columnDefinition = "TEXT") private String contentTemplate; @ApiParam("推送类型") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java index e10dca9..e22e520 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java @@ -36,7 +36,7 @@ public class WmsPushLog extends BaseBean{ private String pushTitle; @Lob - @Column(name = "PUSH_CONTENT") + @Column(name = "PUSH_CONTENT", columnDefinition = "TEXT") @ApiParam("推送内容") private String pushContent; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java index 06890f3..7679f39 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java @@ -60,7 +60,7 @@ public class WmsMoveMasterSnapshot extends BaseBean { private String transTypeCode; @Lob - @Column(name = "ERROR_MESSAGE") + @Column(name = "ERROR_MESSAGE", columnDefinition = "TEXT") @ApiParam(value = "错误信息") private String errorMessage; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java index ab93720..95d0191 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java @@ -39,7 +39,7 @@ public class EngineRulePersistence extends BaseBean { private String ruleName; // 规则的具体内容 @Lob - @Column(name = "RULE_CONTENT") + @Column(name = "RULE_CONTENT", columnDefinition = "TEXT") private String ruleContent; // 规则的描述，包含规则的用法，参数说明等 @Column(name = "RULE_REMARK", length = 2000) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java index da76b34..b41de8e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java @@ -49,7 +49,7 @@ public class EngineScriptPersistence extends BaseBean { // 脚本的具体内容 @Lob - @Column(name = "SCRIPT_CONTENT") + @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") private String scriptContent; // 脚本的描述，包含脚本的用法，参数说明等 From b1018dbd3993a15d65275ab02c838a2822c1964b Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 10 Apr 2020 12:54:17 +0800 Subject: [PATCH 20/25] =?UTF-8?q?[=E5=B9=B3=E5=8F=B0=EF=BC=9B]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlEnumUtil.java | 107 +++++++++++++++++++++ .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 60 +++++++++--- .../i3plus/pojo/ptl/bean/PtlActionModuleParam.java | 54 +++++++++++ .../estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java | 6 ++ .../cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java | 4 - .../i3plus/pojo/ptl/bean/PtlAreaActorAction.java | 7 -- .../pojo/ptl/bean/PtlAreaRouteModuleParam.java | 8 -- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java | 15 --- .../cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java | 10 -- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java | 7 -- .../cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java | 6 -- .../cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java | 7 -- .../cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java | 6 -- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java | 18 ---- .../cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java | 7 -- .../i3plus/pojo/ptl/bean/PtlWindowElement.java | 4 - .../pojo/ptl/bean/PtlWindowElementAttribute.java | 6 -- .../ptl/repository/PtlActionRouteRepository.java | 15 +++ .../estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java | 28 ++++++ 19 files changed, 256 insertions(+), 119 deletions(-) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionRouteRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index 8956db4..4bf2e60 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -11,6 +11,113 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class PtlEnumUtil { /** + * 作业流程类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ACTION_ROUTE_TYPE { + GEN_TASK(10, "GEN_TASK", "生成任务"), + OFF_TAG(20, "OFF_TAG", "灭灯"); + + private int value; + private String code; + private String description; + + ACTION_ROUTE_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; + } + } + + /** + * 状态机执行方法 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_EVENT { + TRIGGER(10, "trigger", "触发"), + ENTRY(20, "entry", "进入状态"), + EXIT(30, "exit", "离开状态"); + + private int value; + private String code; + private String description; + + ROUTE_EVENT(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; + } + } + + /** + * 组件参数类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ACTION_MODULE_PARAM_TYPE { + + QUALIFIED(10, "number", "数字"), + DEFECTED(20, "text", "字符串"), + SCRAPED(30, "select", "可选值"), + BUTTON(40, "button", "按钮"); + + private int value; + private String code; + private String description; + + ACTION_MODULE_PARAM_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; + } + } + + /** * 标签类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 4a4bb65..cab76d0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.util.StringUtils; +import static cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil.MONITOR_PROCESS_MESSAGE_TYPE.*; + /** * @author Wynne.Lu * @date 2020/2/12 17:41 @@ -547,8 +549,11 @@ public class PtlPcnEnumUtil { } + /** + * 状态机执行方法 + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RouteEvent { + public enum ROUTE_EVENT { TRIGGER(10, "trigger", "触发"), ENTRY(20, "entry", "进入状态"), EXIT(30, "exit", "离开状态"); @@ -557,7 +562,7 @@ public class PtlPcnEnumUtil { private String code; private String description; - RouteEvent(int value, String code, String description) { + ROUTE_EVENT(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -576,8 +581,11 @@ public class PtlPcnEnumUtil { } } + /** + * 流程状态 + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RouteState { + public enum ROUTE_STATE { START(10, "START", "开启流程"), TERMINATE(20, "TERMINATE", "终止流程"), FINISH(30, "FINISH", "结束流程"); @@ -586,7 +594,7 @@ public class PtlPcnEnumUtil { private String code; private String description; - RouteState(int value, String code, String description) { + ROUTE_STATE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -605,6 +613,9 @@ public class PtlPcnEnumUtil { } } + /** + * 标签类型 + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TAG_TYPE { BIN_TAG(10, "库位标签"), @@ -639,15 +650,18 @@ public class PtlPcnEnumUtil { } } + /** + * 流程状态-触发类型 + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TriggerType { + public enum TRIGGER_TYPE { INNER_TRIGGER(10, "内部触发"), OUTER_TRIGGER(20, "外部触发"); private int value; private String description; - TriggerType(int value, String description) { + TRIGGER_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -661,8 +675,11 @@ public class PtlPcnEnumUtil { } } + /** + * 作业流程类型 + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RouteType { + public enum ACTION_ROUTE_TYPE { GEN_TASK(10, "GEN_TASK", "生成任务"), OFF_TAG(20, "OFF_TAG", "灭灯"); @@ -670,7 +687,7 @@ public class PtlPcnEnumUtil { private String code; private String description; - RouteType(int value, String code, String description) { + ACTION_ROUTE_TYPE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -689,6 +706,9 @@ public class PtlPcnEnumUtil { } } + /** + * 监听消息类型 + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MONITOR_PROCESS_MESSAGE_TYPE { CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"), @@ -732,7 +752,7 @@ public class PtlPcnEnumUtil { if (StringUtils.isEmpty(code)) { return null; } - for (MONITOR_PROCESS_MESSAGE_TYPE enums : MONITOR_PROCESS_MESSAGE_TYPE.values()) { + for (MONITOR_PROCESS_MESSAGE_TYPE enums : values()) { if (enums.getCode().equals(code)) { return enums; } @@ -741,6 +761,9 @@ public class PtlPcnEnumUtil { } } + /** + * 界面消息类型 + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum INTERFACE_SIGNAL_MESSAGE_TYPE { CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"), @@ -794,7 +817,7 @@ public class PtlPcnEnumUtil { } /** - * 生成任务actor message type + * 任务消息类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum GEN_TASK_MESSAGE_TYPE { @@ -841,8 +864,11 @@ public class PtlPcnEnumUtil { } } + /** + * websocket业务类型 + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WsBusiType { + public enum WS_BUSI_TYPE { MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"), INTERFACE_PROCESS(20, "INTERFACE_PROCESS", "界面处理"); @@ -850,7 +876,7 @@ public class PtlPcnEnumUtil { private String code; private String description; - WsBusiType(int value, String code, String description) { + WS_BUSI_TYPE(int value, String code, String description) { this.value = value; this.description = description; this.code = code; @@ -869,8 +895,11 @@ public class PtlPcnEnumUtil { } } + /** + * websocket消息类型 + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WsDataType { + public enum WS_DATA_TYPE { TEXT(10, "TEXT", "正常信息"), EXP_TEXT(20, "EXP_TEXT", "异常信息"), TABLE(30, "TABLE", "表格"); @@ -879,7 +908,7 @@ public class PtlPcnEnumUtil { private String code; private String description; - WsDataType(int value, String code, String description) { + WS_DATA_TYPE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -898,6 +927,9 @@ public class PtlPcnEnumUtil { } } + /** + * 组件状态类型 + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STATUS_TYPE { START(10, "START", "开始状态"), diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java new file mode 100644 index 0000000..82ba6c0 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ACTION_MODULE_PARAM") +@EqualsAndHashCode(callSuper = true) +@Api("组件参数") +public class PtlActionModuleParam extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1015028092547846989L; + + @Column(name = "AM_CODE") + @ApiParam("组件代码") + private String amCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_NAME") + @ApiParam("参数名称") + private String paramName; + + @Column(name = "PARAM_TYPE") + @ApiParam("参数类型") + private String paramType; + + @Column(name = "DEFAULT_VALUE") + @ApiParam("默认值") + private String defaultValue; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java index cbe7f0a..3d2f7f7 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -40,4 +41,9 @@ public class PtlActionRoute extends BaseBean implements Serializable { @Column(name = "ROUTE_TYPE") @ApiParam("流程类型") private Integer routeType; + + @Lob + @Column(name = "POSITION") + @ApiParam("GOJS位置") + private String position; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java index 25d55ab..2a779bc 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -37,11 +35,9 @@ public class PtlArea extends BaseBean implements Serializable { @Column(name = "AREA_NO") @ApiParam("区域代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String areaNo; @Column(name = "AREA_NAME") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("区域名称") private String areaName; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java index f6dc79a..cae88c8 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -34,26 +32,21 @@ public class PtlAreaActorAction extends BaseBean implements Serializable { @Column(name = "AREA_NO") @ApiParam("区域代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String areaNo; @Column(name = "ACTOR_CODE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("观察者编码") private String actorCode; @Column(name = "MT_CODE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("消息类型代码") private String mtCode; @Column(name = "OTHER_WHERE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("特定条件") private String otherWhere; @Column(name = "AMG_ID") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("组件集编号") private Long amgId; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java index 9eec664..14bc428 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -34,31 +32,25 @@ public class PtlAreaRouteModuleParam extends BaseBean implements Serializable { @Column(name = "AREA_NO") @ApiParam("区域代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String areaNo; @Column(name = "ROUTE_CODE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("流程代码") private String routeCode; @Column(name = "AMG_ID") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("组件集编号") private Long amgId; @Column(name = "AM_CODE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("组件代码") private String amCode; @Column(name = "PARAM_CODE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("参数代码") private String paramCode; @Column(name = "PARAM_VALUE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("参数值") private String paramValue; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java index 55a0d3e..6c72b19 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java @@ -1,8 +1,6 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,7 +11,6 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.io.Serializable; -import java.util.Date; /** * @author Wynne.Lu @@ -32,61 +29,49 @@ public class PtlBom extends BaseBean implements Serializable { @Column(name = "PART_NO") @ApiParam("父物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "PART_NAME", columnDefinition = "varchar(255) default '1'", nullable = false) @ApiParam("父物料描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partName; @Column(name = "UNIT") @ApiParam("计量单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String unit; @Column(name = "QTY") @ApiParam("数量") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private Double qty; @Column(name = "ITEM_PART_NO") @ApiParam("子物料号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String itemPartNo; @Column(name = "ITEM_PART_NAME") @ApiParam("子物料描述") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String itemPartName; @Column(name = "ITEM_UNIT") @ApiParam("子计量单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String itemUnit; @Column(name = "ITEM_QTY") @ApiParam("子用量") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private Integer itemQty; @Column(name = "BOM_NUM") @ApiParam("BOM编号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String bomNum; @Column(name = "BOM_VERSION") @ApiParam("BOM版本号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String bomVersion; @Column(name = "EFF_START_TIME") @ApiParam("有效起始日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String effStartTime; @Column(name = "EFF_END_TIME") @ApiParam("有效截止日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String effEndTime; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java index c1ca40c..16faab6 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -35,42 +33,34 @@ public class PtlControl extends BaseBean implements Serializable { @Column(name = "CONTROL_NO") @ApiParam("控制器编号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String controlNo; @Column(name = "CONTROL_NAME") @ApiParam("控制器名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String controlName; @Column(name = "CONTROL_TYPE") @ApiParam("控制器类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_CONTROL_TYPE") private Integer controlType; @Column(name = "IP") @ApiParam("ip地址") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String ip; @Column(name = "PORT") @ApiParam("端口地址") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String port; @Column(name = "AREA_NO") @ApiParam("区域代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String areaNo; @Column(name = "STATUS") @ApiParam("控制器状态") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_CONTROL_STATUS") private Integer status; @Column(name = "FREQUENCY") @ApiParam("监听频率") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer frequency; @Version diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java index 3471aee..c066a91 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -34,26 +32,21 @@ public class PtlIf extends BaseBean implements Serializable { @Column(name = "IF_CODE") @ApiParam("接口代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String ifCode; @Column(name = "IF_NAME") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("接口名称") private String ifName; @Column(name = "IF_CONNECT_TYPE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @ApiParam("交互方式") private String ifConnectType; @Column(name = "IF_CLASS") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @ApiParam("接口实现类") private String ifClass; @Column(name = "IF_CALL_TYPE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @ApiParam("接口调用方向") private String ifCallType; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java index 8d2a609..6508012 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java @@ -1,8 +1,6 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -33,22 +31,18 @@ public class PtlPart extends BaseBean implements Serializable { @Column(name = "PART_NO") @ApiParam("物料编号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "PART_NAME") @ApiParam("物料名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partName; @Column(name = "PART_TYPE") @ApiParam("物料类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_PART_TYPE") private String partType; @Column(name = "UNIT") @ApiParam("单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String unit; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java index 9bf3380..2194d12 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -34,26 +32,21 @@ public class PtlRfid extends BaseBean implements Serializable { @Column(name = "RFID_CONTROL_NO") @ApiParam("RFID读写器代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String rfidControlNo; @Column(name = "IP") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("IP") private String ip; @Column(name = "PORT") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("端口号") private String port; @Column(name = "AREA_NO") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @ApiParam("区域代码") private String areaNo; @Column(name = "RFID_VALUE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("rfid内容") private String rfidValue; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java index ef380a9..3935303 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -35,22 +33,18 @@ public class PtlSection extends BaseBean implements Serializable { @Column(name = "SECTION_NO") @ApiParam("区段编号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String sectionNo; @Column(name = "SECTION_NAME") @ApiParam("区段名称") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String sectionName; @Column(name = "SECTION_SEQ") @ApiParam("区段顺序号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer sectionSeq; @Column(name = "AREA_NO") @ApiParam("区域代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String areaNo; @Transient diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java index 48d3a70..8c46173 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -34,82 +32,66 @@ public class PtlTag extends BaseBean implements Serializable { @Column(name = "TAG_NO") @ApiParam("标签代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer tagNo; @Column(name = "CONTROL_NO") @ApiParam("控制器代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String controlNo; @Column(name = "AREA_NO") @ApiParam("区域代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String areaNo; @Column(name = "SECTION_NO") @ApiParam("区段代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String sectionNo; @Column(name = "PART_NO") @ApiParam("物料编号") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "BIN_NO") @ApiParam("BIN位代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String binNo; @Column(name = "TAG_TYPE") @ApiParam("标签类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_TAG_TYPE") private Integer tagType; @Column(name = "LIGHT_STATUS") @ApiParam("亮灯状态") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_STATUS") private Integer lightStatus; @Column(name = "TAG_STATUS") @ApiParam("标签状态") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_TAG_STATUS") private Integer tagStatus; @Column(name = "LIGHT_MODE") @ApiParam("亮灯方式") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_MODE") private Integer lightMode; @Column(name = "LIGHT_COLOR") @ApiParam("亮灯颜色") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_COLOR") private Integer lightColor; @Column(name = "IS_BUZZING") @ApiParam("是否蜂鸣") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_IS_BUZZING") private Integer isBuzzing; @Column(name = "MUSIC_TYPE") @ApiParam("音乐类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_MUSIC_TYPE") private Integer musicType; @Column(name = "DISPLAY_CONTEXT") @ApiParam("显示内容") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String displayContent; @Column(name = "ERROR_COUNT") @ApiParam("卡键次数") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer errorCount; @Column(name = "CUSTOM_ATTRIBUTE") @ApiParam("自定义属性") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String customAttribute; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java index 3961a36..66904b1 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -14,10 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; /** * @author Wynne.Lu @@ -37,11 +32,9 @@ public class PtlWindow extends BaseBean implements Serializable { @Column(name = "WINDOW_NO") @ApiParam("界面代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String windowNo; @Column(name = "WINDOW_NAME") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("界面名称") private String windowName; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java index 818bc4b..02ee762 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -34,11 +32,9 @@ public class PtlWindowElement extends BaseBean implements Serializable { @Column(name = "WINDOW_NO") @ApiParam("界面代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String windowNo; @Column(name = "ELEMENT_NO") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("元素代码") private String elementNo; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java index f5f98d4..b291eff 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java @@ -1,9 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.bean; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -34,21 +32,17 @@ public class PtlWindowElementAttribute extends BaseBean implements Serializable @Column(name = "WINDOW_NO") @ApiParam("界面代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String windowNo; @Column(name = "ELEMENT_NO") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("元素代码") private String elementNo; @Column(name = "ATTRIBUTE_NO") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("属性代码") private String attributeNo; @Column(name = "ATTRIBUTE_VALUE") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam("属性值") private String attributeValue; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionRouteRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionRouteRepository.java new file mode 100644 index 0000000..85ad4d1 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionRouteRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlActionRoute; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlActionRouteRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 9a1598e..27cfed2 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -306,4 +306,32 @@ public class PtlHqlPack { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result); return result; } + + /** + * 流程查询条件封装 + * + * @param actionRoute + * @return + */ + public static DdlPackBean packHqlPtlActionRoute(PtlActionRoute actionRoute, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(actionRoute, organizeCode); + DdlPreparedPack.getStringLikerPack(actionRoute.getRouteCode(), "routeCode", packBean); + DdlPreparedPack.getStringLikerPack(actionRoute.getRouteName(), "routeName", packBean); + DdlPreparedPack.getNumEqualPack(actionRoute.getRouteType(), "routeType", packBean); + return packBean; + } + + /** + * 区域流程查询条件封装 + * @param areaRoute + * @param organizeCode + * @return + */ + public static DdlPackBean packHqlPtlAreaRoute(PtlAreaRoute areaRoute, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(areaRoute, organizeCode); + DdlPreparedPack.getStringLikerPack(areaRoute.getRouteCode(), "routeCode", packBean); + DdlPreparedPack.getStringLikerPack(areaRoute.getAreaNo(), "areaNo", packBean); + DdlPreparedPack.getNumEqualPack(areaRoute.getRouteType(), "routeType", packBean); + return packBean; + } } From 3e33a7ac3ac3761e74b0671df0f316360c43b3e2 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 10 Apr 2020 13:49:08 +0800 Subject: [PATCH 21/25] =?UTF-8?q?[=E5=AE=A2=E6=88=B7jit=E5=A2=9E=E5=8A=A0J?= =?UTF-8?q?IT=E6=8E=92=E5=BA=8F=E5=8F=B7=E5=AD=97=E6=AE=B5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java | 8 ++++++++ 3 files changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index 84375d0..9ed95ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -82,6 +82,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("生产组代码") private String pgCode; + @Column(name = "JIT_SEQ") + @ApiParam("JIT排序号") + private String jitSeq; + @Transient @ApiParam("客户需求开始时间") private String custPointStartDate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 3e4272d..9280efe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -92,6 +92,14 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("生产组代码") private String pgCode; + @Column(name = "JIT_LOT_NO") + @ApiParam("JIT队列批次") + private String jitLotNo; + + @Column(name = "JIT_ACTUAL_NO") + @ApiParam("客户JIT队列编号") + private String jitActualNo; + @Transient @ApiParam("起始车号") private String custFlagNoStart; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java index 45dcf3d..aabd924 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java @@ -63,4 +63,12 @@ public class MesQueueShipping extends BaseBean implements Serializable { @ApiParam("客户产线代码") private String custPlantCode; + @Column(name = "JIT_LOT_NO") + @ApiParam("JIT队列批次") + private String jitLotNo; + + @Column(name = "JIT_ACTUAL_NO") + @ApiParam("客户JIT队列编号") + private String jitActualNo; + } From 08ec98305b23ef51c3b855bd46c447437789c075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 10 Apr 2020 17:50:26 +0800 Subject: [PATCH 22/25] =?UTF-8?q?=E3=80=901581=20=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E6=89=AB=E6=8F=8F-=E8=AE=B0=E5=BD=95=E6=8D=A2=E6=A8=A1?= =?UTF-8?q?=E6=97=B6=E9=97=B4=20-=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) 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 16034b1..4140949 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 @@ -3416,4 +3416,41 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 换膜状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DIE_CHANGE_STATUS { + + INITIALIZATION(0, "初始化"), + START(1, "开始换模"), + COMPLETE(2, "完成换模"); + + private int value; + private String description; + + DIE_CHANGE_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; + } + } } From c6aefc89e749573afa79c55eee0f1fe22c20cf7b Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 10 Apr 2020 18:07:04 +0800 Subject: [PATCH 23/25] =?UTF-8?q?test=E5=90=88=E5=B9=B6dev=E8=A7=A3?= =?UTF-8?q?=E5=86=B3ct?= 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 | 4 ++-- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 3d6cbc0..9302dfc 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 807bef5..9f9717e 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 3937425..712a842 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index e12eaee..a44418c 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 8b15a31..d1ea30d 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 7637865..50ab2c2 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index bf96e57..d800ecf 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 409b79a..8664dd2 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index efacfd2..d65e031 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 23f68bd..0080b0c 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 28cf55f..24de8cf 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26a7311..0fbfb69 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index eaf2544..76739f9 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 910d630..590b56c 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 e5b4e5c..ac9e7dd 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 0ecf190..f153994 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 c6f0ba4..ff1cd2d 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 72563a4eb548017ce7060377f18dda1c892f0d14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 10 Apr 2020 18:15:52 +0800 Subject: [PATCH 24/25] =?UTF-8?q?=E3=80=901597=20=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD=E6=96=B0=E5=A2=9E-?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=20/=20=E6=9D=A1=E7=A0=81=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=8A=9F=E8=83=BD=E6=96=B0=E5=A2=9E-=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=AB=AF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) 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 b408ff1..3ed3c46 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 @@ -2312,4 +2312,45 @@ public class MesHqlPack { } return packBean; } + + /** + * 按条件分页查询产品条码补打印数据 + * @param mesProduceSn + * @return + */ + public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) { + DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode()); + if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { + DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); + } + + if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) { + DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean); + } + + if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); + } + + if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) { + DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); + } + DdlPreparedPack.getNumEqualPack(mesProduceSn.getPrintStatus(), "printStatus", packBean); + DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); + + // 时间段查询 + if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesProduceSn.getCreateDateTimeStart(), + mesProduceSn.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesProduceSn.getOutWorkCenterTimeStart(), + mesProduceSn.getOutWorkCenterTimeEnd(), + "outWorkCenterTime", packBean, true); + } + return packBean; + } } From 20f5bfc9eb50a001e79919f5c879187f7e3396eb Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 10 Apr 2020 18:57:46 +0800 Subject: [PATCH 25/25] =?UTF-8?q?wms=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E8=87=B3mes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 46 ++++++ .../cn/estsh/i3plus/pojo/mes/bean/BasVendor.java | 103 +++++++++++++ .../i3plus/pojo/mes/bean/IfQueueShipping.java | 3 +- .../i3plus/pojo/mes/bean/MesQueueShipping.java | 66 +++++++++ .../pojo/mes/bean/MesQueueShippingDetail.java | 73 ++++++++++ .../i3plus/pojo/mes/dbinterface/MappingItem.java | 50 +++++++ .../mes/dbinterface/MesInterfaceDataMapper.java | 161 +++++++++++++++++++++ .../pojo/mes/dbinterface/MesInterfaceEnumUtil.java | 74 ++++++++++ .../pojo/mes/dbinterface/UpdateSyncItem.java | 26 ++++ .../i3plus/pojo/mes/model/StationRequestBean.java | 3 + .../IEngineScriptPersistenceRepository.java | 38 +++++ .../MesInterfaceDataMapperRepository.java | 16 ++ .../MesQueueShippingDetailRepository.java | 14 ++ .../mes/repository/MesQueueShippingRepository.java | 14 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 47 ++++++ 15 files changed, 732 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MappingItem.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/UpdateSyncItem.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IEngineScriptPersistenceRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesInterfaceDataMapperRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingRepository.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 8e46651..341cc2e 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 @@ -4713,4 +4713,50 @@ public class MesEnumUtil { return tmp; } } + + /** + * 脚本语言类型 + * 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby + */ + public enum LANGUAGE_TYPE { + GROOVY(1, "Groovy", 10), + PYTHON(2, "jython", 20), // "jython" string can not change + JS(3, "JavaScript", 30); + // 下面这2种语言没人会写，暂不支持 + //SCALA(40,"scala"), + //JRUBY(50,"jruby"); + + private int index; + private String description; + private int value; + + LANGUAGE_TYPE(int index, String description, int value) { + this.index = index; + this.description = description; + this.value = value; + } + + public String getDescription() { + return description; + } + + public int getIndex() { + return this.index; + } + + public int getValue() { + return value; + } + + // 根据枚举编号获取语言代码 + public static String getCodeByIndex(Integer index) { + for (MesEnumUtil.LANGUAGE_TYPE languageType : MesEnumUtil.LANGUAGE_TYPE.values()) { + if (languageType.getValue() == index.intValue()) { + return languageType.getDescription(); + } + } + + return null; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java new file mode 100644 index 0000000..30e8294 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java @@ -0,0 +1,103 @@ +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 : 供应商 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BAS_VENDOR") +@Api("供应商信息") +public class BasVendor extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592779L; + @Column(name="VENDOR_NO") + @ApiParam("供应商编号") + private String vendorNo; + + @Column(name="VENDOR_NAME") + @ApiParam("供应商简称") + private String vendorName; + + @Column(name="VENDOR_DESC") + @ApiParam("供应商全称") + private String vendorDesc; + + @Column(name="VENDOR_ADDR") + @ApiParam("供应商地址") + private String vendorAddr; + + @Column(name="VENDOR_OWNER") + @ApiParam("联系人") + private String vendorOwner; + + @Column(name="VENDOR_EMAIL") + @ApiParam("邮箱") + private String vendorEmail; + + @Column(name = "IS_ASN") + @ApiParam(value = "是否发ASN", example = "0") + private Integer isAsn; + + @Column(name = "USER_NAME") + @ApiParam(value = "用户名") + private String userName; + + @Column(name = "PASSWORD") + @ApiParam(value = "密码") + private String password; + + @Column(name = "VENDOR_CALL") + @ApiParam("供应商电话") + private String vendorCall; + + @Column(name = "VENDOR_FAX") + @ApiParam("传真") + private String vendorFax; + + @Column(name = "VENDOR_PHONE") + @ApiParam("手机") + private String vendorPhone; + + @Column(name = "KILOBIT") + @ApiParam("千位符号") + private String kilobit; + + @Column(name = "DECIMALS") + @ApiParam("小数位符号") + private String decimals; + + //20-承运商 + @Column(name = "VENDOR_TYPE") + private Integer vendorType; + + @Column(name = "MAP_LOCATION") + @ApiParam("经纬度") + private String mapLocation; + + public BasVendor() { + } + + public BasVendor(Long id, String userName) { + this.id = id; + this.userName = userName; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java index d239828..b656d3f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -79,13 +79,12 @@ public class IfQueueShipping extends BaseBean implements Serializable { @ApiParam("异常消息") private String errorMessage; - @Column(name = "ACTION_CODE") @ApiParam("动作代码") private String actionCode; @Column(name = "IF_CODE") @ApiParam("接口代码") - private Integer ifCode; + private String ifCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java new file mode 100644 index 0000000..db10be7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :MES_JIT发运队列 + * @Reference : + * @Author : qianhausheng + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_SHIPPING") +@Api("MES_JIT发运队列") +public class MesQueueShipping extends BaseBean implements Serializable { + + private static final long serialVersionUID = 655875369308414110L; + + @Column(name = "JIT_NO") + @ApiParam("队列编号") + private String jitNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "SEQ") + @ApiParam("排序号") + private Double seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户产线代码") + private String custPlantCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java new file mode 100644 index 0000000..c212bb9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :MES_JIT发运队列明细 + * @Reference : + * @Author : qianhausheng + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_SHIPPING_DETAIL") +@Api("MES_JIT发运队列明细") +public class MesQueueShippingDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1442091799346314190L; + + @Column(name = "JIT_NO") + @ApiParam("队列编号") + private String jitNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "status") + @ApiParam("状态") + private Integer status; + + @Column(name="SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "GROUP_NO") + @ApiParam("组内编号") + private Integer groupNo; + + @Column(name = "GROUP_SEQ") + @ApiParam("分组序号") + private String groupSeq; + + @Column(name = "qty") + @ApiParam("数量") + private Double qty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MappingItem.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MappingItem.java new file mode 100644 index 0000000..7bf7604 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MappingItem.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.dbinterface; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * Mes - SAP 字段映射关系 + * 暂时不考虑字段的类型 + * + * @author Rock.Yu + * @since 2019-06-09 21:06 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class MappingItem { + /** + * 来源字段名称 + */ + public String srcName; + /** + * 目标对象的名称 + */ + public String destBeanName; + /** + * 目标对象的属性名称 + */ + public String destName; + /** + * 该字段在目标表是不是主键 + * 1=主键 + */ + public Integer destPk; + /** + * 目标字段的默认值，通过此默认值识别字段类型，一定要配置正确 + * 可以使用的表达式： #date, #time, #guid, #Q.warehouse(#zone) + */ + public Object defaultValue; + + @Override + public String toString() { + return "srcName:" + + this.srcName + ", destBeanName:" + + this.destBeanName + ", destName" + + this.destName + ", defaultValue:" + + this.defaultValue + ", destPk:" + + this.destPk; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java new file mode 100644 index 0000000..6fe17fb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java @@ -0,0 +1,161 @@ +package cn.estsh.i3plus.pojo.mes.dbinterface; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * Mes - SAP 中间数据库接口映射关系 + * + * @author Rock.Yu + * @since 2019-06-09 20:08 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_INTERFACE_DATA_MAPPER") +@Api("接口数据映射") +public class MesInterfaceDataMapper extends BaseBean { + /** + * 排序编号 + */ + @Column(name = "SEQ") + public Integer seq; + /** + * 来源表的每次查询记录数，防止大量数据造成内存溢出 + */ + @Column(name = "SRC_GET_LIMIT") + public Integer srcGetLimit; + /** + * 接口数据源编号（在动态表单中配置） + */ + @Column(name = "SRC_DATA_SOURCE", length = 50) + public String dataSource; + /** + * 来源表名 + */ + @Column(name = "SRC_TABLE_NAME", length = 50) + public String srcTableName; + /** + * 来源表的排序条件 + */ + @Column(name = "SRC_ORDER_BY", length = 50) + public String srcOrderBy; + /** + * 来源表的查询条件 + */ + @Column(name = "SRC_WHERE", length = 500) + public String srcWhere; + + /** + * 来源表的分组条件，按分组发送，多个列名用半角逗号分隔 + */ + @Column(name = "SRC_GROUP_COLUMNS", length = 255) + public String srcGroupColumns; + /** + * 数据同步到业务库后需要更新的接口库标记字段，多个字段用半角逗号分隔 + * 例如：SYNFLG=Y,SYNDATE={#XX} + * 可以使用的动态变量： #sap_date, #sap_time, #date, #time, #guid + */ + @Column(name = "SRC_UPDATE_SYNC", length = 255) + public String srcUpdateSync; + /** + * 业务表单的主键，多个主键用半角逗号分隔 + */ + @Column(name = "SRC_PK_COLUMNS", length = 255) + public String srcPkColumns; + /** + * 按照组织代码(半角逗号分隔)复制多份到业务表（用于物料、供应商、客户...等集团数据） + */ + @Column(name = "COPY_BY_ORGS", length = 50) + public String copyByOrgs; + /** + * 目标实体对象的名字，多个字段用半角逗号分隔 + */ + @Column(name = "DEST_BEAN_NAME", length = 500) + public String destBeanName; + /** + * 目标实体对象判断数据是否存在的一组业务属性名称，多个属性用半角逗号分隔 + */ + @Column(name = "DEST_PK_PROPERTIES", length = 500) + public String destPkProperties; + /** + * 源表字段与目标对象属性的映射关系，List 对象，JSON 格式存储 + * + */ + @Column(name = "DEST_COLUMN_MAPPING", length = 5000) + public String destColumnMapping; + + /** + * 接口分组名称 + * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS + */ + @Column(name = "GROUP_NAME") + public String groupName; + + /** + * 业务的路由规则 + * 一表对多表时需要配置路由规则 + */ + @Column(name = "BUSI_ROUTE") + public String busiRoute; + + /** + * 同步频率 + */ + @Column(name = "SYNC_FREQUENCY") + public Integer syncFrequency; + + /** + * 上次同步时间 + */ + @Column(name = "LAST_SYNC_TIME") + public String lastSyncTime; + + /** + * 软适配编号 + */ + @Column(name = "SOFT_ADAPATOR_CODE") + public String softAdaptorCode; + + /** + * 扩展脚本编号，用于扩展接口功能 + */ + @Column(name = "SCRIPT_NO") + public String scriptNo; + + /** + * 调用脚本方法获取数据 + */ + @Column(name = "USE_SCRIPT_PULL") + public Integer useScriptPull; + + /** + * 调用脚本方法保存数据 + */ + @Column(name = "USE_SCRIPT_PUSH") + public Integer useScriptPush; + + /** + * 调用脚本方法更新同步标志 + */ + @Column(name = "USE_SCRIPT_MARK") + public Integer useScriptMark; + + /** + * 调用脚本方法过滤数据（查询来源数据后过滤） + */ + @Column(name = "USE_SCRIPT_FILTER") + public Integer useScriptFilter; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java new file mode 100644 index 0000000..76123e8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java @@ -0,0 +1,74 @@ +package cn.estsh.i3plus.pojo.mes.dbinterface; + +import com.fasterxml.jackson.annotation.JsonFormat; + +public class MesInterfaceEnumUtil { + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DIRECTION_TYPE { + SAP2WMS(10, "SAP2WMS", "SAP --> WMS"), + WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), + MES2WMS(30, "MES2WMS", "MES --> WMS"), + WMS2MES(40, "WMS2MES", "WMS --> MES"); + + private int value; + private String name; + private String description; + + DIRECTION_TYPE() { + } + + DIRECTION_TYPE(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getName() { + return name; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].getName(); + } + } + return tmp; + } + + public static int nameOf(String val) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(val)) { + tmp = values()[i].value; + } + } + return tmp; + } + + /** + * -1 不在范围内 + * @param desc + * @return + */ + public static int descOf(String desc) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/UpdateSyncItem.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/UpdateSyncItem.java new file mode 100644 index 0000000..4136acd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/UpdateSyncItem.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.dbinterface; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 回写接口库的值 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class UpdateSyncItem { + + /** + * 字段名 + */ + public String columnName; + + /** + * 写入的值 + * 支持表达式 + * #sap_date, #sap_time, #guid + */ + public String updateValue; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 21d65dd..331dd1d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -123,6 +123,9 @@ public class StationRequestBean implements Serializable { @ApiParam("展示组件") private Object moduleService; + @ApiParam("客户工厂代码") + private String customerFactoryCode; + @Override public String toString() { return "StationRequestBean{" + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IEngineScriptPersistenceRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IEngineScriptPersistenceRepository.java new file mode 100644 index 0000000..db00b1d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IEngineScriptPersistenceRepository.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.engine.script.EngineScriptPersistence; +import org.springframework.data.jpa.repository.Query; + +import java.util.List; + +/** + * @Description : 脚本引擎持久化类 + * @Reference : + * @Author : Rock.Yu + * @CreateDate : 2019-04-16 09:53 + * @Modify: + **/ +public interface IEngineScriptPersistenceRepository extends BaseRepository { + /** + * 按照工厂代码和脚本编号查询脚本实体对象 + * @param organizeCode 工厂代码 + * @param scriptNo 脚本编号 + * @return 脚本实体对象 + */ + EngineScriptPersistence findByOrganizeCodeAndScriptNo(String organizeCode, String scriptNo); + + /** + * 按照脚本编号查询脚本实体对象 + * @param scriptNo 脚本编号 + * @return 脚本实体对象 + */ + EngineScriptPersistence findByScriptNo(String scriptNo); + + /** + * 查找所有的脚本语言类型 + * @return 数据库中已经存在的脚本语言类型 + */ + @Query("select t.languageType from EngineScriptPersistence t group by t.organizeCode, t.languageType") + List findGroupByLanguageType(); +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesInterfaceDataMapperRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesInterfaceDataMapperRepository.java new file mode 100644 index 0000000..c426600 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesInterfaceDataMapperRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-06-28 15:17 + * @Modify: + **/ +@Repository +public interface MesInterfaceDataMapperRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingDetailRepository.java new file mode 100644 index 0000000..9aeef83 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueShippingDetail; + +/** + * @Description :发运队列明细 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-06 10:56 上午 + * @Modify: + **/ +public interface MesQueueShippingDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingRepository.java new file mode 100644 index 0000000..a5ffa65 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueShipping; + +/** + * @Description : + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-06 10:56 上午 + * @Modify: + **/ +public interface MesQueueShippingRepository 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 b408ff1..7b90365 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 @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.*; +import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; import org.springframework.util.StringUtils; /** @@ -2312,4 +2313,50 @@ public class MesHqlPack { } return packBean; } + + /** + * 接口映射分页查询条件 + * + * @param mesInterfaceDataMapper + * @return + */ + public static DdlPackBean packHqlMesInterfaceDataMapper(MesInterfaceDataMapper mesInterfaceDataMapper) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(mesInterfaceDataMapper.getSrcTableName(), "srcTableName", result); + DdlPreparedPack.getStringLikerPack(mesInterfaceDataMapper.getDestBeanName(), "destBeanName", result); + DdlPreparedPack.getStringLikerPack(mesInterfaceDataMapper.getBusiRoute(), "busiRoute", result); + DdlPreparedPack.getStringLikerPack(mesInterfaceDataMapper.getGroupName(), "groupName", result); + + getStringBuilderPack(mesInterfaceDataMapper, result); + + return result; + } + /** + * 封装公用查询参数 + * + * @param bean 实体对象 + * @param hqlStr 查询语句 + * @return 封装完成的查询语句 + */ + public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) { + + // 判断工厂代码是否为空 + if (org.apache.commons.lang3.StringUtils.isNotBlank(bean.getOrganizeCode())) { + DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); + } + + + DdlPreparedPack.getStringEqualPack(bean.getCreateUser(), "createUser", hqlStr); + if (org.apache.commons.lang3.StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && org.apache.commons.lang3.StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true); + } + // 封装有效状态、删除状态、创建人和创建时间 + DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + + return hqlStr; + } + + }