From b674087ffc69b0d8e3eb375e3198fcecae8b204e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 19 Dec 2019 13:53:13 +0800 Subject: [PATCH 001/139] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 46172c2..f55c898 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 @@ -146,11 +146,12 @@ public class CommonEnumUtil { } return null; } - public static int descriptionOfValue(String desc) { + public synchronized static int descriptionOfValue(String desc) { int tmp = IMPP.value; for (int i = 0; i < values().length; i++) { - if (values()[i].name().equals(desc)) { + if (values()[i].description.equals(desc)) { tmp = values()[i].value; + break; } } return tmp; From 5c28c8344c733644dda55886376ac1a3bcc15960 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 19 Dec 2019 15:09:19 +0800 Subject: [PATCH 002/139] =?UTF-8?q?=E3=80=90VDA=E9=9D=99=E6=80=81=E7=9B=98?= =?UTF-8?q?=E7=82=B9-=E7=9B=98=E7=82=B9=E8=B0=83=E5=B7=AE-=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E5=BA=93=E5=AD=98=E6=9C=AA=E8=A7=A3=E5=86=BB=E3=80=91?= =?UTF-8?q?=E3=80=90bug7009=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/base/enumutil/WmsEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 390532b..617148e 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 @@ -1349,7 +1349,8 @@ public class WmsEnumUtil { INVENTORY(20, "已盘"), FROZEN(30, "已冻结"), THAWING(40, "已解冻"), - RETURN_GOODS(50, "取消冻结"); + RETURN_GOODS(50, "取消冻结"), + Unsettled_(60, "取消冻结"); private int value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 3b6b4bc..21af5a3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -99,7 +99,7 @@ public class WmsCSOrderDetails extends BaseBean { public Integer destSnStatus; /** - * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 + * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 60-未盘解冻 */ @Column(name = "TRANS_STATUS") @ApiParam(value = "处理状态", example = "1") From 0d7e64b160627a79be6d96e57818a6a9459f3966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 19 Dec 2019 16:22:21 +0800 Subject: [PATCH 003/139] =?UTF-8?q?=E5=9C=A8=E8=B0=83=E7=94=A8=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E6=8A=8A=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0=E4=B8=80=E5=B9=B6=E8=B5=8B?= =?UTF-8?q?=E5=80=BC=E5=88=B0MOVEMASTER=E5=AF=B9=E8=B1=A1=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E7=9C=81=E5=8E=BB=E6=AF=8F=E4=B8=AA=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E5=86=8D=E5=8E=BB=E5=BE=AA=E7=8E=AF=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 45 +++++++++------------- .../estsh/i3plus/pojo/wms/bean/WmsTransType.java | 6 ++- 3 files changed, 24 insertions(+), 29 deletions(-) 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 e4a35f8..be7ffe3 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 @@ -204,7 +204,7 @@ public class WmsPart extends BaseBean { @ApiParam(value = "循环补货数量", example = "0") private Double cycleRquestQty = 0d; - public int getIqcValue(){ + public int getIqcVal(){ return this.iqc == null ? 0 : this.iqc.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 7ae45fb..811158c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -79,49 +79,40 @@ public class WmsStockQuan extends BaseBean { private WmsLocate wmsLocate; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "可用数量", example = "0") + @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "可用数量") public Double qty; - @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "不合格数量", example = "0") + @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "不合格数量") private Double failQty; - @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "隔离数量", example = "0") + @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "隔离数量") private Double holdQty; - @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "质检中数量", example = "0") + @Column(name = "QC_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "质检中数量") private Double qcQty; - @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "待入库数量", example = "0") + @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "待入库数量") private Double rinQty; - @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "冻结数量", example = "0") + @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "冻结数量") private Double freezeQty; - @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "寄售数量", example = "0") + @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "寄售数量") private Double consignQty; - @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "锁定数量", example = "0") + @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "锁定数量") private Double lockQty; - @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "报废数量", example = "0") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "报废数量") private Double scrapQty; @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index aef6850..c6caa7a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -58,7 +58,7 @@ public class WmsTransType extends BaseBean { private String transTypeDesc; @Column(name = "TM_ID") - @ApiParam(value = "交易处理组件", example = "-1") + @ApiParam(value = "交易处理组件") @JsonSerialize(using = ToStringSerializer.class) private Long tmId; @@ -73,4 +73,8 @@ public class WmsTransType extends BaseBean { public String getMenuUrl() { return "/handle?transTypeCode=" + this.transTypeCode; } + + public long getTmIdVal() { + return this.tmId == null ? 0 : this.tmId; + } } From 7ef04dd8243b706e6533d14d822c018af740ed30 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Thu, 19 Dec 2019 17:35:24 +0800 Subject: [PATCH 004/139] =?UTF-8?q?=E3=80=901320=20KT=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF--=E9=9C=80=E8=A6=81=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=9A=84=E7=B1=BB=E5=9E=8B=EF=BC=9A=E5=99=A8?= =?UTF-8?q?=E5=85=B7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 617148e..db31037 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 @@ -501,7 +501,8 @@ public class WmsEnumUtil { LINE_LOCATE(50, "L", "线边库"), NC_LOCATE(60, "N", "NC库"), SPILLAGE_LOCATE(70, "Y", "溢料库"), - TRANSIT_LOCATE(80, "T", "在途库"); + TRANSIT_LOCATE(80, "T", "在途库"), + UTENSIL_LOCATE(90, "U", "器具库"); private int value; private String code; @@ -2987,7 +2988,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_PART_TYPE { - RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器"); + RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器"), + UTENSIL(50, "器具"); private int value; private String description; From 69e20029e857bf80b9c2e64804f0d05a7498e64d Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Thu, 19 Dec 2019 17:37:45 +0800 Subject: [PATCH 005/139] =?UTF-8?q?=E3=80=901320=20KT=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF--=E9=9C=80=E8=A6=81=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=9A=84=E7=B1=BB=E5=9E=8B=EF=BC=9A=E5=99=A8?= =?UTF-8?q?=E5=85=B7=E3=80=91=E5=A2=9E=E5=8A=A0=E6=8F=8F=E8=BF=B0=EF=BC=9A?= =?UTF-8?q?90=3D=E5=99=A8=E5=85=B7=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 590f11c..d5344c2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -39,7 +39,7 @@ public class WmsLocate extends BaseBean { private String locateName; /** - * 库位类型:10=收货库,20=基础库,30=机动库,40=组合库,50=线边库,60=NC库，70=溢料,80=在途库位 + * 库位类型:10=收货库,20=基础库,30=机动库,40=组合库,50=线边库,60=NC库，70=溢料,80=在途库位,90=器具库 */ @Column(name = "LOCATE_TYPE") @ApiParam(value = "库位类型") From a2ac02aa47e916fc9a18dbfc5623c5c382a00ba6 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 19 Dec 2019 19:27:24 +0800 Subject: [PATCH 006/139] =?UTF-8?q?=E3=80=90VDA=E9=9D=99=E6=80=81=E7=9B=98?= =?UTF-8?q?=E7=82=B9-=E7=9B=98=E7=82=B9=E8=B0=83=E5=B7=AE-=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E5=BA=93=E5=AD=98=E6=9C=AA=E8=A7=A3=E5=86=BB=E3=80=91?= =?UTF-8?q?=E3=80=90bug7009=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/base/enumutil/WmsEnumUtil.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index db31037..5097556 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 @@ -1351,7 +1351,7 @@ public class WmsEnumUtil { FROZEN(30, "已冻结"), THAWING(40, "已解冻"), RETURN_GOODS(50, "取消冻结"), - Unsettled_(60, "取消冻结"); + UNSETTLED_NCUNFREEZE(60, "未盘解冻"); private int value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 878db14..8590f92 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -136,6 +136,10 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("存储区编号组") public String[] zoneNos; + @Transient + @ApiParam("行号") + private String item; + public WmsCSFactTrans(){} public Integer getIsScopeVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 21af5a3..947cb55 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -99,7 +99,7 @@ public class WmsCSOrderDetails extends BaseBean { public Integer destSnStatus; /** - * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 60-未盘解冻 + * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 60=未盘解冻 */ @Column(name = "TRANS_STATUS") @ApiParam(value = "处理状态", example = "1") From 4c8a94bdfaf1919ec3ab30e226ef1dc7d6742770 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 19 Dec 2019 23:17:30 +0800 Subject: [PATCH 007/139] =?UTF-8?q?=E3=80=90VDA=E9=9D=99=E6=80=81=E7=9B=98?= =?UTF-8?q?=E7=82=B9-=E7=9B=98=E7=82=B9=E8=B0=83=E5=B7=AE-=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E5=BA=93=E5=AD=98=E6=9C=AA=E8=A7=A3=E5=86=BB=E3=80=91?= =?UTF-8?q?=E3=80=90bug7009=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/sqlpack/WmsHqlPack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 1f4fc92..6c68ff3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1359,6 +1359,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getLocateNo(), "locateNo", result); + DdlPreparedPack.getNumEqualPack(wmsCSOrderDetails.getTransStatus(), "transStatus", result); DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result); From 1d7cf4165335a4f0a3c715df3b695bf9284829d3 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 20 Dec 2019 02:54:50 +0800 Subject: [PATCH 008/139] =?UTF-8?q?=E3=80=90VDA=E9=9D=99=E6=80=81=E7=9B=98?= =?UTF-8?q?=E7=82=B9-=E7=9B=98=E7=82=B9=E8=B0=83=E5=B7=AE-=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E5=BA=93=E5=AD=98=E6=9C=AA=E8=A7=A3=E5=86=BB=E3=80=91?= =?UTF-8?q?=E3=80=90bug7009=E3=80=91=E5=90=8E=E6=9C=9F=E5=BE=85=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 11 +++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 7 +++++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java | 2 ++ 3 files changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 8590f92..14c0486 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -88,22 +88,27 @@ public class WmsCSFactTrans extends BaseBean { public String remark; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam(value = "剩余数量", example = "1") public Double surplusQty; @Column + @AnnoOutputColumn(hidden = true) @ApiParam("源库位编号") public String srcLocateNo; @Column + @AnnoOutputColumn(hidden = true) @ApiParam("源存储区编号") public String srcZoneNo; @Column + @AnnoOutputColumn(hidden = true) @ApiParam("源仓库编号") public String srcWhNo; @Column + @AnnoOutputColumn(hidden = true) @ApiParam("是否范围内") public Integer isScope; @@ -112,10 +117,12 @@ public class WmsCSFactTrans extends BaseBean { public String vendorNo; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam(value = "实盘箱数", example = "1") public Long countBoxQty; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam(value = "物料数量", example = "1") public Double sumPartQty; @@ -125,18 +132,22 @@ public class WmsCSFactTrans extends BaseBean { * 60=在途,70=已隔离,80=破包,90=冻结,100=作废 */ @Transient + @AnnoOutputColumn(hidden = true) @ApiParam(value = "条码状态", example = "1") public Integer snStatus; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam(value = "条码状态(冻结时)", example = "1") public Integer destSnStatus; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam("存储区编号组") public String[] zoneNos; @Transient + @AnnoOutputColumn(hidden = true) @ApiParam("行号") private String item; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 947cb55..c4550f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -42,6 +42,7 @@ public class WmsCSOrderDetails extends BaseBean { @Column(name = "ITEM") @ApiParam("行号") + @AnnoOutputColumn(hidden = true) public String item; @Column(name = "QTY", columnDefinition = "decimal(18,8)") @@ -112,26 +113,32 @@ public class WmsCSOrderDetails extends BaseBean { @Transient @ApiParam(value = "实盘数量", example = "1") + @AnnoOutputColumn(hidden = true) public Double factQty; @Transient @ApiParam(value = "剩余数量", example = "1") + @AnnoOutputColumn(hidden = true) public Double surplusQty; @Transient @ApiParam("目标库位编号") + @AnnoOutputColumn(hidden = true) public String destLocateNo; @Transient @ApiParam("前端表格编辑使用") + @AnnoOutputColumn(hidden = true) public Boolean isSet = false; @Transient @ApiParam("源单位") + @AnnoOutputColumn(hidden = true) public String srcUnit; @Transient @ApiParam("存储区编号") + @AnnoOutputColumn(hidden = true) public String[] zoneNos; /** diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java index 1873977..a85ae4a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -42,6 +43,7 @@ public class WmsCSPart extends BaseBean { public String partNameRdd; @Column(name="IS_ADJUST") + @AnnoOutputColumn(hidden = true) @ApiParam(value = "调整标识", example = "1") public Integer isAdjust; } From c87b00756f406decf4ffd4635dfdb9bb72fad4d8 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 20 Dec 2019 10:29:25 +0800 Subject: [PATCH 009/139] =?UTF-8?q?dev=E5=88=86=E6=94=AF=E4=BF=AE=E6=94=B9?= =?UTF-8?q?pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index f8fa98e..ebd53c3 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index b0a3f82..c052a9d 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d790ef1..e97c0bb 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index c6141da..90e744d 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 23e5bee..0ba3645 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index c1e2cb9..6706323 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 856da5f..ffcac19 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 09f2c4a..e388a1d 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 82fdbe8..62ebe64 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index b7b2dfc..39d9423 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index ec9e100..e310bfd 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index bd09726..e36fcf7 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 4c96781..81fb02b 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 2c24e41..1f622d9 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 18c811c..bc41914 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 1171f4e..93f9732 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 5345a36..9caeb95 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 modules/i3plus-pojo-model From 335ab2ce510a062d127026228652b7c7ad95bf37 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 20 Dec 2019 11:03:37 +0800 Subject: [PATCH 010/139] =?UTF-8?q?=E6=96=B0=E5=A2=9EKPI=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index e9471e8..7eb002d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -53,11 +53,6 @@ public class ProductOrder extends BaseOrder { @ApiParam(value ="指定工艺路线") private String specifyRouting; - @Column(name="RESYNCHRONIZE") - @ApiParam(value ="是否同步") - @FieldAnnotation(defaultValue = "true") - private Boolean resynchronize; - @Column(name="RECALC_COUNT") @ApiParam(value ="是否重新计算数量") @FieldAnnotation(defaultValue = "true") From 03eeacd2730511a25cc72f11163f39f4ee3a1fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 20 Dec 2019 11:38:44 +0800 Subject: [PATCH 011/139] =?UTF-8?q?=E3=80=90KT-1298=20=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E8=B7=AF=E7=BA=BF=E3=80=90=E5=A4=84=E7=90=86=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E3=80=91=E4=BC=98=E5=8C=96=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/WmsRoutingRule.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index 15f6d49..bb300a5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -114,6 +114,10 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "目的库位") private String destLocateNo; + @Column(name = "DEST_MOVE_TYPE") + @ApiParam(value = "目的库位") + private String destMoveType; + public WmsRoutingRule(){} } From b0709aca9737cf42500350adfa3723397776fb10 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 20 Dec 2019 15:05:41 +0800 Subject: [PATCH 012/139] =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 4 ++-- 2 files changed, 4 insertions(+), 4 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 a22ef11..75b5626 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 @@ -3565,8 +3565,8 @@ public class MesEnumUtil { PCN_MENU(170, "PCN_MENU", ""), PCN_MODULE(180, "PCN_MODULE", ""), PCN_LOGOUT(190, "PCN_LOGOUT", ""), - UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"); - + UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"), + PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""); private int value; private String code; 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 ecda007..38a41e0 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 @@ -131,8 +131,8 @@ public class MesPcnEnumUtil { PCN_MENU(170, "PCN_MENU", ""), PCN_MODULE(180, "PCN_MODULE", ""), PCN_LOGOUT(190, "PCN_LOGOUT", ""), - UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"); - + UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"), + PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""); private int value; private String code; From 996526ac7cd17e41fe71e20e0d5856f58aece9e6 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Fri, 20 Dec 2019 15:11:40 +0800 Subject: [PATCH 013/139] =?UTF-8?q?=E3=80=90bug7088=20=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=9A=84=E5=AF=BC=E5=85=A5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 5097556..2e16847 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 @@ -3030,8 +3030,8 @@ public class WmsEnumUtil { public enum WMS_PART_TYPE_STR { - RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"), CONTAINER_PRODUCT("40", "容器"); - + RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"), CONTAINER_PRODUCT("40", "容器"), + UTENSIL("50", "器具"); private String value; private String description; @@ -3057,6 +3057,16 @@ public class WmsEnumUtil { } return tmp; } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(val)) { + tmp = values()[i].value; + } + } + return tmp; + } } From 393d3f12b84845f2cc4ca7d9a77bd66ba9adc446 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 20 Dec 2019 16:44:43 +0800 Subject: [PATCH 014/139] =?UTF-8?q?=E3=80=907055=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=B3=A2=E6=AC=A1=E6=8B=A3=E8=B4=A7=E6=B5=81=E7=A8=8B=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java index 48e8954..1f3d722 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java @@ -33,4 +33,7 @@ public class WmsStockFifoModel { @ApiParam(value = "物料对应的存储区集合") Map> partToZonesMap; + + @ApiParam(value = "波次配料物料清单") + boolean collectPicking = false; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 312209b..3ac14cc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -272,4 +272,13 @@ public class WmsDocMovementDetails extends BaseBean { this.destLocateNo = destLocateNo; } + public WmsDocMovementDetails (String partNo) { + this.partNo = partNo; + } + + public WmsDocMovementDetails (String partNo,String orderNo) { + this.partNo = partNo; + this.orderNo = orderNo; + } + } From fc9b8629ab54471f551f60056411576e234050ca Mon Sep 17 00:00:00 2001 From: gcj Date: Fri, 20 Dec 2019 18:07:05 +0800 Subject: [PATCH 015/139] =?UTF-8?q?=E3=80=90=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=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/base/enumutil/WmsEnumUtil.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java | 3 +++ 2 files changed, 4 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 617148e..9d8a428 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 @@ -1076,7 +1076,7 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CARRIAGE_STATUS { CREATE(10, "创建"), - PUBLISH(20, "发布"), + PUBLISH(20, "已发布"), RECEIVE(30, "承运商接收"), ARRIVE(40, "车辆到达"), INSTALL(50, "装车完成"), diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java index 48e8954..0f5c29e 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java @@ -33,4 +33,7 @@ public class WmsStockFifoModel { @ApiParam(value = "物料对应的存储区集合") Map> partToZonesMap; + + @ApiParam("默认规则") + private String defaultRule; } From dccd104fdd887898046699215da24380fe937e26 Mon Sep 17 00:00:00 2001 From: zcg Date: Sat, 21 Dec 2019 12:55:29 +0800 Subject: [PATCH 016/139] =?UTF-8?q?[=E9=9C=80=E6=B1=82=EF=BC=9A1324?= =?UTF-8?q?=EF=BC=8Cexcel=E5=AF=BC=E5=87=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java | 8 ++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java | 5 +++++ .../i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java | 4 ++++ .../estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java | 13 +++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java | 5 +++++ .../cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java | 17 +++++++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 12 ++++++++++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java | 4 ++-- .../cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java | 13 +++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 8 ++++++++ .../estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java | 9 +++++++++ .../estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java | 5 +++++ .../estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java | 9 +++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java | 16 ++++++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 5 +++++ .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java | 9 +++++++++ .../estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java | 5 +++++ .../estsh/i3plus/pojo/mes/model/MesDatasourceModel.java | 3 +++ .../i3plus/pojo/mes/model/MesEquTaskPlanModel.java | 4 ++-- 21 files changed, 156 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 75b5626..325ed75 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 @@ -802,7 +802,7 @@ public class MesEnumUtil { public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java index 3f7588b..7483771 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java @@ -77,4 +77,12 @@ public class MesCustOrder extends BaseBean { @Transient @ApiParam(value = "订单日期查询用，查询结束日期", example = "2019-12-31 23:59:59") public String orderTimeEnd; + + @Transient + @ApiParam("订单类型名称") + private String orderTypeName; + + @Transient + @ApiParam("状态名称") + private String statusName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java index c41888b..6670060 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Author: Wynne.Lu @@ -66,4 +67,8 @@ public class MesDataObject extends BaseBean { @Column(name = "SELF_ADDITION_VALUE") @ApiParam("自增列值") private Long selfAdditionValue; + + @Transient + @ApiParam("操作类型名称") + private String operateTypeName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java index 88fb6d1..713dc90 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java @@ -48,4 +48,8 @@ public class MesEquNotifyObjectCfg extends BaseBean { @ApiParam("对象类型") private Integer notifyObjectType; + @Transient + @ApiParam("对象类型名称") + private String notifyObjectTypeName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java index b47ef5d..4d4d1b6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :设备作业通知配置 @@ -48,4 +49,16 @@ public class MesEquTaskNotifyCfg extends BaseBean { @ApiParam("通知方式") private Integer notifyPattern; + @Transient + @ApiParam("作业类型名称") + private String taskTypeName; + + @Transient + @ApiParam("通知类型名称") + private String notifyTypeName; + + @Transient + @ApiParam("通知方式名称") + private String notifyPatternName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java index 8f9fb0c..25545e4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description: @@ -71,6 +72,10 @@ public class MesKpsnRule extends BaseBean { @ApiParam("供应商代码") private String supplierCode; + @Transient + @ApiParam("绑定规则名称") + private String bandRuleName; + public int getLengthVal() { return this.length == null ? 0 : this.length; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index a5ccc00..d9ead26 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Author: Wynne.Lu @@ -55,4 +56,8 @@ public class MesObjectCfg extends BaseBean { @ApiParam("是否存储") private Integer isSave; + @Transient + @ApiParam("是否存储") + private String isSaveName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java index 7feb2a8..6db75b4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.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 :包装规格 @@ -73,6 +74,22 @@ public class MesPackSpec extends BaseBean { @ApiParam("是否混包4") private Integer isMixed4; + @Transient + @ApiParam("是否混包名称") + private String isMixedName; + + @Transient + @ApiParam("是否混包2名称") + private String isMixedName2; + + @Transient + @ApiParam("是否混包3名称") + private String isMixedName3; + + @Transient + @ApiParam("是否混包4名称") + private String isMixedName4; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 216e157..65ba2cc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -88,4 +88,16 @@ public class MesPart extends BaseBean { @Column(name = "PRODUCT_MATCH_TYPE") @ApiParam("产品编码匹配类型") private Integer productMatchType; + + @Transient + @ApiParam("过程编码匹配类型名称") + private String processMatchTypeName; + + @Transient + @ApiParam("包装编码匹配类型") + private String packageMatchTypeName; + + @Transient + @ApiParam("产品编码匹配类型") + private String productMatchTypeName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java index c98a0dc..9dac636 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java @@ -40,7 +40,7 @@ public class MesPcn extends BaseBean { private String areaCode; @Column(name = "AREA_NAME") - @ApiParam("区域") + @ApiParam("区域名称") private String areaName; @Column(name = "WORK_CENTER_CODE") @@ -48,7 +48,7 @@ public class MesPcn extends BaseBean { private String workCenterCode; @Column(name = "WORK_CENTER_NAME") - @ApiParam("工作中心") + @ApiParam("工作中心名称") private String workCenterName; @Column(name = "PCN_VERSION") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java index 7543670..2cf0ddf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description: @@ -79,6 +80,18 @@ public class MesPcnSyncCfg extends BaseBean { @ApiParam(value = "同步的时候是否区分工厂") private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + @Transient + @ApiParam("同步方式") + private String syncPatternName; + + @Transient + @ApiParam("同步类型名称") + private String syncTypeName; + + @Transient + @ApiParam(value = "同步的时候是否区分工厂") + private String isIgnoreOrgName; + public int getIsIgnoreOrgVal() { return this.isIgnoreOrg == null ? 0 : this.isIgnoreOrg; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index b803060..08c7787 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -99,6 +99,14 @@ public class MesPlanOrder extends BaseBean { public String areaCode; @Transient + @ApiParam("状态名称") + private String statusName; + + @Transient + @ApiParam("计划类型") + private String planTypeName; + + @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/bean/MesProductEncodeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java index cd7e9ee..f3a2b64 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description: @@ -43,4 +44,12 @@ public class MesProductEncodeCfg extends BaseBean { @Column(name = "RULE_CODE") @ApiParam("编码规则代码") private String ruleCode; + + @Transient + @ApiParam("编码类型名称") + private String codeTypeName; + + @Transient + @ApiParam("匹配类型名称") + private String matchTypeName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index 60bea0a..338075d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description: @@ -64,4 +65,8 @@ public class MesQcCheckStandard extends BaseBean { @ApiParam("检测项类型") private String checkItemType; + @Transient + @ApiParam("检测类型名称") + private String checkTypeName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java index a2b7c6d..ce83ab3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :工序工作单元 @@ -43,4 +44,12 @@ public class MesRouteProcessCell extends BaseBean { @ApiParam("工作中心") private String workCenterCode; + @Transient + @ApiParam("流程代码名称") + private String routeCodeName; + + @Transient + @ApiParam("工序代码名称") + private String processCodeName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 2813d8a..89abdff 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -88,6 +88,22 @@ public class MesStationBom extends BaseBean { @ApiParam(value = "绑定数量") private Double boundQty; + @Transient + @ApiParam(value = "是否可重复名称") + private String isRepeatName; + + @Transient + @ApiParam(value = "是否检查名称") + private String isCheckName; + + @Transient + @ApiParam(value = "是否投料配置名称") + private String isFeedName; + + @Transient + @ApiParam(value = "是否绑定关键件名称") + private String isBindKeyName; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 5bd428a..7fd8998 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -68,4 +68,9 @@ public class MesWorkCell extends BaseBean { @ApiParam(value = "父节点", access = "父节点", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long parentId; + + @Transient + @ApiParam("工位类型名称") + private String workCellTypeName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java index db71d8e..0baae07 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :工作单元参数 @@ -43,4 +44,12 @@ public class MesWorkCellParam extends BaseBean { @Column(name = "PARAM_MODEL") @ApiParam("参数模式") private Integer paramModel; + + @Transient + @ApiParam("参数类型名称") + private String paramTypeName; + + @Transient + @ApiParam("参数模式名称") + private String paramModelName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java index dd0909a..68d7afa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :工作单元参数配置 @@ -50,4 +51,8 @@ public class MesWorkCellParamCfg extends BaseBean { @Column(name = "IS_CHECK") @ApiParam("是否必须校验") private Integer isCheck; + + @Transient + @ApiParam("是否必须校验名称") + private String isCheckName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java index ddfb036..2900b7f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java @@ -68,6 +68,9 @@ public class MesDatasourceModel implements Serializable { @ApiParam("数据库名称") private String dsDbName; + @ApiParam("数据源类型名称") + private String dsTypeName; + public MesDatasourceModel() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java index d3ece07..b8e6909 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java @@ -58,10 +58,10 @@ public class MesEquTaskPlanModel implements Serializable { @ApiParam("修改日期") public String modifyDatetime; - @ApiParam("作业类型") + @ApiParam("作业类型名称") private String taskTypeName; - @ApiParam("设备类别") + @ApiParam("设备类别名称") private String equipmentCategoryName; From 9c2dcba09d12c5fa5efb86729e19afe6297f58b5 Mon Sep 17 00:00:00 2001 From: gcj Date: Sat, 21 Dec 2019 14:38:42 +0800 Subject: [PATCH 017/139] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=BE=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java index 5357a32..ca012e6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java @@ -61,4 +61,7 @@ public class WmsTmsShipDto extends BaseDto implements Serializable { @ApiParam("回执单地址") private String pathUrl; + + @ApiParam("关联单号") + private String refOrderNo; } From 4bd0aa8d57eeac4afe802a71ec78c12b5b22dbd2 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 23 Dec 2019 10:42:31 +0800 Subject: [PATCH 018/139] =?UTF-8?q?=E3=80=90=E7=B3=BB=E7=BB=9F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE-=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=20=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/sqlpack/WmsHqlPack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 6c68ff3..bb2b334 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1858,6 +1858,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigCode(), "configCode", result); + DdlPreparedPack.getStringLikerPack(wmsConfig.getName(), "name", result); DdlPreparedPack.getNumEqualPack(wmsConfig.getConfigType(), "configType", result); DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigValue(), "configValue", result); DdlPreparedPack.getNumEqualPack(wmsConfig.getConfigValueType(), "configValueType", result); From c7d494c31e69d1d2268c61178923251849c43994 Mon Sep 17 00:00:00 2001 From: zcg Date: Mon, 23 Dec 2019 14:32:00 +0800 Subject: [PATCH 019/139] =?UTF-8?q?[=E9=9C=80=E6=B1=82=EF=BC=9A1324?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BAexcel]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java index 4a3ace4..dc37069 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Author: Wynne.Lu @@ -51,4 +52,8 @@ public class MesWcCheck extends BaseBean { @ApiParam("检查标准") private String standard; + @Transient + @ApiParam("检查类型名称") + private String checkTypeName; + } From d5c1f7a7a3f99c63a011dcfdeaab35767a3b8a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 24 Dec 2019 11:20:02 +0800 Subject: [PATCH 020/139] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=20=E6=A8=A1=E6=9D=BF=E8=BD=AF=E5=88=A0?= =?UTF-8?q?=E9=99=A4=20=E8=BD=AF=E9=80=82=E9=85=8Dlist=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 3 ++- .../i3plus/pojo/platform/bean/SysLocaleResource.java | 6 ++++++ .../i3plus/pojo/softswitch/bean/BsSuitCaseParam.java | 19 ++++++++++++++++++- .../pojo/softswitch/bean/BsSuitRecordParam.java | 7 +++---- .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 1 + 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index b4f4a10..e1d4eae 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -615,7 +615,8 @@ public class BlockSoftSwitchEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATABASE_OPERATE_TYPE{ READ(1,"读取"), - WRITE(2,"写入"); + WRITE(2,"写入"), + BATCH_WRITE(3,"批量写入"); private int value; private String description; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index 01fd23c..5555d83 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -70,6 +70,12 @@ public class SysLocaleResource extends BaseBean { @ApiParam(value ="产品类型", example = "0",access = "softTyp DOC: http://doc.estsh.com/docs/i3plus_api/i3plus_api-impp") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, refForeignKey = "value", value = "description",required = false) private Integer softType; + public int getSoftTypeVal(){ + if(softType==null){ + return CommonEnumUtil.SOFT_TYPE.IMPP.getValue(); + } + return softType.intValue(); + } //系统自带需要有初始化表，只能修改value，无法删除。 @Column(name="is_system") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java index 6257a7b..03ab889 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java @@ -13,10 +13,12 @@ import lombok.EqualsAndHashCode; import org.apache.commons.lang3.math.NumberUtils; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description : 适配器出入参 @@ -53,6 +55,10 @@ public class BsSuitCaseParam extends BaseBean { @ApiParam(value = "参数名称)") private String paramName; + @Column(name = "PARENT_PARAM_Id") + @ApiParam(value = "上级参数id") + private String parentParamId; + @Column(name = "PARENT_PARAM_NAME") @ApiParam(value = "上级参数名称)") private String parentParamName; @@ -80,7 +86,18 @@ public class BsSuitCaseParam extends BaseBean { @Transient @ApiParam(value = "参数值") - private String paramValue; + private Object paramValue; + + public String getParamValueStr() { + if (paramValue == null) { + return null; + } + return paramValue.toString(); + } + + @Transient + @ApiParam(value = "子级参数") + private List bsSuitCaseParamList; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java index e85deb6..c1d94dc 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java @@ -7,10 +7,8 @@ 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.Index; -import javax.persistence.Table; + +import javax.persistence.*; /** * @Description : 适配记录参数 @@ -38,6 +36,7 @@ public class BsSuitRecordParam extends BaseBean { @ApiParam(value = "参数名称") private String paramName; + @Lob @Column(name = "PARAM_VAL") @ApiParam(value = "参数值") private String paramVal; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index e5063c6..b1a9344 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -338,6 +338,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); + DdlPreparedPack.timeBuilder(bsSuitRecord.getSuitStartTime(), "suitStartTime", ddlPackBean, false, true); ddlPackBean.setOrderByStr(bsSuitRecord.orderBy()); From 894dbed46c08d67c0422b072ae47fef30cc9047a Mon Sep 17 00:00:00 2001 From: gcj Date: Tue, 24 Dec 2019 11:26:14 +0800 Subject: [PATCH 021/139] =?UTF-8?q?=E3=80=90=E5=AE=81=E5=BE=B7=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=B8=85=E5=8D=95=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/WmsDocFgDetail.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 79c7f34..65e800d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -132,4 +133,9 @@ public class WmsDocFgDetail extends BaseBean { @Column(name="COMMIT_DATE") @ApiParam("提交日期") public String commitDate; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "BOM生效日期") + @Column(name = "EFF_START_TIME") + private String effStartTime; } From 34e4d837afa629fb220415fd71f0e05acf19d731 Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 24 Dec 2019 18:15:36 +0800 Subject: [PATCH 022/139] =?UTF-8?q?=E3=80=90=E5=AD=98=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E7=9B=98=E7=82=B9=EF=BC=8C=E6=89=AB=E6=8F=8F=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=86=85=E5=AE=B9=E2=80=9C?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E6=9D=A1=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E2=80=9D=E3=80=91=E3=80=90bug7060=09?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index c4550f6..086e420 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; import javax.persistence.Transient; @@ -28,7 +29,11 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_DOC_CS_DETAILS") +@Table(name = "WMS_DOC_CS_DETAILS", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "VENDOR_NO"), + @Index(columnList = "SN") +}) @Api("盘点单冻结信息") public class WmsCSOrderDetails extends BaseBean { private static final long serialVersionUID = 1054153436116196360L; From 20f6961dafbf8f42893e9c10c90d442fccc1b283 Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 24 Dec 2019 19:56:11 +0800 Subject: [PATCH 023/139] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A132?= =?UTF-8?q?7JIT=E7=94=9F=E4=BA=A7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 35 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java | 5 ++++ .../i3plus/pojo/mes/pcn/model/QueueOrderModel.java | 8 +++++ .../i3plus/pojo/mes/bean/MesWorkCellPoint.java | 5 ++++ 4 files changed, 53 insertions(+) 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 a22ef11..fb1bf3e 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,41 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { + /** + * 是否解析 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_IS_PARSE { + TRUE(1, "是"), + FALSE(2, "否"); + + private int value; + private String description; + + PLC_IS_PARSE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CALENDAR_TYPE { DAY(10, "日"), diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java index dd2c7da..5a4c0f1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java @@ -27,6 +27,11 @@ import javax.persistence.Table; @Table(name = "MES_WORK_CELL_POINT") @Api("工站队列") public class MesWorkCellPoint extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java index 19694f1..b7f831b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java @@ -40,6 +40,14 @@ public class QueueOrderModel implements Serializable { @Transient @ApiParam("显示颜色") private String color; + @ApiParam("工厂代码") + private String organizeCode; + @ApiParam("展示行数") + private Integer prodNum; + @ApiParam("产线") + private String workCenterCode; + @ApiParam("工位") + private String workCellCode; public QueueOrderModel() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java index 7343feb..0abb9dd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java @@ -31,6 +31,11 @@ import java.util.List; @Table(name = "MES_WORK_CELL_POINT") @Api("工站队列") public class MesWorkCellPoint extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; From 04b02c084b893fd960fa4edf87c6c97c30bd9749 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 25 Dec 2019 09:35:14 +0800 Subject: [PATCH 024/139] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=98=E7=89=B9?= =?UTF-8?q?=E5=9B=BE=E5=8F=AF=E6=8B=96=E6=8B=BD=E8=B5=84=E6=BA=90=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aps/model/{ResourceLodaRequest.java => ResourceLoadRequest.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/{ResourceLodaRequest.java => ResourceLoadRequest.java} (95%) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java similarity index 95% rename from modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java rename to modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java index c35f89e..b7bcac0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java @@ -10,7 +10,7 @@ import lombok.Data; import java.util.Date; @Data -public class ResourceLodaRequest { +public class ResourceLoadRequest { private ApsEnumUtil.RESOURCE_LOAD_SPAN span; @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) From 734b54d1b25e232ffb80a469109ab68439c8ecfc Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 25 Dec 2019 11:33:15 +0800 Subject: [PATCH 025/139] =?UTF-8?q?=E3=80=90=20=E9=A2=86=E6=96=99=E4=B8=8A?= =?UTF-8?q?=E7=BA=BF=E6=89=AB=E6=8F=8F=E6=97=B6=EF=BC=8C=E5=9C=A8=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AE=8C=E6=9D=A1=E7=A0=81=E5=90=8E=E5=B0=86=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E5=BA=93=E4=BD=8D=E5=B8=A6=E5=87=BA=E3=80=82=20?= =?UTF-8?q?=E3=80=91bug7024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 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 a5bf1b0..285778b 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 @@ -239,7 +239,7 @@ public class WmsEnumUtil { RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"), CLOSED(40, "CLOSED", "已关闭"), CANCELLED(50, "CANCELLED", "已取消"), - FINISH_PRODUCT_SHIPING_PICKED(60, "FINISH_PRODUCT_SHIPING_PICKED", "配料完成"); + BATCHING_FINISH(60, "BATCHING_FINISH", "配料完成"); private int value; private String code; From e5452056b619c3f23f16f89321d1bc3cd013923c Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Wed, 25 Dec 2019 15:41:41 +0800 Subject: [PATCH 026/139] =?UTF-8?q?=E3=80=90bug7083=20KT=E5=99=A8=E5=85=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91=E6=96=B0=E5=A2=9E=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=92=8C=E4=BD=9C=E4=B8=9A=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 285778b..1e07422 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 @@ -701,7 +701,8 @@ public class WmsEnumUtil { KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"), FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"), KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"), - PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库"); + PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库"), + UTENSIL_CONSUMING(500,"UTENSIL_CONSUMING","器具领用"); private int value; private String code; @@ -885,7 +886,8 @@ public class WmsEnumUtil { VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY", "VDA事务查询"), VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"), VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"), - KT_PICK_RC("KT_PICK_RC", "坤泰拣货"); + KT_PICK_RC("KT_PICK_RC", "坤泰拣货"), + UTENSIL_CONSUMING("UTENSIL_CONSUMING","器具领用"); private String value; private String description; From f857a4065d78a7ce6df02d63add60f5091f026af Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 25 Dec 2019 17:01:15 +0800 Subject: [PATCH 027/139] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A132?= =?UTF-8?q?7JIT=E7=94=9F=E4=BA=A7=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/base/enumutil/MesEnumUtil.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- 2 files changed, 4 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 11cf7e3..2a2e426 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 @@ -2895,7 +2895,8 @@ public class MesEnumUtil { STANDARD_ORDER(10, "标准工单"), BTS_ORDER(20, "BTS工单"), ATTEMPT_ORDER(30, "试制工单"), - BH_ORDER(40, "B&H工单");; + BH_ORDER(40, "B&H工单"), + JIT_ORDER(50, "JIT工单"); private int value; private String description; 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 38a41e0..d6154b5 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 @@ -1659,7 +1659,8 @@ public class MesPcnEnumUtil { STANDARD_ORDER(10, "标准工单"), BTS_ORDER(20, "BTS工单"), ATTEMPT_ORDER(30, "试制工单"), - BH_ORDER(40, "B&H工单"); + BH_ORDER(40, "B&H工单"), + JIT_ORDER(50, "JIT工单"); private int value; private String description; From dbe2d32bb636da0a5838e82756d9ea248829ae0a Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 25 Dec 2019 20:25:15 +0800 Subject: [PATCH 028/139] =?UTF-8?q?[=E9=9C=80=E6=B1=82=EF=BC=9A1322?= =?UTF-8?q?=EF=BC=8C=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index d6154b5..750af55 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 @@ -132,7 +132,9 @@ public class MesPcnEnumUtil { PCN_MODULE(180, "PCN_MODULE", ""), PCN_LOGOUT(190, "PCN_LOGOUT", ""), UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"), - PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""); + PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""), + PCN_SYS_ALL_LANGUAGE(220,"PCN_SYS_ALL_LANGUAGE","PCN_SYS_ALL_LANGUAGE"), + PCN_SYS_RESOURCE_KEY_LANGUAGE(230,"PCN_SYS_RESOURCE_KEY_LANGUAGE","PCN_SYS_RESOURCE_KEY_LANGUAGE"); private int value; private String code; From cfa465817f3c3e8a2e4b77bdfa6c7f56709233ba Mon Sep 17 00:00:00 2001 From: gcj Date: Thu, 26 Dec 2019 09:43:31 +0800 Subject: [PATCH 029/139] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2=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/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index bb2b334..6aa16d4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2427,7 +2427,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLeftLikerPack(wmsRouting.getRoutingCode(), "routingCode", result); + DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingCode(), "routingCode", result); DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingName(), "routingName", result); // DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result); DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result); From 019cb91a4c285704eeb197f4ae1197202429107d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 26 Dec 2019 09:51:41 +0800 Subject: [PATCH 030/139] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A132?= =?UTF-8?q?9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 111 +++++++-------------- .../i3plus/pojo/mes/bean/MesButtonStatus.java | 18 +--- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 23 +++++ 3 files changed, 61 insertions(+), 91 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 2a2e426..9c4d8f6 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 @@ -12,6 +12,41 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { + /** + * JIS发运模式类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_JIS_PATTERN_TYPE { + ONE(10, "一套发运"), + TRUE(20, "多套发运"), + FALSE(30, "单产品多套发运"); + + private int value; + private String description; + + MES_JIS_PATTERN_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; + } + } /** * 是否解析 @@ -2386,82 +2421,6 @@ public class MesEnumUtil { } /** - * mes按钮状态配置 判断符号 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_BUTTON_STATUS_JUDGE_FLAG { - - EQUAL("=", "等于"), - NOT_EQUAL("!=", "不等于"), - GREATER_THAN(">", "大于"), - NOT_LESS_THAN(">=", "大于大于"), - LESS_THAN("<", "小于"), - NOT_GREATER_THAN("<=", "小于等于"); - - private String value; - private String description; - - MES_BUTTON_STATUS_JUDGE_FLAG(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(String val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value.equals(val)) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** - * mes按钮状态配置 逻辑符号 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_BUTTON_STATUS_LOGIC_FLAG { - - AND("&&", "逻辑与"), - OR("||", "逻辑或"); - - private String value; - private String description; - - MES_BUTTON_STATUS_LOGIC_FLAG(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(String val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value.equals(val)) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** * MesWorkOrder实体对应的approvalStatus值 审批状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java index 5c7d7ae..1b7c85c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java @@ -37,21 +37,9 @@ public class MesButtonStatus extends BaseBean { @ApiParam("实体类名称") private String ClassName; - @Column(name = "STATUS_FIELD") - @ApiParam("状态字段") - private String statusField; - - @Column(name = "JUDGE_FLAG") - @ApiParam("判断符合") - private String judgeFlag; - - @Column(name = "STATUS_VALUE") - @ApiParam("状态值") - private String statusValue; - - @Column(name = "LOGIC_FLAG") - @ApiParam("逻辑符合") - private String logicFlag; + @Column(name = "APPEND_HQL") + @ApiParam("拼接HQL") + private String appendHql; @Column(name = "STATUS_DESC") @ApiParam("描述") 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 b9eb3ec..8d904cf 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 @@ -2097,4 +2097,27 @@ public class MesHqlPack { } return packBean; } + + /** + * JIS发运模式 + * @param jisPattern + * @param organizeCode + * @return + */ + public static DdlPackBean getJisPatternCondition(MesJisPattern jisPattern, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(jisPattern, organizeCode); + if (!StringUtils.isEmpty(jisPattern.getPatternNo())) { + DdlPreparedPack.getStringLikerPack(jisPattern.getPatternNo(), "patternNo", packBean); + } + if (!StringUtils.isEmpty(jisPattern.getTopNo())) { + DdlPreparedPack.getNumEqualPack(jisPattern.getTopNo(), "topNo", packBean); + } + if (!StringUtils.isEmpty(jisPattern.getHandleNo())) { + DdlPreparedPack.getNumEqualPack(jisPattern.getHandleNo(), "handleNo", packBean); + } + if (!StringUtils.isEmpty(jisPattern.getPatternType())) { + DdlPreparedPack.getNumEqualPack(jisPattern.getPatternType(), "patternType", packBean); + } + return packBean; + } } From fb8b07b2274ec745f1a67abb11cabb03ca582ad2 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 26 Dec 2019 10:01:03 +0800 Subject: [PATCH 031/139] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A132?= =?UTF-8?q?9=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 | 23 +--------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 8d904cf..22f0c48 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 @@ -2098,26 +2098,5 @@ public class MesHqlPack { return packBean; } - /** - * JIS发运模式 - * @param jisPattern - * @param organizeCode - * @return - */ - public static DdlPackBean getJisPatternCondition(MesJisPattern jisPattern, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(jisPattern, organizeCode); - if (!StringUtils.isEmpty(jisPattern.getPatternNo())) { - DdlPreparedPack.getStringLikerPack(jisPattern.getPatternNo(), "patternNo", packBean); - } - if (!StringUtils.isEmpty(jisPattern.getTopNo())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getTopNo(), "topNo", packBean); - } - if (!StringUtils.isEmpty(jisPattern.getHandleNo())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getHandleNo(), "handleNo", packBean); - } - if (!StringUtils.isEmpty(jisPattern.getPatternType())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getPatternType(), "patternType", packBean); - } - return packBean; - } + } From 5ea55135dc7d211e12e3893a0784e59b39d54a4f Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 26 Dec 2019 10:12:29 +0800 Subject: [PATCH 032/139] =?UTF-8?q?=E3=80=906714=20FIFO=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E5=8F=98=E5=8C=96=E6=97=B6=E9=9C=80=E8=A6=81=E6=9C=89=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=8A=A0=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E9=80=9A=E7=94=A8=E5=8F=98=E9=87=8F=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=BB=84=E4=BB=B6=E4=BF=9D=E5=AD=98=E4=B8=8A=E6=AC=A1?= =?UTF-8?q?=E7=9A=84FIFO=E4=BF=A1=E6=81=AF=E3=80=82=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 | 4 ++++ 1 file changed, 4 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 892693a..422cf79 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 @@ -278,6 +278,10 @@ public class WmsStockSn extends BaseBean { @ApiParam("是否寄售 1-是 2-否") private Integer consignation; + @Transient + @ApiParam(value = "是否最早批次") + public String isFifo; + public WmsStockSn() { } From 629e2f82706ac469c96ea9e676336767b3b72c01 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 26 Dec 2019 11:11:24 +0800 Subject: [PATCH 033/139] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=88=96=E4=BF=9D=E5=AD=98=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/model/GanttPager.java | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java new file mode 100644 index 0000000..3da5e29 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import io.swagger.annotations.Api; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 甘特图分页查询参数 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-11-22 + * @Modify: + **/ +@Data +@Api("甘特图分页查询参数") +public class GanttPager extends Pager { + public static class SortData { + // 排序对象 + private String field; + // 排序类型，1为升序，0为降序 + private Boolean ascending; + + public String getField() { + return field; + } + + public void setField(String field) { + this.field = field; + } + + public Boolean getAscending() { + return ascending; + } + + public void setAscending(Boolean ascending) { + this.ascending = ascending; + } + } + private String filter; + private List sorts; +} From b5d50af25077c49dd93dfed78c142530c71975a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 26 Dec 2019 11:34:49 +0800 Subject: [PATCH 034/139] =?UTF-8?q?=E3=80=90KT-1284=20=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=8B=89=E5=8A=A8-=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=AE=A1=E7=90=86=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/WmsFile.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java index c37935e..4a71d08 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java @@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import javax.persistence.*; /** * @Description : 附件表 @@ -58,4 +55,8 @@ public class WmsFile extends BaseBean{ @Column(name = "REF_TYPE") @ApiParam(value = "关联单据类型") private String refType; + + @Transient + @ApiParam("预览前缀") + public String previewPrefix; } \ No newline at end of file From 32c9bbbe85628523153788ef42aaba537dfa012e Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 26 Dec 2019 11:39:33 +0800 Subject: [PATCH 035/139] =?UTF-8?q?task=20`1308`=204=20=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java | 15 +++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesProductData.java | 2 ++ .../mes/repositorymongo/MesProductDataRepository.java | 15 +++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java new file mode 100644 index 0000000..e4d90a6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.annotation; + + +import java.lang.annotation.*; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/25 1:45 下午 + * @Description: + **/ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +@Documented +public @interface UseMongoDb { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index 2b2d84a..602bb21 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -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.annotation.UseMongoDb; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -33,6 +34,7 @@ import javax.persistence.Transient; @Index(columnList = "OBJECT_CODE"), @Index(columnList = "MODIFY_DATE_TIME") }) +//@UseMongoDb @Api("生产数据") public class MesProductData extends BaseBean { @Column(name = "WORK_CENTER_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java new file mode 100644 index 0000000..2f615de --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java @@ -0,0 +1,15 @@ +//package cn.estsh.i3plus.pojo.mes.repositorymongo; +// +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; +//import cn.estsh.i3plus.pojo.mes.bean.MesProductData; +//import org.springframework.stereotype.Repository; +// +///** +// * @Author: Wynne.Lu +// * @CreateDate: 2019/12/25 1:30 下午 +// * @Description: +// **/ +//@Repository +//public interface MesProductDataRepository extends BaseMongoRepository { +//} From 1f8885779f840c204858b35892b3a6aa958e3f45 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 26 Dec 2019 12:50:53 +0800 Subject: [PATCH 036/139] =?UTF-8?q?=E3=80=906714=20FIFO=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E5=8F=98=E5=8C=96=E6=97=B6=E9=9C=80=E8=A6=81=E6=9C=89=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=8A=A0=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E9=80=9A=E7=94=A8=E5=8F=98=E9=87=8F=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=BB=84=E4=BB=B6=E4=BF=9D=E5=AD=98=E4=B8=8A=E6=AC=A1?= =?UTF-8?q?=E7=9A=84FIFO=E4=BF=A1=E6=81=AF=E3=80=82=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 3ac14cc..813538d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -208,7 +208,11 @@ public class WmsDocMovementDetails extends BaseBean { @Transient @ApiParam("优先级") - private String priority; + private Integer priority; + + @Transient + @ApiParam("优先级描述") + private String priorityStr; public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; @@ -272,8 +276,10 @@ public class WmsDocMovementDetails extends BaseBean { this.destLocateNo = destLocateNo; } - public WmsDocMovementDetails (String partNo) { + public WmsDocMovementDetails (String partNo,Integer priority,String orderNo) { this.partNo = partNo; + this.priority = priority; + this.orderNo = orderNo; } public WmsDocMovementDetails (String partNo,String orderNo) { From 7f69df95df33854d25d829f0eec8f2921359bced Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 26 Dec 2019 13:53:17 +0800 Subject: [PATCH 037/139] =?UTF-8?q?=E3=80=90=E5=AD=98=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E7=9B=98=E7=82=B9=EF=BC=8C=E6=89=AB=E6=8F=8F=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=86=85=E5=AE=B9=E2=80=9C?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E6=9D=A1=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E2=80=9D=E3=80=91=E3=80=90bug7060=09?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 14c0486..c08e1eb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -181,6 +181,23 @@ public class WmsCSFactTrans extends BaseBean { this.srcZoneNo = srcZoneNo; this.srcWhNo = srcWhNo; } + + public WmsCSFactTrans(String orderNo, String whNo, String zoneNo, String locateNo,Double factQty, String partNo, String partNameRdd, String sn, Double qty, String unit, String srcLocateNo, String srcZoneNo, String srcWhNo,String vendorNo) { + this.orderNo = orderNo; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.factQty = factQty; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.sn = sn; + this.qty = qty; + this.unit = unit; + this.srcLocateNo = srcLocateNo; + this.srcZoneNo = srcZoneNo; + this.srcWhNo = srcWhNo; + this.vendorNo= vendorNo; + } public WmsCSFactTrans(String partNo,String partNameRdd,String unit, String orderNo, String organizeCode,double qty) { this.partNo=partNo; this.partNameRdd = partNameRdd; From d34ba5e11428438779b334af054004844d80b117 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 26 Dec 2019 16:20:56 +0800 Subject: [PATCH 038/139] =?UTF-8?q?=E3=80=90=20=E7=BB=8F=E8=AE=A8=E8=AE=BA?= =?UTF-8?q?=E5=85=AD=E5=90=88=E4=B8=80=E5=85=81=E8=AE=B8=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E6=88=96=E7=9B=AE=E6=A0=87=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E7=9A=84=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E4=BD=86=E6=98=AF?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=E9=9C=80=E8=A6=81=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E6=9D=A5=E6=BA=90=E6=8B=86=E5=88=86=E6=88=90?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E7=9A=84=E5=8D=95=E6=8D=AE=20=E3=80=91bug706?= =?UTF-8?q?8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 813538d..6d25a62 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -210,9 +210,6 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("优先级") private Integer priority; - @Transient - @ApiParam("优先级描述") - private String priorityStr; public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; From 032bd61b878d974e643a5cc653792b8f99a4c23d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 26 Dec 2019 16:32:59 +0800 Subject: [PATCH 039/139] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=8B=86=E5=88=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AD=89=E4=BB=BD=E6=8B=86=E5=88=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD+=20=E5=BF=AB=E9=80=9F=E7=A7=BB=E5=BA=93=E5=86=99?= =?UTF-8?q?=E5=85=A5=E7=A7=BB=E5=8A=A8=E5=8D=95=E6=98=8E=E7=BB=86=E7=9A=84?= =?UTF-8?q?=E8=A1=8C=E5=8F=B7=E5=86=99=E5=85=A5=E8=A7=84=E5=88=99=E4=B8=8D?= =?UTF-8?q?=E5=AF=B9=EF=BC=8C=E4=BC=98=E5=8C=96=E6=80=A7=E8=83=BD+=20?= =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E6=89=A3=E5=87=8F=E4=BA=A4=E6=98=93=E5=A4=84?= =?UTF-8?q?=E7=90=86=E7=BB=84=E4=BB=B6=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=9A=E6=9C=89=E6=9D=A1=E7=A0=81=E5=B0=B1=E6=89=A3=E5=87=8F?= =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E5=8A=A8=E5=8D=95=E6=98=8E=E7=BB=86=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=B2=E5=A4=84=E7=90=86=E6=95=B0=E9=87=8F?= =?UTF-8?q?=EF=BC=8C=E5=A4=84=E7=90=86=E5=AE=8C=E6=AF=95=E6=89=8D=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=A7=BB=E5=8A=A8=E5=8D=95=E7=9A=84=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=BA=E5=B7=B2=E5=A4=84=E7=90=86=E5=B9=B6=E4=BC=A0=E7=BB=99?= =?UTF-8?q?MOVE=5FTO=5FERP=E5=A4=84=E7=90=86=E7=A8=8B=E5=BA=8F+=20?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=BA=93=E5=AD=98=E6=98=8E=E7=BB=86=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=88=97=E2=80=9C=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=B8=AD=E6=95=B0=E9=87=8F=E2=80=9D=EF=BC=88=E5=BE=85=E8=BF=87?= =?UTF-8?q?=E8=B4=A6=E7=9A=84=E6=95=B0=E9=87=8F=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 4 ++++ .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 11 ++++++++--- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 22 ++++++++++++---------- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 8e6d27e..f1bf9a0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -62,6 +62,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam(value = "处理数量", example = "0") public Double transQty; + @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)") + @ApiParam(value = "已处理数量", example = "0") + public Double handledQty; + public Double getTransQty() { return this.transQty == null ? 0 : this.transQty.doubleValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 811158c..837cbf2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -124,14 +124,18 @@ public class WmsStockQuan extends BaseBean { private String prodCfgTypeName; @Transient - @ApiParam(value = "箱数", example = "-1") + @ApiParam(value = "箱数") private Integer boxQty; @Transient - @ApiParam(value = "零件数", example = "-1") + @ApiParam(value = "零件数") private Double partQty; @Transient + @ApiParam(value = "处理中数量") + private Double transQty; + + @Transient @ApiParam(value = "ERP库存地") private String areaNo; @@ -211,7 +215,7 @@ public class WmsStockQuan extends BaseBean { public WmsStockQuan(String whNo, String zoneNo, String unit, String partNo, String partName, Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, - Double consignQty, Double lockQty,Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) { + Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) { this.whNo = whNo; this.zoneNo = zoneNo; this.partNo = partNo; @@ -281,5 +285,6 @@ public class WmsStockQuan extends BaseBean { this.consignQty = consignQty; this.lockQty = lockQty; this.scrapQty = scrapQty; + this.totalQty = qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty + scrapQty; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index bb2b334..73bfda6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -229,13 +229,13 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getContainerNo(), "containerNo", result); - if (wmsPOMaster.getPriorRC()!=null&&wmsPOMaster.getPriorRC()==WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()){ + if (wmsPOMaster.getPriorRC() != null && wmsPOMaster.getPriorRC() == WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) { ArrayList numList = new ArrayList<>(); numList.add(0); numList.add(wmsPOMaster.getPriorRC()); numList.add(null); DdlPreparedPack.getNotOrIsNull(numList, "priorRC", result); - }else{ + } else { DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result); } @@ -923,8 +923,8 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); - DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo",result); - DdlPreparedPack.getStringLikerPack(wmsStockSn.getQualityDate(),"qualityDate",result); + DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(), "packageNo", result); + DdlPreparedPack.getStringLikerPack(wmsStockSn.getQualityDate(), "qualityDate", result); if (wmsStockSn.getSnStatus() == null) { DdlPreparedPack.getInPackArray(new Integer[]{ WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(), @@ -1613,7 +1613,9 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result); - DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); + DdlPreparedPack.getOrderByPack( + new Object[]{CommonEnumUtil.FALSE, CommonEnumUtil.FALSE}, + new String[]{"sn", "createDatetime"}, result); return result; } @@ -2007,8 +2009,8 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); - DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo", result); - DdlPreparedPack.getNumEqualPack(wmsStockSn.getVendorNo(),"vendorNo", result); + DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(), "packageNo", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringNotNullPack("locateNo", result); result.setWhereAppend(result.getWhereAppend() + " and locateNo != ''"); @@ -2618,15 +2620,15 @@ public class WmsHqlPack { * @param wmsPullTaskMaster * @return */ - public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) { + public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster, String statusList) { DdlPackBean result = new DdlPackBean(); List stringList = null; List integerList = null; //List integers = Arrays.stream(statusList.split(",")).map(Integer::parseInt).collect(Collectors.toList()); - if(StringUtils.isNotBlank(statusList)){ + if (StringUtils.isNotBlank(statusList)) { stringList = Arrays.asList(statusList.split(",")); integerList = new ArrayList<>(); - for(String sl : stringList){ + for (String sl : stringList) { integerList.add(Integer.valueOf(sl)); } } From 1d9ab80ae812e8188ec6bc65cbb5c27c4056b99e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 26 Dec 2019 16:48:43 +0800 Subject: [PATCH 040/139] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E9=80=82?= =?UTF-8?q?=E9=85=8D=E5=99=A8=20-=20=E6=89=B9=E9=87=8F=E5=86=99=E5=85=A5?= =?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/BlockFormEnumUtil.java | 5 ++--- .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index e19e6e5..df7fad0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; -import java.util.Date; /** * @Description : 模块表单枚举类 @@ -1973,7 +1972,7 @@ public class BlockFormEnumUtil { } private String getJDBCUrlMySQL(String database,String host,Integer port){ - return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8"; + return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8&rewriteBatchedStatements=true"; } private String getJDBCUrlOracle(String database,String host,Integer port){ @@ -1985,7 +1984,7 @@ public class BlockFormEnumUtil { } private String getJDBCUrlSQLServer(String database,String host,Integer port){ - return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database; + return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+"?rewriteBatchedStatements=true"; } } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java index 03ab889..7a8856c 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.thoughtworks.xstream.annotations.XStreamAlias; @@ -68,6 +69,7 @@ public class BsSuitCaseParam extends BaseBean { @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE.class) private Integer paramValTypeId; + @JsonIgnore public int getParamValTypeIdVal() { return paramValTypeId == null ? NumberUtils.INTEGER_MINUS_ONE : paramValTypeId.intValue(); } @@ -88,6 +90,7 @@ public class BsSuitCaseParam extends BaseBean { @ApiParam(value = "参数值") private Object paramValue; + @JsonIgnore public String getParamValueStr() { if (paramValue == null) { return null; From 20ccf65c5c391dec97f3d556a4882eae6902b9bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 26 Dec 2019 17:13:48 +0800 Subject: [PATCH 041/139] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/LacEnumUtil.java | 47 +++++++++++++++++----- .../i3plus/pojo/lac/bean/LacCommandStackStep.java | 4 ++ .../pojo/lac/bean/LacCommandStackStepTask.java | 10 ++--- .../i3plus/pojo/lac/bean/LacSuitTaskParam.java | 1 + .../estsh/i3plus/pojo/lac/bean/LacTaskCheck.java | 8 ++++ .../pojo/model/lac/LacCommandStackModel.java | 9 ++++- pom.xml | 3 +- 7 files changed, 63 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java index dfb4079..a1db447 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java @@ -223,7 +223,8 @@ public class LacEnumUtil { public enum PARAM_VALUE_TYPE{ INTEGER(1,"整数"), STRING(2,"字符串"), - FLOAT(3,"浮点"); + FLOAT(3,"浮点"), + ORGIN(99,"原始数据"); private int value; private String description; @@ -347,15 +348,17 @@ public class LacEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum LOGICAL_OPERATOR{ - OR(10,"或"), - AND(20,"与"); + OR(10,"或","||"), + AND(20,"与","&&"); private int value; private String description; + private String operator; - LOGICAL_OPERATOR(int value, String description) { + LOGICAL_OPERATOR(int value, String description, String operator) { this.value = value; this.description = description; + this.operator = operator; } public int getValue() { @@ -376,6 +379,16 @@ public class LacEnumUtil { return tmp; } + public static String valueOfOperator(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].operator; + } + } + return tmp; + } + } /** @@ -383,19 +396,21 @@ public class LacEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum RELATIONAL_OPERATOR{ - GT(10,">"), - LT(20,"<"), - EQ(20,"=="), - NE(20,"!="), - GE(20,">="), - LE(20,"<="); + GT(10,"大于",">"), + LT(20,"小于","<"), + EQ(30,"等于","=="), + NE(40,"不等于","!="), + GE(50,"大于等于",">="), + LE(60,"小于等于","<="); private int value; private String description; + private String operator; - RELATIONAL_OPERATOR(int value, String description) { + RELATIONAL_OPERATOR(int value, String description,String operator) { this.value = value; this.description = description; + this.operator = operator; } public int getValue() { @@ -416,6 +431,16 @@ public class LacEnumUtil { return tmp; } + public static RELATIONAL_OPERATOR valueOf(int val) { + RELATIONAL_OPERATOR tmp = EQ; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i]; + } + } + return tmp; + } + } /** diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java index e9cacb4..1caf947 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java @@ -9,6 +9,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @@ -84,6 +85,9 @@ public class LacCommandStackStep extends BaseBean { @ApiParam(value ="步骤任务列表") private List stepTaskList; + @Transient + @ApiParam(value ="步骤任务检查") + private List taskCheckList; public LacCommandStackStep() { } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java index 50433f4..63154b6 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java @@ -85,10 +85,10 @@ public class LacCommandStackStepTask extends BaseBean { // @Column(name="STEP_NAME_RDD") // @ApiParam(value ="步骤名称") // private String stepNameRdd; -// -// @Column(name="STEP_CODE_RDD") -// @ApiParam(value ="步骤代码") -// private String stepCodeRdd; + + @Column(name="STEP_CODE_RDD") + @ApiParam(value ="步骤代码") + private String stepCodeRdd; @Column(name="TASK_ID") @ApiParam(value ="任务ID") @@ -99,7 +99,7 @@ public class LacCommandStackStepTask extends BaseBean { @ApiParam(value ="步骤名称") private String taskNameRdd; - @Column(name="STEP_CODE_RDD") + @Column(name="TASK_CODE_RDD") @ApiParam(value ="任务代码") private String taskCodeRdd; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java index 49e34bf..697b68e 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java @@ -82,6 +82,7 @@ public class LacSuitTaskParam extends BaseBean { @Column(name="PARAM_VALUE_TYPE") @ApiParam(value ="参数值类型") + @AnnoOutputColumn(refClass = LacEnumUtil.PARAM_VALUE_TYPE.class) private Integer paramValueType; @Column(name="PARAM_DEFAULT_VALUE") diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java index 5c14b36..dd50d24 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java @@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : @@ -97,4 +98,11 @@ public class LacTaskCheck extends BaseBean { @ApiParam(value ="目标步骤ID") @JsonSerialize(using = ToStringSerializer.class) private Long targetStepId; + + @Column(name="TARGET_STEP_NAME_RDD") + @ApiParam(value ="目标步骤名称") + private String targetStepNameRdd; + + @Transient + private String value; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java index 0574386..ddcfd44 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.lac; import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask; import lombok.Data; import org.slf4j.LoggerFactory; @@ -55,9 +56,13 @@ public class LacCommandStackModel { this.recordId = commandStackRecord.getId(); } - public Object getTaskRequestParam(String taskCode){ + public Object getTaskRequestParam(LacCommandStackStepTask stepTask){ for (Task task : this.getRequest().getTaskList()) { - if(task.getCode().equals(taskCode)){ + // 步骤代码为空时匹配所有任务参数 + if (task.getStepCode() == null && task.getCode().equals(stepTask.getTaskCodeRdd())) { + return task.getParamList(); + } else if (task.getStepCode() != null && task.getStepCode().equals(stepTask.getStepCodeRdd()) + && task.getCode().equals(stepTask.getTaskCodeRdd())) { return task.getParamList(); } } diff --git a/pom.xml b/pom.xml index 9caeb95..5918acc 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,8 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-DEV-SNAPSHOT + modules/i3plus-pojo-base modules/i3plus-pojo-platform modules/i3plus-pojo-model From 9e47c4ac5af0f221545032199c2e4512dd3bc3fb Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Fri, 27 Dec 2019 10:00:30 +0800 Subject: [PATCH 042/139] =?UTF-8?q?=E3=80=90#1332=20=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE-=E5=AE=B9=E5=99=A8=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91=E6=96=B0=E5=A2=9E=E6=9C=9F=E9=99=90?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java index def0261..3c51124 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java @@ -47,4 +47,8 @@ public class WmsContainerType extends BaseBean { @ApiParam(value = "是否回收") @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") private Integer isRecycle; + + @Column(name = "LIMIT_UOM") + @ApiParam(value = "期限单位") + private String limitUom; } From 8b1ae09885cad64eaffee168a6744fccb1b82289 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 27 Dec 2019 14:01:53 +0800 Subject: [PATCH 043/139] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/aps/model/GanttEventModel.java | 31 ++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/model/GanttPager.java | 43 ---------------------- 2 files changed, 31 insertions(+), 43 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java new file mode 100644 index 0000000..05bf634 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import cn.estsh.i3plus.pojo.base.common.Pager; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.annotations.Api; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @Description : 甘特图分页查询参数 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-11-22 + * @Modify: + **/ +@Data +@Api("甘特图分页查询参数") +public class GanttEventModel { + private Long[] resourceIds; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date begin; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date end; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java deleted file mode 100644 index 3da5e29..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.model; - -import cn.estsh.i3plus.pojo.base.common.Pager; -import io.swagger.annotations.Api; -import lombok.Data; - -import java.util.List; - -/** - * @Description : 甘特图分页查询参数 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-11-22 - * @Modify: - **/ -@Data -@Api("甘特图分页查询参数") -public class GanttPager extends Pager { - public static class SortData { - // 排序对象 - private String field; - // 排序类型，1为升序，0为降序 - private Boolean ascending; - - public String getField() { - return field; - } - - public void setField(String field) { - this.field = field; - } - - public Boolean getAscending() { - return ascending; - } - - public void setAscending(Boolean ascending) { - this.ascending = ascending; - } - } - private String filter; - private List sorts; -} From d94ccd5ac57e2da962a5251f1b70dbd6e5e8bace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 27 Dec 2019 14:48:07 +0800 Subject: [PATCH 044/139] =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E6=89=A3=E5=87=8F?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6BUG?= =?UTF-8?q?=EF=BC=9A=E8=8E=B7=E5=8F=96=E5=8F=8C=E7=B2=BE=E5=BA=A6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=95=B0=E5=80=BC=E6=97=B6=E5=BA=94=E8=AF=A5=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BAgetHandledQtyVal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 23 ++++++++-------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index f1bf9a0..3311b77 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -66,10 +66,6 @@ public class WmsMoveDetails extends BaseBean { @ApiParam(value = "已处理数量", example = "0") public Double handledQty; - public Double getTransQty() { - return this.transQty == null ? 0 : this.transQty.doubleValue(); - } - @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "不合格处理数量", example = "0") public Double rejectQty; @@ -202,17 +198,6 @@ public class WmsMoveDetails extends BaseBean { return isSnapshot == null ? 0 : isSnapshot.intValue(); } - - /* @JSONField(name="fPartNo") - public String getfPartNo() { - return fPartNo; - } - - @JSONField(name="fPartName") - public String getfPartName() { - return fPartName; - }*/ - public WmsMoveDetails() { } @@ -293,4 +278,12 @@ public class WmsMoveDetails extends BaseBean { this.modifyDatetime = modifyDatetime; this.modifyUser = modifyUser; } + + public Double getTransQty() { + return this.transQty == null ? 0 : this.transQty.doubleValue(); + } + public Double getHandledQtyVal() { + return this.handledQty == null ? 0 : this.handledQty.doubleValue(); + } + } From e962a1d22ae75da43ab2a4bdb1e8e2f26e9f5777 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Fri, 27 Dec 2019 15:24:57 +0800 Subject: [PATCH 045/139] =?UTF-8?q?=E3=80=90#1331=20KT-=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE-=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=91=E2=80=9C=E6=A0=87=E5=87=86=E5=8C=85=E8=A3=85=E2=80=9D?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E2=80=9C=E6=A0=87=E5=8C=85=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.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/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index be7ffe3..370667a 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 @@ -90,7 +90,7 @@ public class WmsPart extends BaseBean { private Double pu2su; @Column(name = "SNP", columnDefinition = "decimal(18,8)") - @ApiParam(value = "标准包装", example = "1") + @ApiParam(value = "标包", example = "1") private Double snp; @ColumnDefault("2") From b175de463566ffa50b11d489a3a967801fb656a7 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Fri, 27 Dec 2019 15:26:23 +0800 Subject: [PATCH 046/139] =?UTF-8?q?=E3=80=90#1335=20=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE-=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E3=80=91"=E9=BB=98=E8=AE=A4=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E7=B1=BB=E5=9E=8B"=E6=94=B9=E4=B8=BA"=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E7=B1=BB=E5=9E=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.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/WmsPackageSpec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java index 4b4a129..71eb010 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java @@ -54,7 +54,7 @@ public class WmsPackageSpec extends BaseBean { @Column(name = "POCKET_TYPE") - @ApiParam(value = "默认容器类型") + @ApiParam(value = "容器类型") private String pocketType; @ApiParam(value = "上级规格名称") From 62c50e04cc8f0c5ae1d5c1b5ef0f1dc9f992650c Mon Sep 17 00:00:00 2001 From: gcj Date: Fri, 27 Dec 2019 15:48:37 +0800 Subject: [PATCH 047/139] =?UTF-8?q?=E3=80=90=E5=AE=81=E5=BE=B7=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=B8=85=E5=8D=95=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/WmsBom.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index 27a400a..2be688f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -123,4 +123,13 @@ public class WmsBom extends BaseBean { this.bomNum = bomNum; this.itemQty = itemQty; } + + public WmsBom(String itemPartNo, String itemPartNam, String itemUnit, String bomNum, Double itemQty,String effStartTime) { + this.itemPartNo = itemPartNo; + this.itemPartNam = itemPartNam; + this.itemUnit = itemUnit; + this.bomNum = bomNum; + this.itemQty = itemQty; + this.effStartTime = effStartTime; + } } From 6b02d9969a61302dd5454c38d4ac087b4048a2d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 27 Dec 2019 19:06:37 +0800 Subject: [PATCH 048/139] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=86=99=E5=85=A5=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/BlockFormEnumUtil.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/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index df7fad0..b1a8fc7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -1972,7 +1972,7 @@ public class BlockFormEnumUtil { } private String getJDBCUrlMySQL(String database,String host,Integer port){ - return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8&rewriteBatchedStatements=true"; + return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8"; } private String getJDBCUrlOracle(String database,String host,Integer port){ @@ -1984,7 +1984,7 @@ public class BlockFormEnumUtil { } private String getJDBCUrlSQLServer(String database,String host,Integer port){ - return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+"?rewriteBatchedStatements=true"; + return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true"; } } From 3b7b374b23b84feacbdc444d31b0b13a984d92cf Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 27 Dec 2019 19:55:04 +0800 Subject: [PATCH 049/139] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E6=A8=A1=E5=9E=8B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 443 -------------------- .../pojo/base/enumutil/BlockReportEnumUtil.java | 295 +++++++++++--- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 453 +++++++++++++++++++++ .../pojo/lac/bean/LacCommandStackRecord.java | 5 + .../cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java | 5 + .../i3plus/pojo/model/common/ClassFieldModel.java | 13 +- .../i3plus/pojo/model/form/SqlColumnModel.java | 3 +- .../pojo/model/report/BeanBrPojoAttrModel.java | 70 ++-- .../pojo/model/report/BrDataSourceModel.java | 47 +++ .../i3plus/pojo/model/report/TemplateModel.java | 78 +++- .../pojo/platform/platbean/SysLogException.java | 2 +- .../pojo/platform/platbean/SysLogSystem.java | 1 + .../estsh/i3plus/pojo/report/bean/BrElement.java | 3 - .../cn/estsh/i3plus/pojo/report/bean/BrLayout.java | 12 +- .../i3plus/pojo/report/bean/BrLayoutColumn.java | 10 +- .../estsh/i3plus/pojo/report/bean/BrLayoutRow.java | 8 +- .../cn/estsh/i3plus/pojo/report/bean/BrPojo.java | 137 +++++++ .../i3plus/pojo/report/bean/BrPojoFilter.java | 46 +++ .../i3plus/pojo/report/bean/BrPojoFilterAttr.java | 129 ++++++ .../estsh/i3plus/pojo/report/bean/BrPojoView.java | 79 ++++ .../i3plus/pojo/report/bean/BrPojoViewAttr.java | 112 +++++ .../estsh/i3plus/pojo/report/bean/BrRefPojo.java | 154 +++---- .../pojo/report/bean/BrRefReportTypeset.java | 15 +- .../i3plus/pojo/report/bean/BrRefServerPojo.java | 230 +++++------ .../pojo/report/bean/BrRefTemplateServer.java | 100 ++--- .../cn/estsh/i3plus/pojo/report/bean/BrReport.java | 2 - .../i3plus/pojo/report/bean/BrReportTemplate.java | 112 ++--- .../estsh/i3plus/pojo/report/bean/BrTemplate.java | 330 +++++++-------- .../pojo/report/bean/BrTemplateCustomHql.java | 98 ++--- .../repository/BrLayoutColumnRepository.java | 1 - .../repository/BrPojoFilterAttrRepository.java | 15 + .../report/repository/BrPojoFilterRepository.java | 15 + .../pojo/report/repository/BrPojoRepository.java | 15 + .../repository/BrPojoViewAttrRepository.java | 14 + .../report/repository/BrPojoViewRepository.java | 14 + .../report/repository/BrRefPojoRepository.java | 30 +- .../repository/BrRefServerPojoRepository.java | 30 +- .../repository/BrRefTemplateServerRepository.java | 30 +- .../repository/BrReportTemplateRepository.java | 28 +- .../repository/BrTemplateCustomHqlRepository.java | 30 +- .../report/repository/BrTemplateRepository.java | 28 +- .../i3plus/pojo/report/sqlpack/ReportHqlPack.java | 94 +++-- 42 files changed, 2140 insertions(+), 1196 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilter.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoView.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoFilterAttrRepository.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoFilterRepository.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoRepository.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoViewAttrRepository.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoViewRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index e19e6e5..2beae15 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -2071,447 +2071,4 @@ public class BlockFormEnumUtil { } } - /** - * 元素控件类型信息 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PROPERTY_CONTROL_TYPE { - RADIO(100, "RADIO", "单选"), - CHECKBOX(110, "CHECKBOX", "复选"), - TEXT(200, "TEXT", "文本"), - NUMBER(210, "NUMBER", "数字"), - PASSWORD(230, "PASSWORD", "密码"), - DATE_TIME(300, "DATE", "日期",SQL_WHERE.BETWEEN), - // DATE(300, "DATE", "日期(yyyy-MM-dd)"), -// DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"), - // ELEMENT(700, "DICT_SELECT", "元素"), - DICTIONARY(800, "DICT_SELECT", "字典"), - CASCADE(900, "CASCADE", "级联"); - //FILE(400, "file", "文件"), - //IMAGE(410, "image", "image"), - //OFF(500, "color", "颜色"), - - private int value; - private String code; - private String description; - - /** - * 默认查询关系 - */ - private SQL_WHERE defaultWhere; - - PROPERTY_CONTROL_TYPE(int value, String code, String description) { - this.value = value; - this.code = code; - this.description = description; - } - - PROPERTY_CONTROL_TYPE(int value, String code, String description, SQL_WHERE defaultWhere) { - this.value = value; - this.code = code; - this.description = description; - this.defaultWhere = defaultWhere; - } - - public int getValue() { - return value; - } - - public String getCode() { - return code; - } - - public String getDescription() { - return description; - } - - public SQL_WHERE getDefaultWhere() { - return defaultWhere; - } - - public static String valueOfCode(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].code; - } - } - return tmp; - } - - public static int codeOfValue(String code) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { - tmp = values()[i].value; - } - } - return tmp; - } - - public static String valueOfDescription(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - - public static PROPERTY_CONTROL_TYPE valueOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - return values()[i]; - } - } - return null; - } - - public static String codeOfDescription(String code) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** - * 条件运算符 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SQL_WHERE { - EQUAL(1, "=", "等于"), - NOT_EQUAL(2, "<>", "不等于"), - MORE(3, ">", "大于"), - LESS(4, "<", "小于"), - MORE_OR_EQUAL(5, ">=", "大于等于"), - LESS_OR_EQUAL (6, "<=", "小于等于"), - LIKE(7, "LIKE", "全模糊"), - START_LIKE(7, "LIKE", "前模糊"), - END_LIKE(7, "LIKE", "后模糊"), - IN(8, "in", "in"), - BETWEEN(9, "BETWEEN", "区间查询(逗号区分)"),; - - private int value; - private String code; - private String description; - - private SQL_WHERE(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 valueOfCode(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].code; - } - } - return tmp; - } - - public static int codeOfValue(String code) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code.toLowerCase())) { - tmp = values()[i].value; - } - } - return tmp; - } - - public static String valueOfDescription(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - - public static SQL_WHERE valueOf(int val) { - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - return values()[i]; - } - } - return null; - } - - public static String codeOfDescription(String code) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** - * 属性类型信息(属性转换器) - * - *
Form 核心转换器 - *
数据库字段类型转换Java 属性类型 - *
Java 属性 转换为控件类型 - * - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PROPERTY_TYPE { - STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE,""), - CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,""), - INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"), - LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"), - DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"), - FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"), - BIG_DECIMAL(32, "BigDecimal", "大浮点型", "java.math.BigDecimal", BigDecimal.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"), - BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null), - BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null), - DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,SQL_WHERE.BETWEEN,null,"yyyy-MM-dd hh:mm:ss"); - - /** - * 属性类型值 - */ - private int value; - /** - * 属性类型代码 - */ - private String code; - /** - * 属性类型描述 - */ - private String description; - /** - * 属性类型ClassPath - */ - private String classPath; - /** - * 属性类型 Class - */ - private Class clzFullName; - /** - * 属性类型 对应的 控件类型 - */ - private PROPERTY_CONTROL_TYPE controlType; - - /** - * 默认查询关系 - */ - private SQL_WHERE defaultWhere; - - /** - * 默认 格式化 方式 - */ - private String defaultFormat; - - /** - * 默认查询关系 - */ - private String defaultValue; - - private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, - PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) { - this.value = value; - this.code = code; - this.description = description; - this.classPath = classPath; - this.clzFullName = clzFullName; - this.controlType = controlType; - this.defaultWhere = defaultWhere; - } - - private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, - PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) { - this.value = value; - this.code = code; - this.description = description; - this.classPath = classPath; - this.clzFullName = clzFullName; - this.controlType = controlType; - this.defaultWhere = defaultWhere; - this.defaultValue = defaultValue; - this.defaultFormat = defaultFormat; - } - - private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, - PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue,String defaultFormat) { - this.value = value; - this.code = code; - this.description = description; - this.classPath = classPath; - this.clzFullName = clzFullName; - this.controlType = controlType; - this.defaultWhere = defaultWhere; - this.defaultValue = defaultValue; - this.defaultFormat = defaultFormat; - } - - public int getValue() { - return value; - } - - public String getCode() { - return code; - } - - public String getDescription() { - return description; - } - - public String getClassPath() { - return classPath; - } - - public Class getClzFullName() { - return clzFullName; - } - - public PROPERTY_CONTROL_TYPE getControlType() { - return controlType; - } - - public SQL_WHERE getDefaultWhere() { - return defaultWhere; - } - - public String getDefaultFormat() { - return defaultFormat; - } - - public String getDefaultValue() { - return defaultValue; - } - - public static String valueOfCode(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].code; - } - } - return tmp; - } - - public static PROPERTY_TYPE valueOfClzFullName(int val) { - PROPERTY_TYPE tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i]; - } - } - return tmp; - } - - - public static PROPERTY_CONTROL_TYPE valueOfControlType(int val) { - PROPERTY_CONTROL_TYPE tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].controlType; - } - } - return tmp; - } - - public static int codeOfValue(String code) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { - tmp = values()[i].value; - } - } - return tmp; - } - - public static int codeOfClzFullName(Class clzFullName) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].clzFullName.equals(clzFullName)) { - tmp = values()[i].value; - } - } - return tmp; - } - - public static int codeOfClassPath(String classPath) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].classPath.equals(classPath)) { - tmp = values()[i].value; - } - } - return tmp; - } - - public static String valueOfDescription(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - - public static PROPERTY_TYPE valueOfClassPath(String classPath) { - PROPERTY_TYPE tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].classPath.equals(classPath)) { - tmp = values()[i]; - } - } - return tmp; - } - - public static PROPERTY_TYPE valueOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - return values()[i]; - } - } - return null; - } - - public static PROPERTY_TYPE indexOf(String val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (val.indexOf(values()[i].value) >= 0) { - return values()[i]; - } - } - return null; - } - - public static String codeOfDescription(String code) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code)) { - tmp = values()[i].description; - } - } - return tmp; - } - } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java index 6a9c5f6..a39c5d4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java @@ -55,7 +55,6 @@ public class BlockReportEnumUtil { } - /** * 报表布局枚举 * TABLE(1,"表格"),CHART(2,"图表"); @@ -95,8 +94,6 @@ public class BlockReportEnumUtil { } } - - /** * 功能级别 */ @@ -277,7 +274,6 @@ public class BlockReportEnumUtil { } } - /** * 数据状态 * 1 启用 @@ -446,20 +442,21 @@ public class BlockReportEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum HQL_WHERE{ - GT(1, ">", "大于"), - GT_EQUAL(2, ">=", "大于等于"), - LT(3, "<", "小于等于"), - LT_EQUAL(4, "<=", "小于等于"), - LIKE(5, "LIKE", "模糊"), - LIKE_LEFT(6, "LIKE", "左模糊"), - LIKE_RIGHT(7, "LIKE", "右模糊"), - EQUAL(8, "=", "等于"), - EQUAL_NOT(9, "<>", "不等于"), -// AND(10, "AND", "AND"), -// OR(11, "OR", "OR"), -// NOT(12, "NOT", "NOT"), - IS_NULL(13, "IS NULL", "IS NULL"), - IS_NOT_NULL(14, "IS NOT NULL", "IS NOT NULL"); + GT(1, " > ", "大于"), + GT_EQUAL(2, " >= ", "大于等于"), + LT(3, " < ", "小于等于"), + LT_EQUAL(4, " <= ", "小于等于"), + LIKE(5, " LIKE ", "模糊"), + LIKE_LEFT(6, " LIKE ", "左模糊"), + LIKE_RIGHT(7, " LIKE ", "右模糊"), + EQUAL(8, " = ", "等于"), + EQUAL_NOT(9, " <> ", "不等于"), +// AND(10, " AND ", "AND"), +// OR(11, " OR ", "OR"), +// NOT(12, " NOT ", "NOT"), + IN(8, " IN ", "IN"), + IS_NULL(13, " IS NULL ", "IS NULL"), + IS_NOT_NULL(14, " IS NOT NULL ", "IS NOT NULL"); private int value; private String name; @@ -495,6 +492,74 @@ public class BlockReportEnumUtil { return null; } + public static String valueOfDescription(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i].getDescription(); + } + } + return null; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum HQL_WHERE_REF{ + AND(10, " AND ", "AND"), + OR(11, " OR ", "OR"); + + private int value; + private String name; + private String description; + + HQL_WHERE_REF() { + } + + HQL_WHERE_REF(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 HQL_WHERE_REF valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String valueOfDescription(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i].getDescription(); + } + } + return null; + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -511,9 +576,9 @@ public class BlockReportEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum HQL_REF{ - LEFT_JOIN(1, "left join", "左连接"), - RIGHT_JOIN(2, "right join", "右连接"), - INNER_JOIN(3, "inner join", "内连接"); + LEFT_JOIN(1, " LEFT JOIN ", "左连接"), + RIGHT_JOIN(2, " RIGHT JOIN ", "右连接"), + INNER_JOIN(3, " INNER JOIN ", "内连接"); private int value; private String name; @@ -550,6 +615,16 @@ public class BlockReportEnumUtil { return null; } + public static String valueOfDescription(int val) { + HQL_REF tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i].getDescription(); + } + } + return null; + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -567,11 +642,11 @@ public class BlockReportEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum HQL_AGGREGATION{ - AVG(1, "avg", "平均值"), - MIN(2, "min", "最小值"), - MAX(3, "max", "最大值"), - SUM(4, "sum", "总和"), - COUNT(5, "count", "计数"); + AVG(1, "AVG", "平均值"), + MIN(2, "MIN", "最小值"), + MAX(3, "MAX", "最大值"), + SUM(4, "SUM", "总和"), + COUNT(5, "COUNT", "计数"); private int value; private String name; @@ -632,11 +707,11 @@ public class BlockReportEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum HQL_ATTR_DATA_TYPE{ - SHOW(1, "show", "显示"), WHERE(2, "where", "查询"), GROUP(3, "group", "分组"), - AGGREGATION(4, "聚合", "聚合"); + AGGREGATION(4, "聚合", "聚合"), + ORDER(5, "order", "排序"); private int value; private String name; @@ -684,6 +759,17 @@ public class BlockReportEnumUtil { return null; } + public static String valueOfDescription(Integer val) { + if(val != null){ + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val.intValue()) { + return values()[i].description; + } + } + } + return null; + } + public static int descOf(String desc) { int tmp = 1; @@ -697,22 +783,62 @@ public class BlockReportEnumUtil { } /** - * 表单聚合 + * 报表排版枚举 + * ELEMENT(1,"元素"),TEMPLATE(2,"模板"); */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum HQL_ORDER{ + public enum REPORT_TYPESET_TYPE{ + + ELEMENT(1,"元素"),TEMPLATE(2,"模板"); + + private int value; + private String description; + + REPORT_TYPESET_TYPE() { + } + + REPORT_TYPESET_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; + } + + } - ASC(1, "ASC", "升序"), - DESC(2, "DESC", "降序"); + + /** + * Echarts Pie + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum VIEW_ECHARTS_PIE_OPTION{ + OPTION_NAME(1,"ECHARTS_PIE_NAME","显示名称"), + OPTION_VALUE(2,"ECHARTS_PIE_VALUE","显示内容"); private int value; private String name; private String description; - HQL_ORDER() { + VIEW_ECHARTS_PIE_OPTION() { } - HQL_ORDER(int value, String name, String description) { + VIEW_ECHARTS_PIE_OPTION(int value,String name, String description) { this.value = value; this.name = name; this.description = description; @@ -726,48 +852,119 @@ public class BlockReportEnumUtil { return description; } - public String getName() { - return name; + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; } - public static String valueOf(int val) { + } + + /** + * Echarts Line + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum VIEW_ECHARTS_LINE_OPTION{ + OPTION_NAME(1,"ECHARTS_LINE_NAME","显示名称"), + OPTION_VALUE(2,"ECHARTS_LINE_VALUE","显示内容"), + OPTION_X_AXIS(3,"ECHARTS_LINE_X_AXIS","显示内容xAxis"); + + private int value; + private String name; + private String description; + + VIEW_ECHARTS_LINE_OPTION() { + } + + VIEW_ECHARTS_LINE_OPTION(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 static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { - tmp = values()[i].getName(); + tmp = values()[i].description; } } return tmp; } - public static int descOf(String desc) { - int tmp = 1; + } + + /** + * Echarts Bar + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum VIEW_ECHARTS_BAR_OPTION{ + OPTION_NAME(1,"ECHARTS_BAR_NAME","显示名称"), + OPTION_VALUE(2,"ECHARTS_BAR_VALUE","显示内容"); + + private int value; + private String name; + private String description; + + VIEW_ECHARTS_BAR_OPTION() { + } + + VIEW_ECHARTS_BAR_OPTION(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 static String valueOfDescription(int val) { + String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].name.equals(desc)) { - tmp = values()[i].value; + if (values()[i].value == val) { + tmp = values()[i].description; } } return tmp; } + } /** - * 报表排版枚举 - * ELEMENT(1,"元素"),TEMPLATE(2,"模板"); + * Echarts TreeMap */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum REPORT_TYPESET_TYPE{ - - ELEMENT(1,"元素"),TEMPLATE(2,"模板"); + public enum VIEW_ECHARTS_TREEMAP_OPTION{ + OPTION_NAME(1,"ECHARTS_TREEMAP_NAME","显示名称"), + OPTION_VALUE(2,"ECHARTS_TREEMAP_VALUE","显示内容"); private int value; + private String name; private String description; - REPORT_TYPESET_TYPE() { + VIEW_ECHARTS_TREEMAP_OPTION() { } - REPORT_TYPESET_TYPE(int value, String description) { + VIEW_ECHARTS_TREEMAP_OPTION(int value,String name, String description) { this.value = value; + this.name = name; this.description = description; } 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 46172c2..e6202e0 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 @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.StringUtils; +import java.math.BigDecimal; + /** * @Description : * @Reference : @@ -221,6 +223,15 @@ public class CommonEnumUtil { return desc == 0 ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue(); } + public static TRUE_OR_FALSE valueOfEnum(int value){ + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + public static String valueOfDescription(int val) {return valueOf(val);} public static int descriptionOfValue(String desc) {return descOf(desc);} @@ -1258,4 +1269,446 @@ public class CommonEnumUtil { } } + + /** + * 元素控件类型信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROPERTY_CONTROL_TYPE { + RADIO(100, "RADIO", "单选"), + CHECKBOX(110, "CHECKBOX", "复选"), + TEXT(200, "TEXT", "文本"), + NUMBER(210, "NUMBER", "数字"), + PASSWORD(230, "PASSWORD", "密码"), + DATE_TIME(300, "DATE", "日期",SQL_WHERE.BETWEEN), + // DATE(300, "DATE", "日期(yyyy-MM-dd)"), +// DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"), + // ELEMENT(700, "DICT_SELECT", "元素"), + DICTIONARY(800, "DICT_SELECT", "字典"), + CASCADE(900, "CASCADE", "级联"); + //FILE(400, "file", "文件"), + //IMAGE(410, "image", "image"), + //OFF(500, "color", "颜色"), + + private int value; + private String code; + private String description; + + /** + * 默认查询关系 + */ + private SQL_WHERE defaultWhere; + + PROPERTY_CONTROL_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + PROPERTY_CONTROL_TYPE(int value, String code, String description, SQL_WHERE defaultWhere) { + this.value = value; + this.code = code; + this.description = description; + this.defaultWhere = defaultWhere; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public SQL_WHERE getDefaultWhere() { + return defaultWhere; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static PROPERTY_CONTROL_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 条件运算符 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SQL_WHERE { + EQUAL(1, " = ", "等于"), + NOT_EQUAL(2, " <> ", "不等于"), + MORE(3, " > ", "大于"), + LESS(4, " < ", "小于"), + MORE_OR_EQUAL(5, " >= ", "大于等于"), + LESS_OR_EQUAL (6, " <= ", "小于等于"), + LIKE(7, " LIKE ", "全模糊"), + START_LIKE(7, " LIKE ", "前模糊"), + END_LIKE(7, " LIKE ", "后模糊"), + IN(8, " IN ", "in"), + BETWEEN(9, " BETWEEN ", "区间查询(逗号区分)"),; + + private int value; + private String code; + private String description; + + private SQL_WHERE(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 valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code.toLowerCase())) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static SQL_WHERE valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 属性类型信息(属性转换器) + * + *
Form 核心转换器 + *
数据库字段类型转换Java 属性类型 + *
Java 属性 转换为控件类型 + * + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROPERTY_TYPE { + STRING(10, "String", "字符串", "java.lang.String", String.class, PROPERTY_CONTROL_TYPE.TEXT, SQL_WHERE.LIKE, ""), + CHAR(11, "Character", "单字符", "java.lang.Character", Character.class, PROPERTY_CONTROL_TYPE.TEXT, SQL_WHERE.EQUAL, ""), + INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class, PROPERTY_CONTROL_TYPE.NUMBER, SQL_WHERE.EQUAL, "0"), + LONG(21, "Long", "长整型", "java.lang.Long", Long.class, PROPERTY_CONTROL_TYPE.NUMBER, SQL_WHERE.EQUAL, "0"), + DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class, PROPERTY_CONTROL_TYPE.NUMBER, SQL_WHERE.EQUAL, "0.0"), + FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class, PROPERTY_CONTROL_TYPE.NUMBER, SQL_WHERE.EQUAL, "0.0"), + BIG_DECIMAL(32, "BigDecimal", "大浮点型", "java.math.BigDecimal", BigDecimal.class, PROPERTY_CONTROL_TYPE.NUMBER, SQL_WHERE.EQUAL, "0.0"), + BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class, PROPERTY_CONTROL_TYPE.RADIO, SQL_WHERE.EQUAL, null), + BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class, PROPERTY_CONTROL_TYPE.TEXT, SQL_WHERE.EQUAL, null), + DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class, PROPERTY_CONTROL_TYPE.DATE_TIME, SQL_WHERE.BETWEEN, null, "yyyy-MM-dd hh:mm:ss"); + + /** + * 属性类型值 + */ + private int value; + /** + * 属性类型代码 + */ + private String code; + /** + * 属性类型描述 + */ + private String description; + /** + * 属性类型ClassPath + */ + private String classPath; + /** + * 属性类型 Class + */ + private Class clzFullName; + /** + * 属性类型 对应的 控件类型 + */ + private PROPERTY_CONTROL_TYPE controlType; + /** + * 默认查询关系 + */ + private SQL_WHERE defaultWhere; + /** + * 默认 格式化 方式 + */ + private String defaultFormat; + /** + * 默认查询关系 + */ + private String defaultValue; + + private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, + PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) { + this.value = value; + this.code = code; + this.description = description; + this.classPath = classPath; + this.clzFullName = clzFullName; + this.controlType = controlType; + this.defaultWhere = defaultWhere; + } + + private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, + PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) { + this.value = value; + this.code = code; + this.description = description; + this.classPath = classPath; + this.clzFullName = clzFullName; + this.controlType = controlType; + this.defaultWhere = defaultWhere; + this.defaultValue = defaultValue; + this.defaultFormat = defaultFormat; + } + + private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, + PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue,String defaultFormat) { + this.value = value; + this.code = code; + this.description = description; + this.classPath = classPath; + this.clzFullName = clzFullName; + this.controlType = controlType; + this.defaultWhere = defaultWhere; + this.defaultValue = defaultValue; + this.defaultFormat = defaultFormat; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public String getClassPath() { + return classPath; + } + + public Class getClzFullName() { + return clzFullName; + } + + public PROPERTY_CONTROL_TYPE getControlType() { + return controlType; + } + + public SQL_WHERE getDefaultWhere() { + return defaultWhere; + } + + public String getDefaultFormat() { + return defaultFormat; + } + + public String getDefaultValue() { + return defaultValue; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static PROPERTY_TYPE valueOfClzFullName(int val) { + PROPERTY_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i]; + } + } + return tmp; + } + + + public static PROPERTY_CONTROL_TYPE valueOfControlType(int val) { + PROPERTY_CONTROL_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].controlType; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static int codeOfClzFullName(Class clzFullName) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].clzFullName.equals(clzFullName)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static int codeOfClassPath(String classPath) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].classPath.equals(classPath)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static PROPERTY_TYPE valueOfClassPath(String classPath) { + PROPERTY_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].classPath.equals(classPath)) { + tmp = values()[i]; + } + } + return tmp; + } + + public static PROPERTY_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static PROPERTY_TYPE indexOf(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (val.indexOf(values()[i].value) >= 0) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java index c4eada8..01c70ae 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.lac.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -89,6 +90,10 @@ public class LacCommandStackRecord extends BaseBean { @ApiParam(value ="执行状态") private Integer stackStatus; + public String getStackStatusTxt(){ + return LacEnumUtil.STACK_STATUS.valueOfDescription(stackStatus == null ? 0 : stackStatus); + } + @Column(name="EXECUTION_DESCRIPTION") @ApiParam(value ="执行说明") private String executionDescription; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java index 9b32ffa..e85fb26 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.lac.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -120,6 +121,10 @@ public class LacLogTask extends BaseBean { @ApiParam(value ="任务状态") private Integer taskStatus; + public String getTaskStatusTxt(){ + return LacEnumUtil.STACK_STATUS.valueOfDescription(taskStatus == null ? 0 : taskStatus); + } + @Column(name="EXECUTION_DESCRIPTION") @ApiParam(value ="执行说明") private String executionDescription; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java index a7575d5..f03e4f7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java @@ -30,15 +30,26 @@ public class ClassFieldModel implements Serializable { @ApiParam(value ="属性名") private String fieldName; + @ApiParam(value ="属性类型名称") + private String fieldTypeName; + @ApiParam(value ="属性别名") private String fieldNameAlias; @ApiParam(value ="属性描述") private String fieldDesc; - @Column(name="AGGREGATION_TYPE") @ApiParam(value ="聚合ID") @JsonSerialize(using = ToStringSerializer.class) private Long aggregationId; +// "clzFullName": "cn.estsh.i3plus.pojo.report.bean.BrRefRoleMenu", +// "fieldName": "menuNameRdd", + + + @ApiParam(value ="属性全路径") + public String getFieldNameInfo(){ + return this.clzFullName + "." + this.fieldName; + } + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java index 0cd99b7..ae774f8 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.form; import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -64,7 +65,7 @@ public class SqlColumnModel { public SqlColumnModel() { } - public SqlColumnModel(String columnName, BlockFormEnumUtil.PROPERTY_TYPE type) { + public SqlColumnModel(String columnName, CommonEnumUtil.PROPERTY_TYPE type) { this.columnName = columnName; this.columnClassType = type.getValue(); this.columnTypeName = type.getDescription(); diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BeanBrPojoAttrModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BeanBrPojoAttrModel.java index 83aeee0..391e347 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BeanBrPojoAttrModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BeanBrPojoAttrModel.java @@ -1,35 +1,35 @@ -package cn.estsh.i3plus.pojo.model.report; - -import cn.estsh.i3plus.pojo.report.bean.BrPojoAttr; -import cn.estsh.i3plus.pojo.report.bean.BrTemplateCustomHql; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.util.List; - -/** - * @Description :// - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-25 18:19 - * @Modify: - **/ -@Data -public class BeanBrPojoAttrModel { - - @ApiParam(value = "表单模板ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long templateId; - - @ApiParam(value = "数据类型") - private Integer dataType; - - @ApiParam(value = "对象属性") - private List attrList; - - @ApiParam(value = "自定义HQL") - private BrTemplateCustomHql customHql; - -} +//package cn.estsh.i3plus.pojo.model.report; +// +//import cn.estsh.i3plus.pojo.report.bean.BrPojoAttr; +//import cn.estsh.i3plus.pojo.report.bean.BrTemplateCustomHql; +//import com.fasterxml.jackson.databind.annotation.JsonSerialize; +//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +//import io.swagger.annotations.ApiParam; +//import lombok.Data; +// +//import java.util.List; +// +///** +// * @Description :// +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-25 18:19 +// * @Modify: +// **/ +//@Data +//public class BeanBrPojoAttrModel { +// +// @ApiParam(value = "表单模板ID") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long templateId; +// +// @ApiParam(value = "数据类型") +// private Integer dataType; +// +// @ApiParam(value = "对象属性") +// private List attrList; +// +// @ApiParam(value = "自定义HQL") +// private BrTemplateCustomHql customHql; +// +//} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java new file mode 100644 index 0000000..e3dc2fc --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.model.report; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * 自定义报表数据源传输对象 ， 单纯数据传输使用并不做保存使用 + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-5 下午4:02 + * @Modify: + **/ +@Data +public class BrDataSourceModel { + + /** + * 默认数据源信息 + */ + public static final BrDataSourceModel DEFAULT_DATA_SOURCE = new BrDataSourceModel("默认数据源", "DEFAULT", null, null, "使用默认数据源"); + + @ApiParam(value ="数据源名称") + private String sourceName; + + @ApiParam(value ="数据源编码") + private String sourceCode; + + @ApiParam(value ="数据源类型",name = "BlockFormEnumUtil.DATA_SOURCE_TYPE") + private Integer sourceType; + + @ApiParam(value ="数据库名称") + private String sourceDataBaseName; + + @ApiParam(value ="数据源描述") + private String sourceDescription; + + public BrDataSourceModel() { + } + + public BrDataSourceModel(String sourceName, String sourceCode, Integer sourceType, String sourceDataBaseName, String sourceDescription) { + this.sourceName = sourceName; + this.sourceCode = sourceCode; + this.sourceType = sourceType; + this.sourceDataBaseName = sourceDataBaseName; + this.sourceDescription = sourceDescription; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java index a78d077..67bd9b5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java @@ -1,10 +1,16 @@ package cn.estsh.i3plus.pojo.model.report; +import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; +import cn.estsh.i3plus.pojo.report.bean.*; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; +import java.util.List; +import java.util.Map; + /** * @Description : * @Reference : @@ -13,22 +19,70 @@ import lombok.Data; * @Modify: **/ @Data -public class TemplateModel { +public class TemplateModel implements Serializable { - @ApiParam("数据源ID") + private static final long serialVersionUID = -6385070202088819367L; + @ApiParam(value ="视图ID") @JsonSerialize(using = ToStringSerializer.class) - private Long sourceId; + private Long viewId; - @ApiParam("模板ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long templateId; + @ApiParam(value ="视图类型") + private Integer viewType; - @ApiParam("执行 HQL ") - private String hql; + @ApiParam(value ="视图名称") + private String viewName; + + @ApiParam(value ="返回信息") + private String resultMessage; + + @ApiParam(value = "查询对象") + private BrPojo pojo; + + @ApiParam(value = "对象连接") + private List joinList; + + @ApiParam(value = "对象晒算信息") + private BrPojoFilter filter; + + @ApiParam(value = "查询条件") + private List whereAttrList; + + @ApiParam(value = "分组条件") + private List groupAttrList; - @ApiParam("执行 HQL 参数名称 ") - private String[] paramName; + @ApiParam(value = "排序条件") + private BrPojoView view; + + @ApiParam(value = "排序条件") + private List orderAttrList; + + @ApiParam(value = "显示属性") + private List viewAttrList; + + @ApiParam(value = "显示属性别名") + private List viewAttrAliasList; + + @ApiParam(value = "跨服务调用返回数据") + private BaseResultBean cloudResultBean; + + @ApiParam(value = "跨服务调用解析后数据") + private List> rows; + + @ApiParam(value = "跨服务调用解析后数据") + private Object option; + + @ApiParam(value = "页面查询条件") + private Map findParam; + + @ApiParam("执行 HQL ") + private String selectHql; - @ApiParam("执行 HQL 参数值 ") - private Object[] paramValue; + @ApiParam("执行 HQL 返回数量") + private String countHql; +// +// @ApiParam("执行 HQL 参数名称 ") +// private String[] paramName; +// +// @ApiParam("执行 HQL 参数值 ") +// private Object[] paramValue; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java index f277ace..62dab28 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java @@ -27,7 +27,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_EXCEPTION", +@Table(name="sys_log_exception", indexes = { @Index(columnList = "CREATE_DATE_TIME DESC", name = "LOG_INDEX_CREATE_DATE_TIME"), @Index(columnList = "EXC_MODULE_ID DESC", name = "LOG_INDEX_EXC_MODULE_ID") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java index f4fdc54..287e9df 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java @@ -55,6 +55,7 @@ public class SysLogSystem extends BaseBean { @ApiParam(value ="请求IP" , access ="请求IP") private String remoteIp; + @Column(name="REQUEST_URL") @ApiParam(value ="请求路径" , access ="请求路径") private String requestUrl; diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java index 8662f2b..6a28634 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java @@ -16,9 +16,6 @@ import java.util.List; /** * @Description : 数据元素 - * @Reference : Jenkins 自动合并代码测试 - * @Reference : Jenkins 自动合并代码测试 - * @Reference : Jenkins 自动合并代码测试 * @Author : alwaysfrin * @CreateDate : 2018-12-25 19:54 * @Modify: diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java index 6351b74..8f74c2a 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java @@ -52,12 +52,12 @@ public class BrLayout extends BaseBean { @ApiParam(value ="引用报表数量") private Integer layoutReportCount; - @Lob - @Column(name="LAYOUT_HTML") - @ApiParam(value ="布局html") - private String layoutHtml; - - @Lob +// @Lob +// @Column(name="LAYOUT_HTML") +// @ApiParam(value ="布局html") +// private String layoutHtml; +// +// @Lob @Column(name = "LAYOUT_DESCRIPTION") @ApiParam(value ="布局描述") private String layoutDescription; diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java index 9665e99..19ca013 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java @@ -68,13 +68,13 @@ public class BrLayoutColumn extends BaseBean { @ApiParam(value ="排序，降序") private Integer columnSort; - @Lob +// @Lob @Column(name = "COLUMN_DESCRIPTION") @ApiParam(value ="列描述") private String columnDescription; - @Lob - @Column(name="COLUMN_HTML") - @ApiParam(value ="列html") - private String columnHtml; +// @Lob +// @Column(name="COLUMN_HTML") +// @ApiParam(value ="列html") +// private String columnHtml; } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java index 9b23fb0..bf6eaa1 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java @@ -56,10 +56,10 @@ public class BrLayoutRow extends BaseBean { @ApiParam(value ="行所关联列数") private Integer rowColNum; - @Lob - @Column(name="ROW_HTML") - @ApiParam(value ="行html") - private String rowHtml; +// @Lob +// @Column(name="ROW_HTML") +// @ApiParam(value ="行html") +// private String rowHtml; @Transient @ApiParam(value ="行所包含的列") diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java new file mode 100644 index 0000000..3b6b98f --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java @@ -0,0 +1,137 @@ +package cn.estsh.i3plus.pojo.report.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockReportEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-3 下午4:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BR_POJO") +@Api(value="报表对象",description = "报表对象") +public class BrPojo extends BaseBean { + + @Column(name="MASTER_ID") + @ApiParam(value ="主对象ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long masterId; + + @Column(name="POJO_TYPE") + @ApiParam(value ="对象类型") + private Integer pojoType; + + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品类型") + private Integer softType; + + public String getSoftTypeTxt(){ + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } + + @Column(name="SOURCE_CODE") + @ApiParam(value ="数据源编码") + private String sourceCode; + + @Column(name="SOURCE_NAME") + @ApiParam(value ="数据源名称") + private String sourceName; + + @Column(name="POJO_PACKAGE_CODE") + @ApiParam(value ="对象全路径") + private String pojoPackageCode; + + @Column(name="POJO_CODE") + @ApiParam(value ="对象代码") + private String pojoCode; + + @Column(name="POJO_CODE_ALIAS") + @ApiParam(value ="对象别名") + private String pojoCodeAlias; + + @Column(name="pojo_name") + @ApiParam(value ="对象名称") + private String pojoName; + + @Column(name="POJO_SORT") + @ApiParam(value ="对象排序") + private Integer pojoSort; + + @Column(name="POJO_ATTR") + @ApiParam(value ="连接属性") + private String pojoAttr; + + @Column(name="JOIN_TYPE") + @ApiParam(value ="连接关系") + private Integer joinType; + public String getJoinTypeTxt(){ + return joinType == null ? null : BlockReportEnumUtil.HQL_REF.valueOfDescription(joinType); + } + + @Column(name="WHERE_TYPE") + @ApiParam(value ="连接类型") + private Integer whereType; + public String getWhereTypeTxt(){ + return whereType == null ? null : BlockReportEnumUtil.HQL_WHERE.valueOfDescription(whereType); + } + + @Column(name="JOIN_POJO_ID") + @ApiParam(value ="连接对象ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long joinPojoId; + + @Column(name="JOIN_POJO_NAME_RDD") + @ApiParam(value ="连接对象名称") + private String joinPojoNameRdd; + + @Column(name="JOIN_POJO_CODE_RDD") + @ApiParam(value ="连接对象代码") + private String joinPojoCodeRdd; + + @Column(name="JOIN_POJO_CODE_ALIAS_RDD") + @ApiParam(value ="连接对象别名") + private String joinPojoCodeAliasRdd; + + @Column(name="JOIN_POJO_ATTR") + @ApiParam(value ="连接对象属性") + private String joinPojoAttr; + + @Column(name="POJO_HQL") + @ApiParam(value ="对象名称") + private String pojoHql; + + @Column(name="POJO_DESCRIPTION") + @ApiParam(value ="对象描述") + private String pojoDescription; + + @Transient + @ApiParam(value = "主对象Pojo 信息") + private BrPojo masterPojo; + + @Transient + @ApiParam(value = "连接对象集合") + private List joinList; + +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilter.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilter.java new file mode 100644 index 0000000..bd1739c --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilter.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.report.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-3 下午5:10 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BR_POJO_FILTER") +@Api(value="对象筛选器",description = "对象筛选器") +public class BrPojoFilter extends BaseBean { + + @Column(name="MASTER_ID") + @ApiParam(value ="主对象ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long masterId; + + @Column(name="FILTER_NAME") + @ApiParam(value ="筛选器名称") + private String filterName; + + @Column(name="FILTER_DESCRIPTION") + @ApiParam(value ="筛选器描述") + private String filterDescription; + +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java new file mode 100644 index 0000000..fa78d8b --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java @@ -0,0 +1,129 @@ +package cn.estsh.i3plus.pojo.report.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockReportEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-3 下午5:10 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BR_POJO_FILTER_ATTR") +@Api(value="对象筛选器",description = "对象筛选器") +public class BrPojoFilterAttr extends BaseBean { + + @Column(name="FILTER_ID") + @ApiParam(value ="筛选器ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long filterId; + + @Column(name="MASTER_ID") + @ApiParam(value ="主对象ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long masterId; + /************************************** 对象信息 **************************************/ + + @Column(name="POJO_ID") + @ApiParam(value ="对象ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long pojoId; + + @Column(name="POJO_NAME_RDD") + @ApiParam(value ="对象名称") + private String pojoNameRdd; + + @Column(name="POJO_CODE_RDD") + @ApiParam(value ="对象代码") + private String pojoCodeRdd; + + @Column(name="POJO_CODE_ALIAS_RDD") + @ApiParam(value ="对象别名") + private String pojoCodeAliasRdd; + + @Column(name="POJO_ATTR") + @ApiParam(value ="对象属性") + private String pojoAttr; + + @Column(name="PACKAGE_POJO_ATTR") + @ApiParam(value ="对象属性全路径") + private String packagePojoAttr; + + + /************************************** 属性信息 **************************************/ + + + @Column(name="ATTR_NAME") + @ApiParam(value ="属性显示名称") + private String attrName; + + @Column(name="ATTR_SHOW") + @ApiParam(value ="属性是否显示") + private Integer attrShow; + public String getAttrShowTxt(){ + return attrShow == null ? null : CommonEnumUtil.TRUE_OR_FALSE.valueOfDescription(attrShow); + } + + + @Column(name="ATTR_TYPE") + @ApiParam(value ="属性类型") // 查询条件 ， 分组 + private Integer attrType; + public String getAttrTypeTxt(){ + return attrType == null ? null : BlockReportEnumUtil.HQL_ATTR_DATA_TYPE.valueOfDescription(attrType); + } + + + @Column(name="FILTER_JOIN_TYPE") // AND OR 与 或 非 + @ApiParam(value ="属性连接类型") + private Integer filterJoinType; + public String getFilterJoinTypeTxt(){ + return filterJoinType == null ? null : BlockReportEnumUtil.HQL_WHERE_REF.valueOfDescription(filterJoinType); + } + + @Column(name="FILTER_ATTR_TYPE") // = ,like,in + @ApiParam(value ="属性筛选类型") + private Integer filterAttrType; + public String getFilterAttrTypeTxt(){ + return filterAttrType == null ? null : CommonEnumUtil.SQL_WHERE.valueOfDescription(filterAttrType); + } + + @Column(name="ATTR_SORT") + @ApiParam(value ="属性筛选排序") + private Integer attrSort; + + @Column(name="ATTR_DEFAULT_VALUE") + @ApiParam(value ="属性默认值") + private String attrDefaultValue; + + @Column(name="ATTR_DESCRIPTION") + @ApiParam(value ="属性描述") + private String attrDescription; + + @Column(name="ATTR_HQL") + @ApiParam(value ="属性HQL") + private String attrHql; + + @Transient + @ApiParam(value ="表单查询内容") + private String attrFormValue; +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoView.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoView.java new file mode 100644 index 0000000..58ce06c --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoView.java @@ -0,0 +1,79 @@ +package cn.estsh.i3plus.pojo.report.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockReportEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-3 下午5:10 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BR_POJO_VIEW") +@Api(value="对象视图",description = "对象视图") +public class BrPojoView extends BaseBean { + + @Column(name="POJO_ID") + @ApiParam(value ="主对象ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long pojoId; + + @Column(name="MASTER_ID") + @ApiParam(value ="主对象ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long masterId; + + @Column(name="VIEW_NAME") + @ApiParam(value ="视图名称") + private String viewName; + + @Column(name="FILTER_ID") + @ApiParam(value ="筛选器ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long filterId; + + @Column(name="POJO_NAME_RDD") + @ApiParam(value ="对象名称") + private String pojoNameRdd; + + @Column(name="FILTER_NAME_RDD") + @ApiParam(value ="筛选器名称") + private String filterNameRdd; + + @Column(name="VIEW_TYPE") + @ApiParam(value ="视图类型") + private Integer viewType; + public String getViewTypeTxt(){ + return viewType == null ? null : BlockReportEnumUtil.TEMPLATE_TYPE.valueOf(viewType); + } + + @Column(name="VIEW_DESCRIPTION") + @ApiParam(value ="视图描述") + private String viewDescription; + + @Transient + @ApiParam(value ="显示属性集合") + private List viewAttrList; + +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java new file mode 100644 index 0000000..e4cbcd3 --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java @@ -0,0 +1,112 @@ +package cn.estsh.i3plus.pojo.report.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-3 下午5:10 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BR_POJO_VIEW_ATTR") +@Api(value = "对象视图", description = "对象视图") +public class BrPojoViewAttr extends BaseBean { + + @Column(name = "VIEW_ID") + @ApiParam(value = "视图ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long viewId; + + /************************************** 对象信息 **************************************/ + + @Column(name = "POJO_ID") + @ApiParam(value = "对象ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long pojoId; + + @Column(name = "POJO_NAME_RDD") + @ApiParam(value = "对象名称") + private String pojoNameRdd; + + @Column(name = "POJO_CODE_RDD") + @ApiParam(value = "对象代码") + private String pojoCodeRdd; + + @Column(name = "POJO_CODE_ALIAS_RDD") + @ApiParam(value = "对象别名") + private String pojoCodeAliasRdd; + + @Column(name="POJO_ATTR") + @ApiParam(value ="对象属性") + private String pojoAttr; + + @Column(name="PACKAGE_POJO_ATTR") + @ApiParam(value ="对象属性全路径") + private String packagePojoAttr; + + @Column(name="VIEW_ATTR_ALIAS") + @ApiParam(value ="视图属性别名") + private String viewAttrAlias; + + /************************************** 属性信息 **************************************/ + + @Column(name = "AGGREGATION_TYPE") + @ApiParam(value = "聚合类型") + private Integer aggregationType; + + @Column(name = "VIEW_ATTR_NAME") + @ApiParam(value = "显示名称") + private String viewAttrName; + + @Column(name = "VIEW_DIMENSION") + @ApiParam(value = "视图维度") + private String viewDimension; + + @Column(name = "ATTR_SORT") + @ApiParam(value = "属性显示排序") + private Integer attrSort; + + @Column(name="ATTR_SORT_TYPE") + @ApiParam(value ="排序规则") + private Integer attrSortType; + public String getAttrSortTypeTxt(){ + return attrSortType == null ? null : CommonEnumUtil.ASC_OR_DESC.valueOf(attrSortType); + } + + @Column(name="ATTR_SHOW") + @ApiParam(value ="属性是否显示") + private Integer attrShow; + public String getAttrShowTxt(){ + return attrShow == null ? null : CommonEnumUtil.TRUE_OR_FALSE.valueOfDescription(attrShow); + } + + @Column(name="ATTR_HQL") + @ApiParam(value ="属性HQL") + private String attrHql; + + @Column(name = "VIEW_DESCRIPTION") + @ApiParam(value = "视图描述") + private String viewDescription; + + +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefPojo.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefPojo.java index ae634ed..a6caca8 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefPojo.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefPojo.java @@ -1,77 +1,77 @@ -package cn.estsh.i3plus.pojo.report.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 11:32 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="BR_REF_POJO") -@Api(value="对象关系",description = "对象关系") -public class BrRefPojo extends BaseBean { - - @Column(name="TEMPLATE_ID") - @ApiParam(value ="模板编号" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long templateId; - - @Column(name="REF_TYPE") - @ApiParam(value ="关系类型") - private Integer refType; - - @Column(name="REF_SORT") - @ApiParam(value ="关系排序") - private Integer refSort; - - @Column(name="MASTER_SERVER_ID") - @ApiParam(value ="主服务编号" ,example = "-1") - private Integer masterServerId; - - @Column(name="MASTER_POJO_NAME") - @ApiParam(value ="副对象名称") - private String masterPojoName; - - @Column(name="MASTER_POJO_NAME_ALIAS") - @ApiParam(value ="主对象别名") - private String masterPojoNameAlias; - - @Column(name="MASTER_POJO_NAME_ATTR_NAME") - @ApiParam(value ="主对象属性名称" ) - private String masterPojoAttName; - - @Column(name="SECONDARY_SERVER_ID") - @ApiParam(value ="主服务编号") - private Integer secondaryServerId; - - @Column(name="SECONDARY_POJO_NAME") - @ApiParam(value ="副对象名称") - private String secondaryPojoName; - - @Column(name="SECONDARY_POJO_NAME_ALIAS") - @ApiParam(value ="副对象别名" ) - private String secondaryPojoNameAlias; - - @Column(name="SECONDARY_POJO_ATTR_NAME") - @ApiParam(value ="副对象属性名称") - private String secondaryPojoAttrName; -} +//package cn.estsh.i3plus.pojo.report.bean; +// +//import cn.estsh.i3plus.pojo.base.bean.BaseBean; +//import com.fasterxml.jackson.databind.annotation.JsonSerialize; +//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiParam; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import org.hibernate.annotations.DynamicInsert; +//import org.hibernate.annotations.DynamicUpdate; +// +//import javax.persistence.Column; +//import javax.persistence.Entity; +//import javax.persistence.Table; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 11:32 +// * @Modify: +// **/ +//@Data +//@Entity +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Table(name="BR_REF_POJO") +//@Api(value="对象关系",description = "对象关系") +//public class BrRefPojo extends BaseBean { +// +// @Column(name="TEMPLATE_ID") +// @ApiParam(value ="模板编号" ,example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long templateId; +// +// @Column(name="REF_TYPE") +// @ApiParam(value ="关系类型") +// private Integer refType; +// +// @Column(name="REF_SORT") +// @ApiParam(value ="关系排序") +// private Integer refSort; +// +// @Column(name="MASTER_SERVER_ID") +// @ApiParam(value ="主服务编号" ,example = "-1") +// private Integer masterServerId; +// +// @Column(name="MASTER_POJO_NAME") +// @ApiParam(value ="副对象名称") +// private String masterPojoName; +// +// @Column(name="MASTER_POJO_NAME_ALIAS") +// @ApiParam(value ="主对象别名") +// private String masterPojoNameAlias; +// +// @Column(name="MASTER_POJO_NAME_ATTR_NAME") +// @ApiParam(value ="主对象属性名称" ) +// private String masterPojoAttName; +// +// @Column(name="SECONDARY_SERVER_ID") +// @ApiParam(value ="主服务编号") +// private Integer secondaryServerId; +// +// @Column(name="SECONDARY_POJO_NAME") +// @ApiParam(value ="副对象名称") +// private String secondaryPojoName; +// +// @Column(name="SECONDARY_POJO_NAME_ALIAS") +// @ApiParam(value ="副对象别名" ) +// private String secondaryPojoNameAlias; +// +// @Column(name="SECONDARY_POJO_ATTR_NAME") +// @ApiParam(value ="副对象属性名称") +// private String secondaryPojoAttrName; +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java index 2c32625..286e9ef 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java @@ -9,7 +9,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; import javax.persistence.Column; import javax.persistence.Entity; @@ -58,13 +57,13 @@ public class BrRefReportTypeset extends BaseBean { @JsonSerialize (using = ToStringSerializer.class) private Long refId; - /** - * 关联元素或模板html - */ - @Lob - @Column(name = "REF_HTML") - @ApiParam(value = "关联对象html") - private String refHtml; +// /** +// * 关联元素或模板html +// */ +// @Lob +// @Column(name = "REF_HTML") +// @ApiParam(value = "关联对象html") +// private String refHtml; @Lob @Column(name = "TYPESET_DESCRIPTION") diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefServerPojo.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefServerPojo.java index f6bc656..a92088e 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefServerPojo.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefServerPojo.java @@ -1,115 +1,115 @@ -package cn.estsh.i3plus.pojo.report.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.List; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 11:31 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="BR_REF_SERVER_POJO") -@Api(value="报表模板服务对象",description = "报表模板服务对象") -public class BrRefServerPojo extends BaseBean { - - @Column(name="TEMPLATE_ID") - @ApiParam(value ="模板编号" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long templateId; - - @Column(name="TEMPLATE_NAME_RDD") - @ApiParam(value ="模板名称" , access ="模板名称") - private String templateNameRdd; - - @Column(name="POJO_REF_TYPE") - @ApiParam(value ="关系类型") - private Integer pojoRefType; - - @Column(name="POJO_WHERE_TYPE") - @ApiParam(value ="连接关系") - private Integer pojoWhereType; - - @Column(name="POJO_SORT") - @ApiParam(value ="主服务编号" ,example = "-1") - private Integer pojoSort; - - @Column(name="MASTER_SERVER_ID") - @ApiParam(value ="主服务编号" ,example = "-1") - private Integer masterServerId; - - @Column(name="MASTER_SERVER_NAME_RDD") - @ApiParam(value ="主服务名称" ,example = "-1") - private String masterServerNameRdd; - - @Column(name="MASTER_POJO_NAME") - @ApiParam(value ="副对象名称") - private String masterPojoName; - - @Column(name="MASTER_PACKAGE_NAME_RDD") - @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称") - private String masterPackageNameRdd; - - @Column(name="MASTER_POJO_NAME_ALIAS") - @ApiParam(value ="主对象别名") - private String masterPojoNameAlias; - - @Column(name="MASTER_POJO_NAME_DESC") - @ApiParam(value ="主对象中文名称") - private String masterPojoNameDesc; - - @Column(name="MASTER_POJO_NAME_ATTR_NAME") - @ApiParam(value ="主对象属性名称" ) - private String masterPojoAttrName; - - @Column(name="SECONDARY_SERVER_ID") - @ApiParam(value ="主服务编号") - private Integer secondaryServerId; - - @Column(name="SECONDARY_SERVER_NAME") - @ApiParam(value ="主服务编号") - private String secondaryServerName; - - @Column(name="SECONDARY_POJO_NAME") - @ApiParam(value ="副对象名称") - private String secondaryPojoName; - - @Column(name="SECONDARY_PACKAGE_NAME") - @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称") - private String secondaryPackageName; - - @Column(name="SECONDARY_POJO_NAME_ALIAS") - @ApiParam(value ="副对象别名" ) - private String secondaryPojoNameAlias; - - @Column(name="SECONDARY_POJO_NAME_DESC") - @ApiParam(value ="副对象中文名称") - private String secondaryPojoNameDesc; - - @Column(name="SECONDARY_POJO_ATTR_NAME") - @ApiParam(value ="副对象属性名称") - private String secondaryPojoAttrName; - - @Transient - @ApiParam(value ="模板服务对象属性") - private List pojoAttrList; -} +//package cn.estsh.i3plus.pojo.report.bean; +// +//import cn.estsh.i3plus.pojo.base.bean.BaseBean; +//import com.fasterxml.jackson.databind.annotation.JsonSerialize; +//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiParam; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import org.hibernate.annotations.DynamicInsert; +//import org.hibernate.annotations.DynamicUpdate; +// +//import javax.persistence.Column; +//import javax.persistence.Entity; +//import javax.persistence.Table; +//import javax.persistence.Transient; +//import java.util.List; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 11:31 +// * @Modify: +// **/ +//@Data +//@Entity +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Table(name="BR_REF_SERVER_POJO") +//@Api(value="报表模板服务对象",description = "报表模板服务对象") +//public class BrRefServerPojo extends BaseBean { +// +// @Column(name="TEMPLATE_ID") +// @ApiParam(value ="模板编号" ,example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long templateId; +// +// @Column(name="TEMPLATE_NAME_RDD") +// @ApiParam(value ="模板名称" , access ="模板名称") +// private String templateNameRdd; +// +// @Column(name="POJO_REF_TYPE") +// @ApiParam(value ="关系类型") +// private Integer pojoRefType; +// +// @Column(name="POJO_WHERE_TYPE") +// @ApiParam(value ="连接关系") +// private Integer pojoWhereType; +// +// @Column(name="POJO_SORT") +// @ApiParam(value ="主服务编号" ,example = "-1") +// private Integer pojoSort; +// +// @Column(name="MASTER_SERVER_ID") +// @ApiParam(value ="主服务编号" ,example = "-1") +// private Integer masterServerId; +// +// @Column(name="MASTER_SERVER_NAME_RDD") +// @ApiParam(value ="主服务名称" ,example = "-1") +// private String masterServerNameRdd; +// +// @Column(name="MASTER_POJO_NAME") +// @ApiParam(value ="副对象名称") +// private String masterPojoName; +// +// @Column(name="MASTER_PACKAGE_NAME_RDD") +// @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称") +// private String masterPackageNameRdd; +// +// @Column(name="MASTER_POJO_NAME_ALIAS") +// @ApiParam(value ="主对象别名") +// private String masterPojoNameAlias; +// +// @Column(name="MASTER_POJO_NAME_DESC") +// @ApiParam(value ="主对象中文名称") +// private String masterPojoNameDesc; +// +// @Column(name="MASTER_POJO_NAME_ATTR_NAME") +// @ApiParam(value ="主对象属性名称" ) +// private String masterPojoAttrName; +// +// @Column(name="SECONDARY_SERVER_ID") +// @ApiParam(value ="主服务编号") +// private Integer secondaryServerId; +// +// @Column(name="SECONDARY_SERVER_NAME") +// @ApiParam(value ="主服务编号") +// private String secondaryServerName; +// +// @Column(name="SECONDARY_POJO_NAME") +// @ApiParam(value ="副对象名称") +// private String secondaryPojoName; +// +// @Column(name="SECONDARY_PACKAGE_NAME") +// @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称") +// private String secondaryPackageName; +// +// @Column(name="SECONDARY_POJO_NAME_ALIAS") +// @ApiParam(value ="副对象别名" ) +// private String secondaryPojoNameAlias; +// +// @Column(name="SECONDARY_POJO_NAME_DESC") +// @ApiParam(value ="副对象中文名称") +// private String secondaryPojoNameDesc; +// +// @Column(name="SECONDARY_POJO_ATTR_NAME") +// @ApiParam(value ="副对象属性名称") +// private String secondaryPojoAttrName; +// +// @Transient +// @ApiParam(value ="模板服务对象属性") +// private List pojoAttrList; +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefTemplateServer.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefTemplateServer.java index 059881a..d06783d 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefTemplateServer.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefTemplateServer.java @@ -1,50 +1,50 @@ -package cn.estsh.i3plus.pojo.report.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 11:31 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="BR_REF_TEMPLATE_SERVER") -@Api(value="报表模板-服务",description = "报表模板-服务") -public class BrRefTemplateServer extends BaseBean { - - @Column(name="TEMPLATE_ID") - @ApiParam(value ="模板编号" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long templateId; - - @Column(name="TEMPLATE_NAME_RDD") - @ApiParam(value ="模板名称" , access ="模板名称") - private String templateNameRdd; - - @Column(name="SERVER_ID") - @ApiParam(value ="服务编号" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Integer serverId; - - @Column(name="SERVER_NAME_RDD") - @ApiParam(value ="服务名称" , access ="模板名称") - private String serverNameRdd; -} +//package cn.estsh.i3plus.pojo.report.bean; +// +//import cn.estsh.i3plus.pojo.base.bean.BaseBean; +//import com.fasterxml.jackson.databind.annotation.JsonSerialize; +//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiParam; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import org.hibernate.annotations.DynamicInsert; +//import org.hibernate.annotations.DynamicUpdate; +// +//import javax.persistence.Column; +//import javax.persistence.Entity; +//import javax.persistence.Table; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 11:31 +// * @Modify: +// **/ +//@Data +//@Entity +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Table(name="BR_REF_TEMPLATE_SERVER") +//@Api(value="报表模板-服务",description = "报表模板-服务") +//public class BrRefTemplateServer extends BaseBean { +// +// @Column(name="TEMPLATE_ID") +// @ApiParam(value ="模板编号" ,example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long templateId; +// +// @Column(name="TEMPLATE_NAME_RDD") +// @ApiParam(value ="模板名称" , access ="模板名称") +// private String templateNameRdd; +// +// @Column(name="SERVER_ID") +// @ApiParam(value ="服务编号" ,example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Integer serverId; +// +// @Column(name="SERVER_NAME_RDD") +// @ApiParam(value ="服务名称" , access ="模板名称") +// private String serverNameRdd; +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java index 7debebc..f424ef0 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java @@ -4,13 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; import javax.persistence.*; import java.util.List; diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java index 8c3ead4..5fb16dc 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java @@ -1,56 +1,56 @@ -package cn.estsh.i3plus.pojo.report.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.List; - -/** - * @Description : 自定义报表模板 - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-12-25 19:54 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="BrReportTemplate") -@Api(value="自定义报表模板",description = "报表模板，实现对应的报表生成方法") -public class BrReportTemplate extends BaseBean { - - @Column(name="LAYOUT_ID") - @ApiParam(value ="布局主键") - @JsonSerialize(using = ToStringSerializer.class) - private Long layoutId; - - @Column(name="LAYOUT_COLUMN_ID") - @ApiParam(value ="列主键") - @JsonSerialize(using = ToStringSerializer.class) - private Long layoutColumnId; - - @Column(name="TEMPLATE_NAME") - @ApiParam(value ="模板名称") - private String templateName; - - @Transient - @ApiParam(value ="报表模板列表") - private List brRefReportTypesetList; - - @Transient - @ApiParam(value ="元素所在的列") - private BrLayoutColumn brLayoutColumn; -} +//package cn.estsh.i3plus.pojo.report.bean; +// +//import cn.estsh.i3plus.pojo.base.bean.BaseBean; +//import com.fasterxml.jackson.databind.annotation.JsonSerialize; +//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiParam; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import org.hibernate.annotations.DynamicInsert; +//import org.hibernate.annotations.DynamicUpdate; +// +//import javax.persistence.Column; +//import javax.persistence.Entity; +//import javax.persistence.Table; +//import javax.persistence.Transient; +//import java.util.List; +// +///** +// * @Description : 自定义报表模板 +// * @Reference : +// * @Author : alwaysfrin +// * @CreateDate : 2018-12-25 19:54 +// * @Modify: +// **/ +//@Data +//@Entity +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Table(name="BrReportTemplate") +//@Api(value="自定义报表模板",description = "报表模板，实现对应的报表生成方法") +//public class BrReportTemplate extends BaseBean { +// +// @Column(name="LAYOUT_ID") +// @ApiParam(value ="布局主键") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long layoutId; +// +// @Column(name="LAYOUT_COLUMN_ID") +// @ApiParam(value ="列主键") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long layoutColumnId; +// +// @Column(name="TEMPLATE_NAME") +// @ApiParam(value ="模板名称") +// private String templateName; +// +// @Transient +// @ApiParam(value ="报表模板列表") +// private List brRefReportTypesetList; +// +// @Transient +// @ApiParam(value ="元素所在的列") +// private BrLayoutColumn brLayoutColumn; +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplate.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplate.java index 0d7819a..96ead90 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplate.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplate.java @@ -1,165 +1,165 @@ -package cn.estsh.i3plus.pojo.report.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.List; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 11:23 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="BR_TEMPLATE") -@Api(value="报表模板",description = "报表模板") -public class BrTemplate extends BaseBean { - - @Column(name = "DATA_SOURCE_ID") - @ApiParam(value = "数据源ID", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long dataSourceId = 0L; - - @Column(name="NAME") - @ApiParam(value ="模板名称" , access ="模板名称") - private String name; - - @Column(name="TEMPLATE_TYPE") - @ApiParam(value ="模板类型" , example ="-1",access="表格，图表") - private Integer templateType; - - @Column(name="TEMPLATE_STATUS") - @ApiParam(value ="模板状态" , example ="-1",access="模板状态") - private Integer templateStatus; - - @Column(name="NUM_POJO") - @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") - private Integer numPojo; - - @Lob - @Column(name="TEMPLATE_POJO_NAMES_RDD") - @ApiParam(value ="对象名称" , access ="对象名称") - private String templatePojoNamesRdd; - - @Column(name="NUM_SERVER") - @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") - private Integer numServer; - - @Lob - @Column(name="TEMPLATE_SERVER_ID_LIST") - @ApiParam(value ="数据服务ID集合" , access ="服务名称") - private String templateServerIdList; - - @Lob - @Column(name="TEMPLATE_SERVER_NAMES_RDD") - @ApiParam(value ="服务名称" , access ="服务名称") - private String templateServerNamesRdd; - - @Column(name="NUM_TEMPLATE_ATTR_FILTER") - @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") - private Integer numTemplateAttrFilter; - - @Lob - @Column(name="template_attr_filter_list") - @ApiParam(value ="模板查询条件" , access ="模板查询条件") - private String templateAttrFilterList; - - @Column(name="NUM_TEMPLATE_ATTR_FILTER_GROUP") - @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") - private Integer numTemplateAttrFilterGroup; - - @Lob - @Column(name="TEMPLATE_ATTR_FILTER_GROUP_LIST") - @ApiParam(value ="模板分组条件" , access ="模板分組条件") - private String templateAttrFilterGroupList; - - @Column(name="NUM_TEMPLATE_ATTR_SHOW") - @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") - private Integer numTemplateAttrShow; - - @Lob - @Column(name="TEMPLATE_ATTR_SHOW_LIST") - @ApiParam(value ="模板显示属性" , access ="模板显示属性") - private String templateAttrShowList; - - @Column(name="NUM_TEMPLATE_AGGREGATION") - @ApiParam(value ="对象聚集数量" , example ="0" , access ="对象聚集数量") - private Integer numTemplateAggregation; - - @Lob - @Column(name="TEMPLATE_ATTR_AGGREGATION_LIST") - @ApiParam(value ="模板聚集属性" , access ="模板聚集属性") - private String templateAttrAggregationList; - - @Column(name="TEMPLATE_DESCRIPTION") - @ApiParam(value ="模板描述" , access ="模板描述") - private String templateDescription; - - @Lob - @Column(name="TEMPLATE_HQL") - @ApiParam(value ="模板执行HQL" , access ="模板执行HQL") - private String templateHql; - - @Lob - @Column(name="TEMPLATE_HTML") - @ApiParam(value ="模板HTML" , access ="模板HTML") - private String templateHtml; - - @Transient - @ApiParam(value ="模板服务编号集合") - private List serverIdList = new ArrayList<>(); - - @Transient - @ApiParam(value ="模板服务") - private List serverList = new ArrayList<>(); - - @Transient - @ApiParam(value ="模板服务对象") - private List serverPojoList = new ArrayList<>(); - - @Transient - @ApiParam(value ="模板服务对象关系") - private List serverPojoRefList = new ArrayList<>(); - - @Transient - @ApiParam(value ="模板服务对象关联属性") - private List pojoAttrList = new ArrayList<>(); - - - @Transient - @ApiParam(value ="模板服务对象查询条件") - private List pojoAttrWhereList = new ArrayList<>(); - - @Transient - @ApiParam(value ="模板服务对象分组条件") - private List pojoAttrGroupList = new ArrayList<>(); - - @Transient - @ApiParam(value ="模板服务对象聚合条件") - private List pojoAttrAggregationList = new ArrayList<>(); - - @Transient - @ApiParam(value ="模板服务对象显示属性") - private List pojoAttrShowList = new ArrayList<>(); - - @Transient - @ApiParam(value ="模板服务集合") - private List serverNameList = new ArrayList<>(); - -} +//package cn.estsh.i3plus.pojo.report.bean; +// +//import cn.estsh.i3plus.pojo.base.bean.BaseBean; +//import com.fasterxml.jackson.databind.annotation.JsonSerialize; +//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiParam; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import org.hibernate.annotations.DynamicInsert; +//import org.hibernate.annotations.DynamicUpdate; +//import org.hibernate.annotations.Type; +// +//import javax.persistence.*; +//import java.util.ArrayList; +//import java.util.List; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 11:23 +// * @Modify: +// **/ +//@Data +//@Entity +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Table(name="BR_TEMPLATE") +//@Api(value="报表模板",description = "报表模板") +//public class BrTemplate extends BaseBean { +// +// @Column(name = "DATA_SOURCE_ID") +// @ApiParam(value = "数据源ID", example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long dataSourceId = 0L; +// +// @Column(name="NAME") +// @ApiParam(value ="模板名称" , access ="模板名称") +// private String name; +// +// @Column(name="TEMPLATE_TYPE") +// @ApiParam(value ="模板类型" , example ="-1",access="表格，图表") +// private Integer templateType; +// +// @Column(name="TEMPLATE_STATUS") +// @ApiParam(value ="模板状态" , example ="-1",access="模板状态") +// private Integer templateStatus; +// +// @Column(name="NUM_POJO") +// @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") +// private Integer numPojo; +// +// @Lob +// @Column(name="TEMPLATE_POJO_NAMES_RDD") +// @ApiParam(value ="对象名称" , access ="对象名称") +// private String templatePojoNamesRdd; +// +// @Column(name="NUM_SERVER") +// @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") +// private Integer numServer; +// +// @Lob +// @Column(name="TEMPLATE_SERVER_ID_LIST") +// @ApiParam(value ="数据服务ID集合" , access ="服务名称") +// private String templateServerIdList; +// +// @Lob +// @Column(name="TEMPLATE_SERVER_NAMES_RDD") +// @ApiParam(value ="服务名称" , access ="服务名称") +// private String templateServerNamesRdd; +// +// @Column(name="NUM_TEMPLATE_ATTR_FILTER") +// @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") +// private Integer numTemplateAttrFilter; +// +// @Lob +// @Column(name="template_attr_filter_list") +// @ApiParam(value ="模板查询条件" , access ="模板查询条件") +// private String templateAttrFilterList; +// +// @Column(name="NUM_TEMPLATE_ATTR_FILTER_GROUP") +// @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") +// private Integer numTemplateAttrFilterGroup; +// +// @Lob +// @Column(name="TEMPLATE_ATTR_FILTER_GROUP_LIST") +// @ApiParam(value ="模板分组条件" , access ="模板分組条件") +// private String templateAttrFilterGroupList; +// +// @Column(name="NUM_TEMPLATE_ATTR_SHOW") +// @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") +// private Integer numTemplateAttrShow; +// +// @Lob +// @Column(name="TEMPLATE_ATTR_SHOW_LIST") +// @ApiParam(value ="模板显示属性" , access ="模板显示属性") +// private String templateAttrShowList; +// +// @Column(name="NUM_TEMPLATE_AGGREGATION") +// @ApiParam(value ="对象聚集数量" , example ="0" , access ="对象聚集数量") +// private Integer numTemplateAggregation; +// +// @Lob +// @Column(name="TEMPLATE_ATTR_AGGREGATION_LIST") +// @ApiParam(value ="模板聚集属性" , access ="模板聚集属性") +// private String templateAttrAggregationList; +// +// @Column(name="TEMPLATE_DESCRIPTION") +// @ApiParam(value ="模板描述" , access ="模板描述") +// private String templateDescription; +// +// @Lob +// @Column(name="TEMPLATE_HQL") +// @ApiParam(value ="模板执行HQL" , access ="模板执行HQL") +// private String templateHql; +// +// @Lob +// @Column(name="TEMPLATE_HTML") +// @ApiParam(value ="模板HTML" , access ="模板HTML") +// private String templateHtml; +// +// @Transient +// @ApiParam(value ="模板服务编号集合") +// private List serverIdList = new ArrayList<>(); +// +// @Transient +// @ApiParam(value ="模板服务") +// private List serverList = new ArrayList<>(); +// +// @Transient +// @ApiParam(value ="模板服务对象") +// private List serverPojoList = new ArrayList<>(); +// +// @Transient +// @ApiParam(value ="模板服务对象关系") +// private List serverPojoRefList = new ArrayList<>(); +// +// @Transient +// @ApiParam(value ="模板服务对象关联属性") +// private List pojoAttrList = new ArrayList<>(); +// +// +// @Transient +// @ApiParam(value ="模板服务对象查询条件") +// private List pojoAttrWhereList = new ArrayList<>(); +// +// @Transient +// @ApiParam(value ="模板服务对象分组条件") +// private List pojoAttrGroupList = new ArrayList<>(); +// +// @Transient +// @ApiParam(value ="模板服务对象聚合条件") +// private List pojoAttrAggregationList = new ArrayList<>(); +// +// @Transient +// @ApiParam(value ="模板服务对象显示属性") +// private List pojoAttrShowList = new ArrayList<>(); +// +// @Transient +// @ApiParam(value ="模板服务集合") +// private List serverNameList = new ArrayList<>(); +// +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplateCustomHql.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplateCustomHql.java index 8e5e68a..2d040ec 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplateCustomHql.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplateCustomHql.java @@ -1,49 +1,49 @@ -package cn.estsh.i3plus.pojo.report.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 11:23 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="BR_TEMPLATE_CUSTOM_HQL") -@Api(value="模板自定义语句",description = "模板自定义语句") -public class BrTemplateCustomHql extends BaseBean { - - @Column(name="TEMPLATE_ID") - @ApiParam(value ="模板编号" , example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long templateId; - - @Column(name="DATA_TYPE") - @ApiParam(value ="自定义类型" , example ="-1") - private Integer dataType; - - @Lob - @Column(name="CUSTOM_CONTENT") - @ApiParam(value ="自定义语句内容" , access ="自定义语句内容") - private String customContent; - -} +//package cn.estsh.i3plus.pojo.report.bean; +// +//import cn.estsh.i3plus.pojo.base.bean.BaseBean; +//import com.fasterxml.jackson.databind.annotation.JsonSerialize; +//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiParam; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +//import org.hibernate.annotations.DynamicInsert; +//import org.hibernate.annotations.DynamicUpdate; +//import org.hibernate.annotations.Type; +// +//import javax.persistence.Column; +//import javax.persistence.Entity; +//import javax.persistence.Lob; +//import javax.persistence.Table; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 11:23 +// * @Modify: +// **/ +//@Data +//@Entity +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Table(name="BR_TEMPLATE_CUSTOM_HQL") +//@Api(value="模板自定义语句",description = "模板自定义语句") +//public class BrTemplateCustomHql extends BaseBean { +// +// @Column(name="TEMPLATE_ID") +// @ApiParam(value ="模板编号" , example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long templateId; +// +// @Column(name="DATA_TYPE") +// @ApiParam(value ="自定义类型" , example ="-1") +// private Integer dataType; +// +// @Lob +// @Column(name="CUSTOM_CONTENT") +// @ApiParam(value ="自定义语句内容" , access ="自定义语句内容") +// private String customContent; +// +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java index 395f0ca..83eab7d 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.report.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrElement; import cn.estsh.i3plus.pojo.report.bean.BrLayoutColumn; /** diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoFilterAttrRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoFilterAttrRepository.java new file mode 100644 index 0000000..52660fd --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoFilterAttrRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.report.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.report.bean.BrPojo; +import cn.estsh.i3plus.pojo.report.bean.BrPojoFilterAttr; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-4 下午4:04 + * @Modify: + **/ +public interface BrPojoFilterAttrRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoFilterRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoFilterRepository.java new file mode 100644 index 0000000..266042e --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoFilterRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.report.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.report.bean.BrPojoFilter; +import cn.estsh.i3plus.pojo.report.bean.BrPojoView; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-4 下午4:04 + * @Modify: + **/ +public interface BrPojoFilterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoRepository.java new file mode 100644 index 0000000..f95a73f --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.report.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.report.bean.BrPojo; +import cn.estsh.i3plus.pojo.report.bean.BrPojoViewAttr; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-4 下午4:04 + * @Modify: + **/ +public interface BrPojoRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoViewAttrRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoViewAttrRepository.java new file mode 100644 index 0000000..cf9dd41 --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoViewAttrRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.report.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.report.bean.BrPojoViewAttr; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-4 下午4:04 + * @Modify: + **/ +public interface BrPojoViewAttrRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoViewRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoViewRepository.java new file mode 100644 index 0000000..af19376 --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoViewRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.report.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.report.bean.BrPojoView; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-4 下午4:04 + * @Modify: + **/ +public interface BrPojoViewRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefPojoRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefPojoRepository.java index febaf03..5df3c2f 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefPojoRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefPojoRepository.java @@ -1,15 +1,15 @@ -package cn.estsh.i3plus.pojo.report.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrRefPojo; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 15:04 - * @Modify: - **/ -public interface BrRefPojoRepository extends BaseRepository { - -} +//package cn.estsh.i3plus.pojo.report.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.report.bean.BrRefPojo; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 15:04 +// * @Modify: +// **/ +//public interface BrRefPojoRepository extends BaseRepository { +// +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefServerPojoRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefServerPojoRepository.java index fbf9382..3d39e7c 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefServerPojoRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefServerPojoRepository.java @@ -1,15 +1,15 @@ -package cn.estsh.i3plus.pojo.report.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrMenu; -import cn.estsh.i3plus.pojo.report.bean.BrRefServerPojo; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 15:05 - * @Modify: - **/ -public interface BrRefServerPojoRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.report.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.report.bean.BrMenu; +//import cn.estsh.i3plus.pojo.report.bean.BrRefServerPojo; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 15:05 +// * @Modify: +// **/ +//public interface BrRefServerPojoRepository extends BaseRepository { +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefTemplateServerRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefTemplateServerRepository.java index c2d14d4..007702b 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefTemplateServerRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefTemplateServerRepository.java @@ -1,15 +1,15 @@ -package cn.estsh.i3plus.pojo.report.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrMenu; -import cn.estsh.i3plus.pojo.report.bean.BrRefTemplateServer; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 15:05 - * @Modify: - **/ -public interface BrRefTemplateServerRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.report.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.report.bean.BrMenu; +//import cn.estsh.i3plus.pojo.report.bean.BrRefTemplateServer; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 15:05 +// * @Modify: +// **/ +//public interface BrRefTemplateServerRepository extends BaseRepository { +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrReportTemplateRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrReportTemplateRepository.java index c6fef7c..5e0e034 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrReportTemplateRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrReportTemplateRepository.java @@ -1,14 +1,14 @@ -package cn.estsh.i3plus.pojo.report.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrReportTemplate; - -/** - * @Description : - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-12-26 20:23 - * @Modify: - **/ -public interface BrReportTemplateRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.report.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.report.bean.BrReportTemplate; +// +///** +// * @Description : +// * @Reference : +// * @Author : alwaysfrin +// * @CreateDate : 2018-12-26 20:23 +// * @Modify: +// **/ +//public interface BrReportTemplateRepository extends BaseRepository { +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrTemplateCustomHqlRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrTemplateCustomHqlRepository.java index 617f010..91121a2 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrTemplateCustomHqlRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrTemplateCustomHqlRepository.java @@ -1,15 +1,15 @@ -package cn.estsh.i3plus.pojo.report.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrMenu; -import cn.estsh.i3plus.pojo.report.bean.BrTemplateCustomHql; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 15:05 - * @Modify: - **/ -public interface BrTemplateCustomHqlRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.report.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.report.bean.BrMenu; +//import cn.estsh.i3plus.pojo.report.bean.BrTemplateCustomHql; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 15:05 +// * @Modify: +// **/ +//public interface BrTemplateCustomHqlRepository extends BaseRepository { +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrTemplateRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrTemplateRepository.java index fec3f05..9b43984 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrTemplateRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrTemplateRepository.java @@ -1,14 +1,14 @@ -package cn.estsh.i3plus.pojo.report.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrTemplate; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 15:05 - * @Modify: - **/ -public interface BrTemplateRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.report.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.report.bean.BrTemplate; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 15:05 +// * @Modify: +// **/ +//public interface BrTemplateRepository extends BaseRepository { +//} 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 22e016a..025e496 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 @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.report.sqlpack; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.BlockReportEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.report.bean.*; import org.apache.commons.lang3.StringUtils; @@ -67,31 +69,31 @@ public class ReportHqlPack { return result.toString(); } - /** - * 目录查询封装 - * @param template - * @return - */ - public static String packHqlBrTemplate(BrTemplate template){ - StringBuffer result = new StringBuffer(); - - // 查询参数封装 - HqlPack.getNumEqualPack(template.getTemplateType(),"templateType",result); - if(template.getTemplateStatus() != null){ - if(template.getTemplateStatus().intValue() == CommonEnumUtil.USER_STATUS.DISABLE.getValue()){ - HqlPack.getNumEqualPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result); - }else { - HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result); - } - } - HqlPack.getStringLikerPack(template.getName(),"name",result); - - // 添加默认排序 - HqlPack.getOrderDefault(template); - - return result.toString(); - } - +// /** +// * 目录查询封装 +// * @param template +// * @return +// */ +// public static String packHqlBrTemplate(BrTemplate template){ +// StringBuffer result = new StringBuffer(); +// +// // 查询参数封装 +// HqlPack.getNumEqualPack(template.getTemplateType(),"templateType",result); +// if(template.getTemplateStatus() != null){ +// if(template.getTemplateStatus().intValue() == CommonEnumUtil.USER_STATUS.DISABLE.getValue()){ +// HqlPack.getNumEqualPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result); +// }else { +// HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result); +// } +// } +// HqlPack.getStringLikerPack(template.getName(),"name",result); +// +// // 添加默认排序 +// HqlPack.getOrderDefault(template); +// +// return result.toString(); +// } +// /** * 报表元素查询 * @param brElement @@ -181,4 +183,46 @@ public class ReportHqlPack { return result.toString(); } + + public static DdlPackBean packHqlBrPojo(BrPojo pojo){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(pojo.getMasterId(),"masterId",result); + DdlPreparedPack.getNumEqualPack(pojo.getSoftType(),"softType",result); + DdlPreparedPack.getNumEqualPack(pojo.getJoinType(),"joinType",result); + DdlPreparedPack.getNumEqualPack(pojo.getPojoType(),"pojoType",result); + DdlPreparedPack.getNumEqualPack(pojo.getWhereType(),"whereType",result); + DdlPreparedPack.getStringEqualPack(pojo.getPojoCodeAlias(),"pojoCodeAlias",result); + DdlPreparedPack.getStringLikerPack(pojo.getPojoName(),"pojoName",result); + DdlPreparedPack.getStringLikerPack(pojo.getPojoCode(),"pojoCode",result); + + return result; + } + + public static DdlPackBean packHqlBrPojoFilter(BrPojoFilter bean){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bean.getMasterId(),"masterId",result); + + return result; + } + + public static DdlPackBean packHqlBrPojoFilterAttr(BrPojoFilterAttr bean){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bean.getFilterId(),"filterId",result); + DdlPreparedPack.getNumEqualPack(bean.getMasterId(),"masterId",result); + DdlPreparedPack.getNumEqualPack(bean.getPojoId(),"pojoId",result); + + return result; + } + + public static DdlPackBean packHqlBrPojoViewAttr(BrPojoViewAttr bean){ + DdlPackBean result = DdlPackBean.getDdlPackBean(bean); + + DdlPreparedPack.getNumEqualPack(bean.getPojoId(),"pojoId",result); + DdlPreparedPack.getNumEqualPack(bean.getViewId(),"viewId",result); + + return result; + } } From a88bba2f9de3a5f3f59562de8c484f4d03a18c49 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 27 Dec 2019 20:09:25 +0800 Subject: [PATCH 050/139] =?UTF-8?q?=E6=B8=85=E7=90=86=E5=86=97=E4=BD=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9caeb95..04d7385 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 2.9.2 - + org.projectlombok lombok From 8143afeea9fb0f061e876fe24417f5128f7ec6ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 27 Dec 2019 20:11:27 +0800 Subject: [PATCH 051/139] =?UTF-8?q?=E6=8B=A3=E8=B4=A7=EF=BC=9A=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=9A=84=E6=95=B0=E9=87=8F=E4=B8=8D=E8=83=BD=E5=B0=8F?= =?UTF-8?q?=E4=BA=8E0+=E5=AE=9A=E6=97=B6=E5=A4=84=E7=90=86=E9=81=97?= =?UTF-8?q?=E6=BC=8F=E7=9A=84=E5=BE=85=E5=A4=84=E7=90=86=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=8D=95JOB+closeTaskDetails=E5=87=BD=E6=95=B0=E8=BF=98?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E8=BD=AF=E5=88=A0=E5=8D=95=E6=8D=AE=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java index a0f8726..b84e932 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java @@ -15,7 +15,8 @@ import java.util.List; @Data public class WmsJobParamModel implements Serializable { private static final long serialVersionUID = 5784492509251527816L; - private String organizeCode; - private List zonesNoList; - private Integer snType; + private String organizeCode;//工厂代码 + private List zonesNoList;//存储区编号 + private Integer snType;//条码类型（虚拟，实物） + private String devOpsEmail;//运维人员邮箱 } From 6afa007224e140bf361dd8c807f284bd4bf147b9 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 27 Dec 2019 21:23:09 +0800 Subject: [PATCH 052/139] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8B=96=E6=8B=BD?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-aps/pom.xml | 1 + .../i3plus/pojo/aps/model/GanttCalendarModel.java | 1 - .../i3plus/pojo/aps/model/GanttDragModel.java | 10 ++++++++ ...GanttEventModel.java => GanttEventRequest.java} | 2 +- .../i3plus/pojo/aps/model/GanttPlanModel.java | 27 ++++++++++++++++++++++ 5 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java rename modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/{GanttEventModel.java => GanttEventRequest.java} (96%) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index c052a9d..4fa7c5a 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -11,6 +11,7 @@ 4.0.0 i3plus-pojo-aps + jar diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java index c86230f..13abdc2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java @@ -21,5 +21,4 @@ public class GanttCalendarModel { //private String timeRangeColor; private String eventColor; private String name; - private Long workId; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java new file mode 100644 index 0000000..385ee44 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java @@ -0,0 +1,10 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +@Data +public class GanttDragModel { + private Long workId; + private Long resId; + private Long targetWorkId; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventRequest.java similarity index 96% rename from modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java rename to modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventRequest.java index 05bf634..69d1e23 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventRequest.java @@ -20,7 +20,7 @@ import java.util.List; **/ @Data @Api("甘特图分页查询参数") -public class GanttEventModel { +public class GanttEventRequest { private Long[] resourceIds; @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java new file mode 100644 index 0000000..dcbc039 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +@Data +public class GanttPlanModel { + private Long resourceId; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date startDate; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date endDate; + private String cls; + //private String timeRangeColor; + private String eventColor; + private String name; + private Long workId; + private List resIds; +} From 46bf93f4102cef6b8b17296ed6b5925d51856aac Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 30 Dec 2019 13:50:25 +0800 Subject: [PATCH 053/139] =?UTF-8?q?=E3=80=90VDA=E6=B3=A2=E6=AC=A1=E9=85=8D?= =?UTF-8?q?=E6=96=99--=E7=89=A9=E6=96=99=E6=B1=87=E6=80=BB=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 813538d..fc31c9c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -214,6 +214,14 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("优先级描述") private String priorityStr; + @Transient + @ApiParam(value = "汇总需求数量", example = "0") + public Double sumQty; + + @Transient + @ApiParam(value = "汇总拣货数量", example = "0") + public Double sumPickQty; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } @@ -276,7 +284,9 @@ public class WmsDocMovementDetails extends BaseBean { this.destLocateNo = destLocateNo; } - public WmsDocMovementDetails (String partNo,Integer priority,String orderNo) { + public WmsDocMovementDetails (Double sumQty,Double sumPickQty ,String partNo,Integer priority,String orderNo) { + this.sumQty = sumQty; + this.sumPickQty = sumPickQty; this.partNo = partNo; this.priority = priority; this.orderNo = orderNo; From d47a097c53b1996d2120d6139578ca81ba4f160e Mon Sep 17 00:00:00 2001 From: jokelone Date: Mon, 30 Dec 2019 14:47:05 +0800 Subject: [PATCH 054/139] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A134?= =?UTF-8?q?4=20=E9=80=9A=E7=94=A8=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/util/StringUtil.java | 54 ---------------------- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 2 files changed, 1 insertion(+), 55 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java index 95bfee7..6a7a274 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/StringUtil.java @@ -33,58 +33,4 @@ public class StringUtil { } return fieldNames; } - - /** - * 获取对象所有属性名 - * @param clazz - * @return - */ - public static List getFieldList(Class clazz) { - Field[] fields = clazz.getDeclaredFields(); - Field[] superFields = clazz.getSuperclass().getDeclaredFields(); - List fieldNames = new ArrayList<>(); - for(int i = 0;i < fields.length; i++){ - fieldNames.add(fields[i].getName()); - } - for(int i = 0;i < superFields.length; i++){ - fieldNames.add(superFields[i].getName()); - } - return fieldNames; - } - - /** - * 根据属性名和对象获取属性对应的值 - * @param fieldName - * @param o - * @return - */ - public static Object getFieldValueByName(String fieldName, Object o) { - try { - String firstLetter = fieldName.substring(0, 1).toUpperCase(); - String getter = "get" + firstLetter + fieldName.substring(1); - Method method = o.getClass().getMethod(getter, new Class[] {}); - Object value = method.invoke(o, new Object[] {}); - return value; - } catch (Exception e) { - return null; - } - } - - private static Pattern linePattern = Pattern.compile("_(\\w)"); - - /** 驼峰转下划线 */ - public static Map humpToLine(Map map) { - Map resultMap = new HashMap<>(); - for (String str : map.keySet()) { - str = str.toLowerCase(); - Matcher matcher = linePattern.matcher(str); - StringBuffer sb = new StringBuffer(); - while (matcher.find()) { - matcher.appendReplacement(sb, matcher.group(1).toUpperCase()); - } - matcher.appendTail(sb); - resultMap.put(sb.toString(), map.get(str)); - } - return resultMap; - } } 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 b9eb3ec..001ee09 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 @@ -1388,7 +1388,7 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCenterCode(), "workCenterCode", packBean); } - if (null == mesQcCheckStandard.getCheckType()) { + if (mesQcCheckStandard.getCheckType() != null) { DdlPreparedPack.getNumberBiggerEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean); } if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItem())) { From 14f47f1ab4fa92642ae8d0e2a0bde69a39dd81f8 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 30 Dec 2019 14:59:15 +0800 Subject: [PATCH 055/139] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=BC=B9=E5=87=BA=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 17 ++++++++-- .../cn/estsh/i3plus/pojo/aps/bean/DayShift.java | 17 ++++++++-- .../cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 14 +++++++-- .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 18 +++++++++-- .../estsh/i3plus/pojo/aps/bean/ProductRouting.java | 18 +++++++++-- .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 18 +++++++++-- .../estsh/i3plus/pojo/aps/bean/StandOperation.java | 17 ++++++++-- .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 5 ++- .../cn/estsh/i3plus/pojo/aps/common/BaseCode.java | 36 ---------------------- .../cn/estsh/i3plus/pojo/aps/common/BeanInfo.java | 6 ++++ .../pojo/aps/validator/IMainKeyValidatorImpl.java | 7 +++++ .../pojo/aps/validator/MainKeyValidator.java | 3 +- .../i3plus/pojo/aps/validator/UpdateGroup.java | 4 +++ 13 files changed, 128 insertions(+), 52 deletions(-) delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/IMainKeyValidatorImpl.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/UpdateGroup.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index 52363f2..156db58 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -2,9 +2,12 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; -import cn.estsh.i3plus.pojo.aps.common.BaseCode; +import cn.estsh.i3plus.pojo.aps.annotation.MainKey; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; +import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -29,7 +32,17 @@ import java.util.List; @MappedSuperclass @Api("订单基类") @ExcludeImportExport -public class BaseOrder extends BaseCode { +@MainKey(groups = {InsertGroup.class, UpdateGroup.class}) +public class BaseOrder extends BaseAPS { + @Column(name="CODE") + @ApiParam(value ="编码") + @FieldAnnotation(popSearch = true, mainkey = true) + private String code; + + @Column(name="NAME") + @ApiParam(value ="名称") + @FieldAnnotation(popSearch = true) + private String name; @Column(name="MATERIAL_ID") @ApiParam(value ="物料") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java index 6f816fb..acdf7e4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java @@ -1,8 +1,10 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; -import cn.estsh.i3plus.pojo.aps.common.BaseCode; +import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; +import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -24,7 +26,18 @@ import javax.persistence.Table; @Entity @Table(name = "APS_DAY_SHIFT") @Api("班次") -public class DayShift extends BaseCode { +@MainKey(groups = {InsertGroup.class, UpdateGroup.class}) +public class DayShift extends BaseAPS { + @Column(name="CODE") + @ApiParam(value ="编码") + @FieldAnnotation(popSearch = true, mainkey = true) + private String code; + + @Column(name="NAME") + @ApiParam(value ="名称") + @FieldAnnotation(popSearch = true) + private String name; + @Column(name="WORK_TIMES") @ApiParam(value ="工作时间") @FieldAnnotation(notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index a93133b..194075b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; -import cn.estsh.i3plus.pojo.aps.common.BaseCode; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -34,7 +34,17 @@ import java.sql.JDBCType; @Table(name="APS_FIELD_INFO") @Api("字段信息") @ExcludeImportExport -public class FieldInfo extends BaseCode { +public class FieldInfo extends BaseAPS { + @Column(name="CODE") + @ApiParam(value ="编码") + @FieldAnnotation(popSearch = true, mainkey = true) + private String code; + + @Column(name="NAME") + @ApiParam(value ="名称") + @FieldAnnotation(popSearch = true) + private String name; + @Column(name="CLASS_NAME") @ApiParam(value ="所属类简称") private String className; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index cb15093..694c22a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -1,10 +1,13 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation; -import cn.estsh.i3plus.pojo.aps.common.BaseCode; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EMaterial; +import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; +import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; @@ -29,7 +32,18 @@ import java.util.List; @Entity @Table(name = "APS_MATERIAL") @Api("物料") -public class Material extends BaseCode { +@MainKey(groups = {InsertGroup.class, UpdateGroup.class}) +public class Material extends BaseAPS { + @Column(name="CODE") + @ApiParam(value ="编码") + @FieldAnnotation(popSearch = true, mainkey = true) + private String code; + + @Column(name="NAME") + @ApiParam(value ="名称") + @FieldAnnotation(popSearch = true) + private String name; + @Column(name="TYPE") @ApiParam(value ="物料类型") @FieldAnnotation(defaultValue = "PRODUCT") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java index 830d392..06ac508 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java @@ -1,9 +1,12 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; -import cn.estsh.i3plus.pojo.aps.common.BaseCode; +import cn.estsh.i3plus.pojo.aps.annotation.MainKey; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EProductRouting; +import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; +import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -28,7 +31,18 @@ import java.util.List; @Entity @Table(name = "APS_PRODUCT_ROUTING") @Api("工艺路线") -public class ProductRouting extends BaseCode { +@MainKey(groups = {InsertGroup.class, UpdateGroup.class}) +public class ProductRouting extends BaseAPS { + @Column(name="CODE") + @ApiParam(value ="编码") + @FieldAnnotation(popSearch = true, mainkey = true) + private String code; + + @Column(name="NAME") + @ApiParam(value ="名称") + @FieldAnnotation(popSearch = true) + private String name; + @Column(name="MATERIAL_ID") @ApiParam(value ="物料") @FieldAnnotation(relation = "Material", notEmpty = true, display = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index c9dc2e7..963ff6f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -1,9 +1,12 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; -import cn.estsh.i3plus.pojo.aps.common.BaseCode; +import cn.estsh.i3plus.pojo.aps.annotation.MainKey; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EResource; +import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; +import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; @@ -28,7 +31,18 @@ import java.util.List; @Entity @Table(name = "APS_RESOURCE") @Api("资源") -public class Resource extends BaseCode { +@MainKey(groups = {InsertGroup.class, UpdateGroup.class}) +public class Resource extends BaseAPS { + @Column(name="CODE") + @ApiParam(value ="编码") + @FieldAnnotation(popSearch = true, mainkey = true) + private String code; + + @Column(name="NAME") + @ApiParam(value ="名称") + @FieldAnnotation(popSearch = true) + private String name; + @Column(name="TYPE") @ApiParam(value ="资源类型") @FieldAnnotation(defaultValue = "MAIN") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index 90b158f..b24c7aa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -1,7 +1,10 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; -import cn.estsh.i3plus.pojo.aps.common.BaseCode; +import cn.estsh.i3plus.pojo.aps.annotation.MainKey; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; +import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -24,7 +27,17 @@ import javax.persistence.Table; @Entity @Table(name = "APS_STAND_OPERATION") @Api("标准工序") -public class StandOperation extends BaseCode { +@MainKey(groups = {InsertGroup.class, UpdateGroup.class}) +public class StandOperation extends BaseAPS { + @Column(name="CODE") + @ApiParam(value ="编码") + @FieldAnnotation(popSearch = true, mainkey = true) + private String code; + + @Column(name="NAME") + @ApiParam(value ="名称") + @FieldAnnotation(popSearch = true) + private String name; @Column(name="DIRECTION") @ApiParam(value ="排程方向") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 3a8d8c4..72bec5a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -1,10 +1,12 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; -import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWork; +import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; +import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; @@ -30,6 +32,7 @@ import java.util.List; @Entity @Table(name = "APS_WORK") @Api("工作") +@MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class Work extends BaseAPS { @Column(name="CODE") @ApiParam(value ="编码") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java deleted file mode 100644 index 03a9bcf..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.common; - -import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; -import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; -import cn.estsh.i3plus.pojo.aps.annotation.MainKey; -import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; - -/** - * @Description :含有编码，名字的基类 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-12 - * @Modify: - **/ -@Data -@EqualsAndHashCode(callSuper = true) -@MappedSuperclass -@MainKey(groups = {InsertGroup.class}) -@ExcludeImportExport -public abstract class BaseCode extends BaseAPS { - @Column(name="CODE") - @ApiParam(value ="编码") - @FieldAnnotation(popSearch = true, mainkey = true) - private String code; - - @Column(name="NAME") - @ApiParam(value ="名称") - @FieldAnnotation(popSearch = true) - private String name; -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java index a8cdb93..510e091 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.common; +import cn.estsh.i3plus.pojo.aps.validator.IMainKeyValidatorImpl; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; @@ -177,6 +178,7 @@ public class BeanInfo { private static Map, BeanInfo> beanInfos = new HashMap<>(); private static Map nameMapBeanInfos = new HashMap<>(); + private static IMainKeyValidatorImpl mainKeyValidator; static { BeanInfo beanInfo = new BeanInfo(BaseBean.class); @@ -306,4 +308,8 @@ public class BeanInfo { return cls; } + + public static IMainKeyValidatorImpl getMainKeyValidator() { return mainKeyValidator; } + + public static void setMainKeyValidator(IMainKeyValidatorImpl impl) { mainKeyValidator = impl; } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/IMainKeyValidatorImpl.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/IMainKeyValidatorImpl.java new file mode 100644 index 0000000..d9ed765 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/IMainKeyValidatorImpl.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.validator; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; + +public interface IMainKeyValidatorImpl { + boolean isValid(BaseBean bean); +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/MainKeyValidator.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/MainKeyValidator.java index 73ba5d0..4162a83 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/MainKeyValidator.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/MainKeyValidator.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.aps.validator; import cn.estsh.i3plus.pojo.aps.annotation.MainKey; +import cn.estsh.i3plus.pojo.aps.common.BeanInfo; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import javax.validation.ConstraintValidator; @@ -9,6 +10,6 @@ import javax.validation.ConstraintValidatorContext; public class MainKeyValidator implements ConstraintValidator { @Override public boolean isValid(BaseBean bean, ConstraintValidatorContext constraintValidatorContext) { - return true; + return BeanInfo.getMainKeyValidator().isValid(bean); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/UpdateGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/UpdateGroup.java new file mode 100644 index 0000000..8b6c6bc --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/UpdateGroup.java @@ -0,0 +1,4 @@ +package cn.estsh.i3plus.pojo.aps.validator; + +public interface UpdateGroup { +} From 2da366630ffc81744addacc7ba1c0d6632be0c30 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 30 Dec 2019 15:49:53 +0800 Subject: [PATCH 056/139] =?UTF-8?q?=E3=80=90VDA=E6=B3=A2=E6=AC=A1=E9=85=8D?= =?UTF-8?q?=E6=96=99--=E7=89=A9=E6=96=99=E6=B1=87=E6=80=BB=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 4fcea9d..379fd9d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -210,7 +210,6 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("优先级") private Integer priority; - @Transient @ApiParam(value = "汇总需求数量", example = "0") public Double sumQty; From f8e3edabc309413b2bd1a8e25ff77702f628f2d0 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 30 Dec 2019 16:57:11 +0800 Subject: [PATCH 057/139] =?UTF-8?q?=E3=80=90=207159=20=E7=BA=BF=E8=BE=B9?= =?UTF-8?q?=E9=80=80=E6=96=99=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF=EF=BC=8C?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E4=B8=BA=EF=BC=9A=E6=89=AB=E6=8F=8FA?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=EF=BC=8C=E8=BE=93=E5=85=A5=E5=8E=9F=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=9A=84=E5=89=A9=E4=BD=99=E6=95=B0=E9=87=8F=EF=BC=8C?= =?UTF-8?q?=E6=8B=86=E5=8C=85=E7=94=9F=E6=88=90=E7=9A=84=E6=96=B0=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=95=99=E5=9C=A8=E7=BA=BF=E8=BE=B9=EF=BC=8C=E5=8E=9F?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E9=80=80=E5=9B=9E=E4=BB=93=E5=BA=93=E3=80=82?= =?UTF-8?q?=E8=8B=A5=E6=95=B0=E9=87=8F=E4=B8=8E=E5=8E=9F=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=9B=B8=E7=AD=89=EF=BC=8C=E5=88=99=E4=B8=8D=E5=81=9A=E6=8B=86?= =?UTF-8?q?=E5=8C=85=E3=80=82=20=E3=80=91bug7159?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java index d08c68d..a64dc8f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java @@ -69,4 +69,8 @@ public class WmsShippingFlag extends BaseBean { @Column(name = "FLAG_FAX") @ApiParam(value = "传真") private String flagFax; + + @Column(name="TEMPLATE_NO") + @ApiParam("模板编号") + private String templateNo; } From a76d70851d5204252bc14e2ca69de50e55d7b8a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 30 Dec 2019 19:17:12 +0800 Subject: [PATCH 058/139] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=20=E9=80=82?= =?UTF-8?q?=E9=85=8D=E8=AE=B0=E5=BD=95=E5=8F=82=E6=95=B0=20=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 23 +++++++++------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index b1a9344..6bf3024 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -4,19 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSource; -import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKeyParam; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSourceTable; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitDataDetail; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitSchedule; -import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase; +import cn.estsh.i3plus.pojo.softswitch.bean.*; /** * @Description : @@ -415,7 +403,6 @@ public class SoftSwitchHqlPack { return ddlPackBean; } - public static DdlPackBean packHqlSuitDataDetailBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); @@ -426,4 +413,12 @@ public class SoftSwitchHqlPack { return ddlPackBean; } + + public static DdlPackBean packHqlBsSuitRecordParam(BsSuitRecordParam bsSuitRecordParam){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bsSuitRecordParam.getSuitRecordId(),"suitRecordId",ddlPackBean); + + return ddlPackBean; + } } From 472adfd03c8638c37bb96bcca61b9a752962c388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 31 Dec 2019 10:41:14 +0800 Subject: [PATCH 059/139] =?UTF-8?q?=E3=80=90KT-1339=20=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8B=89=E5=8A=A8=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BD=8E=E4=BA=8E=E8=B5=B7=E8=AE=A2=E9=87=8F=E6=A6=82=E5=BF=B5?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java | 73 ++++++++++++++++++++++ .../pojo/wms/repository/WmsZonePartRepository.java | 17 +++++ 2 files changed, 90 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonePartRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java new file mode 100644 index 0000000..11d9020 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.wms.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.ColumnDefault; +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 : jessica.chen + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ZONE_PART") +@Api("库区物料") +public class WmsZonePart extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592546L; + @Column(name="ZONE_NO") + @ApiParam("存储区编号") + private String zoneNo; + + @Column(name="PART_NO") + @ApiParam("物料编码") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name="PULL_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "拉动数量", example = "0") + private Double pullQty; + + @Column(name="MAX", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "最大值", example = "0") + private Double max; + + @Column(name="MIN", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "最小值", example = "0") + private Double min; + + @Column(name = "IS_GENERATE_PICKLIST") + @ApiParam(value = "是否生成领料单", example = "2") + private Integer isGeneratePickList; + + @Column(name="MOQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "起订量", example = "0") + private Double moq; + + @Column(name="SAFETY_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "安全量", example = "0") + private Double safetyQty; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonePartRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonePartRepository.java new file mode 100644 index 0000000..ecfa631 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonePartRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.BasCustomer; +import cn.estsh.i3plus.pojo.wms.bean.WmsZonePart; +import org.springframework.stereotype.Repository; + +/** + * @Description :库区物料 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-12-30 17:27 + * @Modify: + **/ +@Repository +public interface WmsZonePartRepository extends BaseRepository { +} From 8a4aa9fed295b96a0870ef6f05784a2b3785382c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 31 Dec 2019 10:57:10 +0800 Subject: [PATCH 060/139] =?UTF-8?q?jis=E5=8F=91=E8=BF=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 40 +++++++++++++- .../estsh/i3plus/pojo/mes/bean/MesJisPattern.java | 64 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java | 56 +++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJisDetail.java | 56 +++++++++++++++++++ .../mes/repository/MesJisPatternRepository.java | 16 ++++++ .../repository/MesQueueJisDetailRepository.java | 16 ++++++ .../pojo/mes/repository/MesQueueJisRepository.java | 16 ++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 26 +++++++++ 8 files changed, 287 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJisDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJisRepository.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 9c4d8f6..0bb09ea 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 @@ -17,9 +17,8 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_JIS_PATTERN_TYPE { - ONE(10, "一套发运"), - TRUE(20, "多套发运"), - FALSE(30, "单产品多套发运"); + ONE_PROD(10, "单产品发运"), + MANY_PROD(20, "多产品发运"); private int value; private String description; @@ -49,6 +48,41 @@ public class MesEnumUtil { } /** + * JIS发运产品组扫描顺序类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_JIS_SCAN_SEQ_TYPE { + ONE_PROD(10, "整发"), + MANY_PROD(20, "单发"); + + private int value; + private String description; + + MES_JIS_SCAN_SEQ_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; + } + } + + /** * 是否解析 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java new file mode 100644 index 0000000..f3c9f89 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java @@ -0,0 +1,64 @@ +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 :JIS发运模式 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_JIS_PATTERN") +@Api("JIS发运模式") +public class MesJisPattern extends BaseBean { + + @Column(name = "PATTERN_NO") + @ApiParam("模式编号") + private String patternNo; + + @Column(name = "PATTERN_NAME") + @ApiParam("模式名称") + private String patternName; + + @Column(name = "RULE") + @ApiParam("规则") + private String rule; + + @Column(name = "DESC") + @ApiParam("描述") + private String desc; + + @Column(name = "TOP_NO") + @ApiParam("一次显示TOP数") + private Integer topNo; + + @Column(name = "HANDLE_NO") + @ApiParam("一次处理套数") + private Integer handleNo; + + @Column(name = "PATTERN_TYPE") + @ApiParam("模式类型") + private Integer patternType; + + @Column(name = "SCAN_SEQ_TYPE") + @ApiParam("产品组扫描顺序类型") + private Integer scanSeqType; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java new file mode 100644 index 0000000..6f65fce --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java @@ -0,0 +1,56 @@ +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 :JIS发运队列 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIS") +@Api("JIS发运队列") +public class MesQueueJis extends BaseBean { + + @Column(name = "JIS_NO") + @ApiParam("主队列编号") + private String jisNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CAR_NO") + @ApiParam("车号") + private String carNo; + + @Column(name = "SEQ") + @ApiParam("排序") + private Double seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java new file mode 100644 index 0000000..db45636 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java @@ -0,0 +1,56 @@ +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 :JIS发运队列明细 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIS_DETAIL") +@Api("JIS发运队列明细") +public class MesQueueJisDetail extends BaseBean { + + @Column(name = "JIS_NO") + @ApiParam("主队列编号") + private String jisNo; + + @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; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.java new file mode 100644 index 0000000..11e0ba0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.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.MesJisPattern; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Repository +public interface MesJisPatternRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJisDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJisDetailRepository.java new file mode 100644 index 0000000..f2a3a28 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJisDetailRepository.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.MesQueueJisDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Repository +public interface MesQueueJisDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJisRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJisRepository.java new file mode 100644 index 0000000..30d8415 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJisRepository.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.MesQueueJis; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Repository +public interface MesQueueJisRepository 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 22f0c48..5fa2569 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 @@ -2098,5 +2098,31 @@ public class MesHqlPack { return packBean; } + /** + * JIS发运模式 + * @param jisPattern + * @param organizeCode + * @return + */ + public static DdlPackBean getJisPatternCondition(MesJisPattern jisPattern, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(jisPattern, organizeCode); + if (!StringUtils.isEmpty(jisPattern.getPatternNo())) { + DdlPreparedPack.getStringLikerPack(jisPattern.getPatternNo(), "patternNo", packBean); + } + if (!StringUtils.isEmpty(jisPattern.getTopNo())) { + DdlPreparedPack.getNumEqualPack(jisPattern.getTopNo(), "topNo", packBean); + } + if (!StringUtils.isEmpty(jisPattern.getHandleNo())) { + DdlPreparedPack.getNumEqualPack(jisPattern.getHandleNo(), "handleNo", packBean); + } + if (!StringUtils.isEmpty(jisPattern.getPatternType())) { + DdlPreparedPack.getNumEqualPack(jisPattern.getPatternType(), "patternType", packBean); + } + if (!StringUtils.isEmpty(jisPattern.getScanSeqType())) { + DdlPreparedPack.getNumEqualPack(jisPattern.getScanSeqType(), "scanSeqType", packBean); + } + return packBean; + } + } From 05efdbb5681650eb7abaeee15fe51833c0f4896e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 31 Dec 2019 11:33:57 +0800 Subject: [PATCH 061/139] =?UTF-8?q?=E3=80=90KT-1339=20=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8B=89=E5=8A=A8=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BD=8E=E4=BA=8E=E8=B5=B7=E8=AE=A2=E9=87=8F=E6=A6=82=E5=BF=B5?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index ed53137..44b26b2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2660,4 +2660,21 @@ public class WmsHqlPack { return result; } + /** + * 库区物料信息分页查询条件 + * + * @param wmsZonePart + * @return + */ + public static DdlPackBean packHqlWmsZonePart(WmsZonePart wmsZonePart) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsZonePart.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsZonePart.getZoneNo(), "zoneNo", result); + + getStringBuilderPack(wmsZonePart, result); + + return result; + } + } From b0b671aac01dc388d1c8fd6963263811b1cab88c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 31 Dec 2019 14:18:24 +0800 Subject: [PATCH 062/139] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=E9=80=82=E9=85=8D=E5=99=A8=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/model/softswitch/SuitClientModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index a798d8b..806c17b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import com.thoughtworks.xstream.annotations.XStreamOmitField; @@ -90,6 +91,7 @@ public class SuitClientModel { /** * 适配报文 */ + @JsonIgnore @XStreamCDATA private Object suitResultMessage; From 9a272f8b6a32378555ab96055cf358de66da91de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 31 Dec 2019 14:39:04 +0800 Subject: [PATCH 063/139] =?UTF-8?q?BUG#6755=EF=BC=9A=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=8D=95=E7=9B=91=E5=90=AC=E9=98=9F=E5=88=97=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=9A=E5=A6=82=E6=9E=9C=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=9A=84=E7=A7=BB=E5=8A=A8=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E7=B1=BB=E5=9E=8B=E9=85=8D=E7=BD=AE=E6=88=90?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=8E=A8=E9=80=81=E5=BC=82=E5=B8=B8=E9=82=AE?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=85=A8=E5=B1=80=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E2=80=9C=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E2=80=9D=E4=B9=9F=E6=9C=89=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=88=99?= =?UTF-8?q?=E9=9A=8F=E9=80=81=E5=BC=82=E5=B8=B8=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index c6caa7a..107503e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -41,11 +41,11 @@ public class WmsTransType extends BaseBean { private String transTypeName; @Column(name = "SEQ") - @ApiParam(value = "序号", example = "-1") + @ApiParam(value = "序号") private Integer seq; @Column(name = "AG_ID") - @ApiParam(value = "作业流程", example = "-1") + @ApiParam(value = "作业流程") @JsonSerialize(using = ToStringSerializer.class) private Long agId; @@ -66,10 +66,19 @@ public class WmsTransType extends BaseBean { @ApiParam(value = "PDA图标") private String pdaIcon; + @Column(name = "IS_SEND_ERROR_EMAIL", columnDefinition = "int default 2") + @ApiParam(value = "是否发送异常邮件") + private Integer isSendErrorEmail; + @Transient @ApiParam("菜单URL") private String menuUrl; + @Transient + @ApiParam("交易处理组件调用类") + private String callClass; + + public String getMenuUrl() { return "/handle?transTypeCode=" + this.transTypeCode; } From 2eb244c41cad4e52ad4277c1649a9fbb1da18d7e Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 31 Dec 2019 14:44:26 +0800 Subject: [PATCH 064/139] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E4=BE=A7=E8=BE=B9=E6=A0=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 20 +++++++++++++++----- .../java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 5 +++++ .../cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java | 10 +++++----- .../java/cn/estsh/i3plus/pojo/aps/holders/EWork.java | 1 + .../src/main/resources/relations/Work.xml | 2 ++ 5 files changed, 28 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 72bec5a..472b69c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -36,12 +36,12 @@ import java.util.List; public class Work extends BaseAPS { @Column(name="CODE") @ApiParam(value ="编码") - @FieldAnnotation(popSearch = true, mainkey = true) + @FieldAnnotation(popSearch = true, mainkey = true, modify = false) private String code; @Column(name="ORDER_ID") @ApiParam(value ="订单") - @FieldAnnotation(relation = "Order") + @FieldAnnotation(relation = "Order", modify = false) private Long orderId; @Column(name="WORK_TYPE") @@ -77,9 +77,10 @@ public class Work extends BaseAPS { @ApiParam(value ="指定数量") private Double specifyCount; - @Column(name="SPECIFY_RESOURCE") - @ApiParam(value ="指定资源") - private String specifyResource; + @Column(name="SPECIFY_RESOURCE_ID") + @ApiParam(value ="指定主资源") + @FieldAnnotation(relation = "SpecifyResource") + private Long specifyResourceId; @Column(name="SPECIFY_PRODUCE_TIME") @ApiParam(value ="指定制造时间") @@ -223,4 +224,13 @@ public class Work extends BaseAPS { @JsonBackReference public List getWorkPlans() { return BeanRelation.list(this, EWork.WorkPlans); } + + public Resource getSpecifyResource() { + return BeanRelation.get(this, EWork.SpecifyResource); + } + + public void setSpecifyResource(Resource resource) { + this.specifyResourceId = resource != null ? resource.getId() : 0; + BeanRelation.set(this, EWork.SpecifyResource, resource); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index d63e4a4..455ae2c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -113,6 +113,11 @@ public class WorkPlan extends BaseAPS { @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private Integer lockTime; + @Column(name="FORCE_POST_SET_ZERO") + @ApiParam(value ="是否将后设置时间强制设置成0") + @FieldAnnotation(property = false) + private Boolean forcePostSetZero; + @Column(name="WORK_RESOURCE_ID") @ApiParam(value ="工作资源对象id") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index 4a5e01f..1bfbecf 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -30,27 +30,27 @@ public class WorkRelation extends BaseAPS { @Column(name="MATERIAL_ID") @ApiParam(value ="物料") - @FieldAnnotation(relation = "Material") + @FieldAnnotation(relation = "Material", modify = false) private Long materialId; @Column(name="PREV_ORDER_ID") @ApiParam(value ="前订单") - @FieldAnnotation(relation = "PrevOrder") + @FieldAnnotation(relation = "PrevOrder", modify = false) private Long prevOrderId; @Column(name="POST_ORDER_ID") @ApiParam(value ="后订单") - @FieldAnnotation(relation = "PostOrder") + @FieldAnnotation(relation = "PostOrder", modify = false) private Long postOrderId; @Column(name="PREV_WORK_ID") @ApiParam(value ="前工作") - @FieldAnnotation(relation = "PrevWork") + @FieldAnnotation(relation = "PrevWork", modify = false) private Long prevWorkId; @Column(name="POST_WORK_ID") @ApiParam(value ="后工作") - @FieldAnnotation(relation = "PostWork") + @FieldAnnotation(relation = "PostWork", modify = false) private Long postWorkId; @Column(name="COUNT", columnDefinition = "decimal(18,8)") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java index 240fc04..c9befe8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java @@ -12,4 +12,5 @@ public enum EWork { PlanFeedbacks, // 工作计划反馈 MainPlan, // 关联的为主资源的计划 WorkPlans, // 关联的工作计划 + SpecifyResource, // 指定资源 } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index 7e7253e..5c26770 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -18,4 +18,6 @@ + + \ No newline at end of file From 9627b6cf9ec420766d6d3f70f6bdc0eee9eca076 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 31 Dec 2019 17:36:50 +0800 Subject: [PATCH 065/139] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E4=BE=A7=E8=BE=B9=E6=A0=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java new file mode 100644 index 0000000..88cd06c --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class GanttOrderModel { + private Long id; + private String code; + private String name; + private List children = new ArrayList<>(); +} From b29347c4097c5f8fb1cbeb769ecf556d7f29fcc1 Mon Sep 17 00:00:00 2001 From: gcj Date: Tue, 31 Dec 2019 17:46:53 +0800 Subject: [PATCH 066/139] =?UTF-8?q?=E3=80=90=E5=9D=A4=E6=B3=B0=E8=BF=90?= =?UTF-8?q?=E8=BE=93=E7=AE=A1=E7=90=86=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/dto/WmsTmsShipDto.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java index ca012e6..bdd8cc6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java @@ -64,4 +64,10 @@ public class WmsTmsShipDto extends BaseDto implements Serializable { @ApiParam("关联单号") private String refOrderNo; + + @ApiParam("开始时间") + private String createDateTimeStart; + + @ApiParam("结束时间") + private String createDateTimeEnd; } From 011b4d220589484233ecec70f0d386cb64b6a24b Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 1 Jan 2020 00:32:43 +0800 Subject: [PATCH 067/139] =?UTF-8?q?zh20200101=20=E7=8E=B0=E5=9C=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=20BI=20all?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java index 5bc5ca1..9226c3a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java @@ -80,7 +80,8 @@ public class MesQcCheckStandard extends BaseBean { public MesQcCheckStandard() { } - public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) { + public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) { + this.id = id; this.partNo = partNo; this.workCenterCode = workCenterCode; this.workCellCode = workCellCode; From a1276b5542e24a3fb00ec0c980adf85080ef3f23 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Thu, 2 Jan 2020 10:22:59 +0800 Subject: [PATCH 068/139] =?UTF-8?q?=E3=80=90#1338=20=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E7=89=A9=E6=96=99=E4=B8=AD=E9=9C=80=E8=A6=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index 81db268..a0ea3cb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -31,11 +31,11 @@ public class WmsLocatePart extends BaseBean { private static final long serialVersionUID = 9134745988014340144L; @Column(name = "LOCATE_NO") - @ApiParam(value = "库位代码") + @ApiParam(value = "库位编码") private String locateNo; @Column(name = "PART_NO") - @ApiParam(value = "物料编码") + @ApiParam(value = "物料代码") private String partNo; @Column(name = "PART_NAME_RDD") From 7594b3d515f0fd5724e7f40122ff1fd39d070d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 2 Jan 2020 12:08:03 +0800 Subject: [PATCH 069/139] =?UTF-8?q?SAP=E5=8F=96=E6=B6=88=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=EF=BC=9A=E6=8C=89=E8=A1=8C=E5=8F=96=E6=B6=88=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BB=8E=E8=BD=AF=E5=88=A0=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=92=8C=E6=9D=A1=E7=A0=81=E5=8F=98=E4=B8=BA=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86=E5=92=8C=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81=E4=B8=BA=E8=A1=8C=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 6 +++--- .../i3plus/pojo/model/wms/WmsSapDbParamModel.java | 24 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementSn.java | 2 +- 3 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSapDbParamModel.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 1e07422..f1d43e0 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 @@ -363,10 +363,10 @@ public class WmsEnumUtil { } /** - * PO条码状态 + * 单据条码状态（PO/DOC_MOVE） */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PO_SN_STATUS { + public enum ORDER_SN_STATUS { CREATE(10, "N", "创建"), RECEIPTED(20, "R", "已完成"), CANCEL(30, "C", "行取消"), @@ -376,7 +376,7 @@ public class WmsEnumUtil { private String code; private String description; - PO_SN_STATUS(int value, String code, String description) { + ORDER_SN_STATUS(int value, String code, String description) { this.value = value; this.code = code; this.description = description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSapDbParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSapDbParamModel.java new file mode 100644 index 0000000..1c4fdfe --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSapDbParamModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description SAP DB操作参数Model + * @Reference + * @Author dragon + * @CreateDate 2020/1/2 11:23 + * @Modify + */ +@Data +public class WmsSapDbParamModel implements Serializable { + private static final long serialVersionUID = 5784492509251527816L; + private String organizeCode;//工厂代码 + private String orderNo;//单号 + private String partNo;//物料号 + private String masterTableName;//单据主表名 + private String masterStatusName;//单据状态名 + private String detailsTableName;//单据明细表名 + private String snTableName;//单据条码表名 +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 22fe9f5..3e57d16 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -67,7 +67,7 @@ public class WmsDocMovementSn extends BaseBean { */ @Column(name="SN_STATUS") @ApiParam(value = "操作状态", example = "10") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer snStatus; @Column(name="SN") From 42a22d14d38a86b738836ad87c80b5ad9ad64bd4 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 2 Jan 2020 15:06:43 +0800 Subject: [PATCH 070/139] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=AD=97=3D=E5=AD=97=E6=AE=B5=E5=86=97=E4=BD=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/andon/bean/AndonCellAlarmCause.java | 9 ++ .../pojo/andon/bean/AndonCellEventCause.java | 8 ++ .../pojo/andon/bean/AndonCellEventMethod.java | 9 ++ .../i3plus/pojo/andon/bean/AndonManageQueue.java | 4 + .../cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java | 17 ++++ .../estsh/i3plus/pojo/mes/model/QueueJisModel.java | 100 +++++++++++++++++++++ 6 files changed, 147 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java index d79eb4b..9d9df79 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.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 : ANDON_工作单元呼叫原因配置 @@ -45,4 +46,12 @@ public class AndonCellAlarmCause extends BaseBean { @Column(name = "AC_CODE") @ApiParam(value = "事件描述") private String acCode; + + @Transient + @ApiParam(value = "安灯类型名称") + private String alarmCodeName; + + @Transient + @ApiParam(value = "呼叫原因描述") + private String acName; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java index 4f04613..1be0a94 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.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 : ANDON_工作单元事件原因配置 @@ -47,5 +48,12 @@ public class AndonCellEventCause extends BaseBean { @ApiParam(value = "事件原因") private String ecCode; + @Transient + @ApiParam(value = "安灯类型名称") + private String alarmCodeName; + + @Transient + @ApiParam(value = "事件原因描述") + private String ecName; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java index b2f933c..00dea5f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.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 : ANDON_工作单元处理方法配置 @@ -45,4 +46,12 @@ public class AndonCellEventMethod extends BaseBean { @Column(name = "EM_CODE") @ApiParam(value = "处理方法") private String emCode; + + @Transient + @ApiParam(value = "安灯类型名称") + private String alarmCodeName; + + @Transient + @ApiParam(value = "处理方法描述") + private String emName; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 5f6df39..f2be38c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -266,6 +266,10 @@ public class AndonManageQueue extends BaseManageQueue { @ApiParam(value ="生产累计件数") private Integer totalProdNum; + @Transient + @ApiParam(value ="安灯类型名称") + private String alarmCodeName; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java index 828a12a..e9bbc29 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : ANDON_PLC控制 @@ -82,6 +83,22 @@ public class AndonPLC extends BaseBean { @ApiParam(value = "是否安灯") private Integer isAlarmStatus; + @Transient + @ApiParam(value = "安灯类型名称") + private String alarmCodeName; + + @Transient + @ApiParam(value = "生产线名称") + private String workCenterName; + + @Transient + @ApiParam(value = "标签业务类型名称") + private String tagBusinessTypeName; + + @Transient + @ApiParam(value = "是否安灯名称") + private String isAlarmStatusName; + public int getIsAlarmStatusVal(){ if(isAlarmStatus == null){ return 0; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java new file mode 100644 index 0000000..ce42085 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java @@ -0,0 +1,100 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class MesEquTaskModel implements Serializable { + @ApiParam("id") + private Long id; + + @ApiParam("作业任务编号") + private String taskNo; + + @ApiParam("作业类型") + private Integer taskType; + + @ApiParam("作业状态") + private Integer taskStatus; + + @ApiParam(value="生产线") + private String workCenterCode; + + @ApiParam("计划日期") + private String planTime; + + @ApiParam("任务来源") + private Integer taskSource; + + @ApiParam("备注") + private String memo; + + @ApiParam("通知标识") + private Integer notifyFlag; + + @ApiParam("关联任务") + private String relateTask; + + @ApiParam("组织代码") + public String organizeCode; + + @ApiParam("有效性") + public Integer isValid; + + @ApiParam("是否已删除") + public Integer isDeleted; + + @ApiParam("创建用户") + public String createUser; + + @ApiParam("创建日期") + public String createDatetime; + + @ApiParam("修改人") + public String modifyUser; + + @ApiParam("修改日期") + public String modifyDatetime; + + @ApiParam("作业类型") + private String taskTypeName; + + @ApiParam("作业状态") + private String taskStatusName; + + @ApiParam("任务来源") + private String taskSourceName; + + @ApiParam("通知标识") + private String notifyFlagName; + + @ApiParam("mes设备作业任务页面按钮控制") + private MesButtonFlagModel mesButtonFlagModel; + + + public MesEquTaskModel() { + + } + + public MesEquTaskModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + this.id = id; + this.taskNo = taskNo; + this.taskType = taskType; + this.taskStatus = taskStatus; + this.workCenterCode = workCenterCode; + this.planTime = planTime; + this.taskSource = taskSource; + this.memo = memo; + this.notifyFlag = notifyFlag; + this.relateTask = relateTask; + this.organizeCode = organizeCode; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } +} From a3a5e63baa3629cfa27c85e8c79f3dbcb06e8071 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 2 Jan 2020 15:55:37 +0800 Subject: [PATCH 071/139] =?UTF-8?q?=E3=80=90=207194=20Po=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=EF=BC=8C=E5=8D=95=E6=8D=AE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=BA=E4=B8=AD=E6=96=87=20=E3=80=91bug7194?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 44b26b2..215fb1b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -351,7 +351,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result); DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result); - + DdlPreparedPack.getNumEqualPack(wmsPart.getIsValuable(), "isValuable",result); getStringBuilderPack(wmsPart, result); return result; @@ -2677,4 +2677,19 @@ public class WmsHqlPack { return result; } + /** + * 根据条件查询dataAuth + * + * @param wmsSnOperateRecord + * @return + */ + public static DdlPackBean packHqlWmsSnOperateRecord(WmsSnOperateRecord wmsSnOperateRecord) { + DdlPackBean result = new DdlPackBean(); + if (!Strings.isNullOrEmpty(wmsSnOperateRecord.getSn())) { + DdlPreparedPack.getStringEqualPack(wmsSnOperateRecord.getSn(), "sn", result); + } + getStringBuilderPack(wmsSnOperateRecord, result); + return result; + } + } From 0d2df2ec43500ed2357c9a72526de9d61554b735 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 2 Jan 2020 16:28:03 +0800 Subject: [PATCH 072/139] =?UTF-8?q?=E3=80=90=207194=20Po=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=EF=BC=8C=E5=8D=95=E6=8D=AE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=BA=E4=B8=AD=E6=96=87=20=E3=80=91bug7194?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.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/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 370667a..0f31d20 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 @@ -171,7 +171,7 @@ public class WmsPart extends BaseBean { private Double proportion; @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") - @ApiParam(value = "贵重物料") + @ApiParam(value = "是否贵重") @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description") private Integer isValuable; From 76c84631ab4245670e2cf8a5dd20eebb87195569 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 2 Jan 2020 16:51:05 +0800 Subject: [PATCH 073/139] revise class name --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java index ce42085..be4145b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java @@ -6,7 +6,7 @@ import lombok.Data; import java.io.Serializable; @Data -public class MesEquTaskModel implements Serializable { +public class QueueJisModel implements Serializable { @ApiParam("id") private Long id; @@ -74,11 +74,11 @@ public class MesEquTaskModel implements Serializable { private MesButtonFlagModel mesButtonFlagModel; - public MesEquTaskModel() { + public QueueJisModel() { } - public MesEquTaskModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + public QueueJisModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.id = id; this.taskNo = taskNo; this.taskType = taskType; From a57d90ce7d10bc90fc041752f9b330f0f811cbb4 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 2 Jan 2020 16:58:23 +0800 Subject: [PATCH 074/139] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/model/QueueJisModel.java | 100 --------------------- 1 file changed, 100 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java deleted file mode 100644 index ce42085..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java +++ /dev/null @@ -1,100 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; - -@Data -public class MesEquTaskModel implements Serializable { - @ApiParam("id") - private Long id; - - @ApiParam("作业任务编号") - private String taskNo; - - @ApiParam("作业类型") - private Integer taskType; - - @ApiParam("作业状态") - private Integer taskStatus; - - @ApiParam(value="生产线") - private String workCenterCode; - - @ApiParam("计划日期") - private String planTime; - - @ApiParam("任务来源") - private Integer taskSource; - - @ApiParam("备注") - private String memo; - - @ApiParam("通知标识") - private Integer notifyFlag; - - @ApiParam("关联任务") - private String relateTask; - - @ApiParam("组织代码") - public String organizeCode; - - @ApiParam("有效性") - public Integer isValid; - - @ApiParam("是否已删除") - public Integer isDeleted; - - @ApiParam("创建用户") - public String createUser; - - @ApiParam("创建日期") - public String createDatetime; - - @ApiParam("修改人") - public String modifyUser; - - @ApiParam("修改日期") - public String modifyDatetime; - - @ApiParam("作业类型") - private String taskTypeName; - - @ApiParam("作业状态") - private String taskStatusName; - - @ApiParam("任务来源") - private String taskSourceName; - - @ApiParam("通知标识") - private String notifyFlagName; - - @ApiParam("mes设备作业任务页面按钮控制") - private MesButtonFlagModel mesButtonFlagModel; - - - public MesEquTaskModel() { - - } - - public MesEquTaskModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { - this.id = id; - this.taskNo = taskNo; - this.taskType = taskType; - this.taskStatus = taskStatus; - this.workCenterCode = workCenterCode; - this.planTime = planTime; - this.taskSource = taskSource; - this.memo = memo; - this.notifyFlag = notifyFlag; - this.relateTask = relateTask; - this.organizeCode = organizeCode; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.createUser = createUser; - this.createDatetime = createDatetime; - this.modifyUser = modifyUser; - this.modifyDatetime = modifyDatetime; - } -} From 1f1f6ec8258ce7e7db243f99d2e927e6eafa7e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 2 Jan 2020 17:37:49 +0800 Subject: [PATCH 075/139] =?UTF-8?q?=E3=80=90KT-1346=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=8B=89=E5=8A=A8=E4=BB=BB=E5=8A=A1=E7=9A=84=E6=9A=82=E5=81=9C?= =?UTF-8?q?=E5=92=8C=E5=BC=80=E5=90=AF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java index 03a57f9..f7d6c15 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java @@ -58,9 +58,15 @@ public class WmsPullTaskMaster extends BaseBean{ @ApiParam(value = "单据状态", example = "0") private Integer orderStatus = 0; + @Column(name="IS_SUSPEND") + @ApiParam(value = "是否暂停", example = "0") + private Integer isSuspend = 2; + public Integer getOrderStatus() { return orderStatus == null ? 0 : this.orderStatus.intValue(); } - + public Integer getIsSuspend() { + return isSuspend == null ? 0 : this.isSuspend.intValue(); + } } \ No newline at end of file From 81bab751325bec27e31636322a2f0ceb13d2da8b Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 2 Jan 2020 17:41:22 +0800 Subject: [PATCH 076/139] =?UTF-8?q?=E3=80=90=E5=BA=93=E5=AD=98=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E7=9B=98=E7=82=B9=E9=9C=80=E8=A6=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=EF=BC=8C=E6=89=AB=E6=8F=8F=E6=96=B0=E7=9A=84=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E6=97=B6=E5=B0=B1=E5=AF=B9=E4=B8=8A=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE=E5=81=9A?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=88=E6=9B=B4=E6=96=B0=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=89=EF=BC=8C=E6=AF=8F=E4=B8=AA=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E7=9A=84=E6=89=AB=E6=8F=8F=E6=95=B0=E6=8D=AE=E8=BF=98?= =?UTF-8?q?=E6=98=AF=E5=AD=98=E5=9C=A8=E5=90=8C=E4=B8=80=E5=BC=A0=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E5=8D=95=E5=86=85=EF=BC=8C=E7=82=B9=E5=87=BB=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=97=B6=E8=AF=A5=E5=BC=A0=E7=9B=98=E7=82=B9=E5=8D=95?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E3=80=82=E5=8E=BB=E9=99=A4=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=B8=8A=E7=9A=84=E6=9C=AA=E7=9B=98=E7=A7=BB=E5=BA=93=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=9C=AA=E7=9B=98=E6=9D=A1=E7=A0=81=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E5=81=9A=E7=A7=BB=E5=BA=93=E3=80=82=E3=80=91=E3=80=90?= =?UTF-8?q?bug7148=09=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index c9618cd..3bd0c51 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -293,6 +293,15 @@ public class DdlPreparedPack { * @param columnName 列名 * @param packBean */ + public static void getStringNotBlanklPack(String columnName, DdlPackBean packBean) { + packBean.addColumnQuery(null, " and (model." + columnName + " is not null and model." + columnName + " !='')", null); + } + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ public static void getStringEqualPackOr(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { packBean.addColumnQuery(columnName, " or model." + columnName + " = :m_" + columnName, val); From 5a4510cedbe8c1b7e62d31be66ca16ee172a9d2d Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 2 Jan 2020 18:03:56 +0800 Subject: [PATCH 077/139] =?UTF-8?q?=E3=80=907168=20=E5=AF=B9=E4=BA=8E?= =?UTF-8?q?=E5=8F=91=E8=BF=90=E5=8D=95=E6=A0=87=E7=AD=BE=E8=A1=A5=E6=89=93?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=A0=B9=E6=8D=AE=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E4=B8=AD=E7=9A=84ship-to=E8=8E=B7=E5=8F=96=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=A8=A1=E6=9D=BF=E8=BF=9B=E8=A1=8C=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.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/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 1e07422..9937763 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 @@ -3485,7 +3485,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_STOCK_TYPE { - SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"); + SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"),CUST_SN(30, "客户条码"); private int value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 22fe9f5..3065d38 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -78,6 +78,11 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam(value = "供应商编码") public String vendorNo; + @Column(name = "SN_TYPE") + @ApiParam(value = "条码类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description") + private Integer snType; + @Transient @ApiParam("前端表格编辑使用") private Boolean isSet = false; @@ -113,4 +118,8 @@ public class WmsDocMovementSn extends BaseBean { @Transient @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer itemStatus; + + @Transient + @ApiParam("打印模板名称") + private String templateName; } From 4013ed776b53bcbb154e64bfea23bc75689382fb Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 2 Jan 2020 22:08:07 +0800 Subject: [PATCH 078/139] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=82=89=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=8E=92=E7=A8=8B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 1 - .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index 156db58..7c2d0ac 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -62,7 +62,6 @@ public class BaseOrder extends BaseAPS { @Column(name="LET") @ApiParam(value ="最晚结束时刻") - @FieldAnnotation(notEmpty = true) private Date let; @Column(name="CALC_EST") diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index fb63168..f7f6ab7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -863,8 +863,8 @@ public class ApsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CALENDAR_TYPE { - ENABLE("ENABLE", "启用"), - DISABLE("DISABLE", "停用"); + ENABLE("ENABLE", "加班"), + DISABLE("DISABLE", "下班"); private String value; private String description; From b0bbd132c6d0050df105a3dd3b78f724dab1c995 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 3 Jan 2020 09:59:12 +0800 Subject: [PATCH 079/139] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E6=8B=96=E6=8B=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java index 385ee44..b0d518e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java @@ -6,5 +6,6 @@ import lombok.Data; public class GanttDragModel { private Long workId; private Long resId; + private Long targetResId; private Long targetWorkId; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java index dcbc039..4ebf16b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java @@ -19,9 +19,9 @@ public class GanttPlanModel { @JsonDeserialize(using = CustomDateDeserializer.class) private Date endDate; private String cls; - //private String timeRangeColor; private String eventColor; private String name; private Long workId; private List resIds; + private Boolean canDrag; } From 74be235a26650ffcd8ed8271e4a80be4e82cb46b Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 3 Jan 2020 10:05:10 +0800 Subject: [PATCH 080/139] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E6=8B=96=E6=8B=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java index 4ebf16b..4254fba 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java @@ -23,5 +23,5 @@ public class GanttPlanModel { private String name; private Long workId; private List resIds; - private Boolean canDrag; + private Boolean draggable; } From af6083ddff826e8e3f3ffd9c3154f16915f1c319 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 3 Jan 2020 14:17:24 +0800 Subject: [PATCH 081/139] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 9 +++++ .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 43 ++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index bc924e2..873e21d 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 @@ -1259,6 +1259,15 @@ public class CommonEnumUtil { return tmp; } + public static LOG_DETAIL_SHOW_TYPE valueOfEnum(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + public static int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 13b076e..f8581ff 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1190,4 +1190,47 @@ public class ImppEnumUtil { return tmp; } } + + /** + * 日志存储 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOG_STORAGE { + MONGO(1, "MongoDB"), + ELASTICSEARCH(2, "Elasticsearch"); + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private LOG_STORAGE(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; + } + + public static LOG_STORAGE valueOfEnum(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } } From d8d47541df15504923a472000ac537b8a900ec75 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 3 Jan 2020 14:18:00 +0800 Subject: [PATCH 082/139] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java index fa78d8b..20d9181 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java @@ -77,6 +77,14 @@ public class BrPojoFilterAttr extends BaseBean { @ApiParam(value ="属性显示名称") private String attrName; + @Column(name = "VIEW_ATTR_CONTROL_TYPE") + @ApiParam(value = "控件类型") + private Integer viewAttrControlType; + + @Column(name = "VIEW_ATTR_CONTROL_REF_KEY") + @ApiParam(value = "控件引用RefKey") + private String viewAttrControlRefKey; + @Column(name="ATTR_SHOW") @ApiParam(value ="属性是否显示") private Integer attrShow; From 989e05c64c8e89b53aeefa70c3a0a3098e389cce Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 3 Jan 2020 15:02:54 +0800 Subject: [PATCH 083/139] =?UTF-8?q?=E3=80=907168=20=E5=AF=B9=E4=BA=8E?= =?UTF-8?q?=E5=8F=91=E8=BF=90=E5=8D=95=E6=A0=87=E7=AD=BE=E8=A1=A5=E6=89=93?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=A0=B9=E6=8D=AE=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E4=B8=AD=E7=9A=84ship-to=E8=8E=B7=E5=8F=96=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=A8=A1=E6=9D=BF=E8=BF=9B=E8=A1=8C=E6=89=93=E5=8D=B0?= =?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/WmsDocMovementSn.java | 4 ---- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index f3c25d0..d812406 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -118,8 +118,4 @@ public class WmsDocMovementSn extends BaseBean { @Transient @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer itemStatus; - - @Transient - @ApiParam("打印模板名称") - private String templateName; } 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 422cf79..0e5b1f3 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 @@ -282,6 +282,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "是否最早批次") public String isFifo; + @Transient + @ApiParam("打印模板名称") + private String templateName; + public WmsStockSn() { } From fe809e2effe6bc536d1ee6d1cd4d6b9e8fe7d4ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 3 Jan 2020 17:51:55 +0800 Subject: [PATCH 084/139] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=A4=84=E7=90=86?= =?UTF-8?q?=E9=81=97=E6=BC=8F=E7=9A=84=E5=BE=85=E5=A4=84=E7=90=86=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E5=8D=95JOB=EF=BC=9A=E5=A4=84=E7=90=86=E5=91=A8?= =?UTF-8?q?=E6=9C=9F=E6=94=B9=E4=B8=BA=E5=8F=AF=E9=85=8D=E7=BD=AE=E7=9A=84?= =?UTF-8?q?JOB=E5=8F=82=E6=95=B0+=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=EF=BC=9A=E5=9C=A8=E6=94=BE=E5=85=A5=E2=80=9CIS=5FCOMMIT=5FREF?= =?UTF-8?q?=5FMOVE=E2=80=9D=E7=BC=93=E5=AD=98=E6=97=B6=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BA+?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E7=B1=BB=E5=9E=8B=E6=B7=BB=E5=8A=A0=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E2=80=9C=E6=98=AF=E5=90=A6=E6=8E=A8=E9=80=81=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E9=82=AE=E4=BB=B6=E2=80=9D=E7=94=A8=E4=BA=8E=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E5=A4=84=E7=90=86=E7=A7=BB=E5=8A=A8=E5=8D=95?= =?UTF-8?q?=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 3 +++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java index b84e932..6bfdd58 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java @@ -19,4 +19,9 @@ public class WmsJobParamModel implements Serializable { private List zonesNoList;//存储区编号 private Integer snType;//条码类型（虚拟，实物） private String devOpsEmail;//运维人员邮箱 + private Integer minuteDiff;//处理周期(分钟) + + public int getMinuteDiffVal() { + return this.minuteDiff == null ? 0 : this.minuteDiff.intValue(); + } } 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 9d502de..36ce2dc 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 @@ -96,6 +96,9 @@ public class WmsActionGroup extends BaseBean { return this.endAmId == null ? 0 : this.endAmId.longValue(); } + public int getIsCommitRefMoveVal() { + return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue(); + } public int getAutoInitVal() { return this.autoInit == null ? 0 : this.autoInit.intValue(); } From 3fe50125ae70033f502d3a088282953e0a658b65 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 6 Jan 2020 09:36:29 +0800 Subject: [PATCH 085/139] JIS --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 10 +- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 106 +++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesJisPattern.java | 64 +++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesQueueJis.java | 64 +++++++++++++ .../pojo/mes/pcn/bean/MesQueueJisDetail.java | 56 +++++++++++ .../i3plus/pojo/mes/pcn/model/QueueJisModel.java | 60 ++++++++++++ .../pcn/repository/MesJisPatternRepository.java | 16 ++++ .../repository/MesQueueJisDetailRepository.java | 16 ++++ .../mes/pcn/repository/MesQueueJisRepository.java | 16 ++++ .../estsh/i3plus/pojo/mes/bean/MesJisPattern.java | 6 +- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java | 8 ++ .../estsh/i3plus/pojo/mes/model/QueueJisModel.java | 100 ------------------- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 - 13 files changed, 414 insertions(+), 111 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesJisPattern.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesJisPatternRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.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 0bb09ea..0f44cb0 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 @@ -48,17 +48,17 @@ public class MesEnumUtil { } /** - * JIS发运产品组扫描顺序类型 + * JIS发运是否按主队列顺序扫描 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_JIS_SCAN_SEQ_TYPE { - ONE_PROD(10, "整发"), - MANY_PROD(20, "单发"); + public enum MES_JIS_SCAN_TYPE { + TRUE(10, "是"), + FALSE(20, "否"); private int value; private String description; - MES_JIS_SCAN_SEQ_TYPE(int value, String description) { + MES_JIS_SCAN_TYPE(int value, String description) { this.value = value; this.description = description; } 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 d6154b5..5a93fce 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -13,6 +13,112 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * JIS发运模式类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_JIS_PATTERN_TYPE { + ONE_PROD(10, "单产品发运"), + MANY_PROD(20, "多产品发运"); + + private int value; + private String description; + + MES_JIS_PATTERN_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; + } + } + + /** + * JIS发运是否按主队列顺序扫描 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_JIS_SCAN_TYPE { + TRUE(10, "是"), + FALSE(20, "否"); + + private int value; + private String description; + + MES_JIS_SCAN_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; + } + } + + /** + * JIS发运队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QUEUE_JIS_STATUS { + + TRUE(10, "已发运"), + FALSE(20, "未发运"); + + private int value; + private String description; + + MES_QUEUE_JIS_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; + } + } + + /** * MesMethod实体对应的methodType值 * 10. */ diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesJisPattern.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesJisPattern.java new file mode 100644 index 0000000..4b02d0a --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesJisPattern.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 :JIS发运模式 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_JIS_PATTERN") +@Api("JIS发运模式") +public class MesJisPattern extends BaseBean { + + @Column(name = "PATTERN_NO") + @ApiParam("模式编号") + private String patternNo; + + @Column(name = "PATTERN_NAME") + @ApiParam("模式名称") + private String patternName; + + @Column(name = "RULE") + @ApiParam("规则") + private String rule; + + @Column(name = "DESC") + @ApiParam("描述") + private String desc; + + @Column(name = "TOP_NO") + @ApiParam("一次显示TOP数") + private Integer topNo; + + @Column(name = "HANDLE_NO") + @ApiParam("一次处理套数") + private Integer handleNo; + + @Column(name = "PATTERN_TYPE") + @ApiParam("模式类型") + private Integer patternType; + + @Column(name = "SCAN_TYPE") + @ApiParam("是否按主队列顺序扫描") + private Integer scanType; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java new file mode 100644 index 0000000..b833dfc --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 :JIS发运队列 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIS") +@Api("JIS发运队列") +public class MesQueueJis extends BaseBean { + + @Column(name = "JIS_NO") + @ApiParam("主队列编号") + private String jisNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CAR_NO") + @ApiParam("车号") + private String carNo; + + @Column(name = "SEQ") + @ApiParam("排序") + private Double seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java new file mode 100644 index 0000000..e8243ed --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 :JIS发运队列明细 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIS_DETAIL") +@Api("JIS发运队列明细") +public class MesQueueJisDetail extends BaseBean { + + @Column(name = "JIS_NO") + @ApiParam("主队列编号") + private String jisNo; + + @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; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java new file mode 100644 index 0000000..1cd6a17 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class QueueJisModel implements Serializable { + + @ApiParam("主队列编号") + private String jisNo; + + @ApiParam("vin") + private String vinCode; + + @ApiParam("车号") + private String carNo; + + @ApiParam("排序") + private Double seq; + + @ApiParam("状态") + private Integer status; + + @ApiParam("产品配置代码") + private String prodCfgCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @ApiParam("明细状态") + private Integer detailStatus; + + @ApiParam("产品条码") + private String serialNumber; + + public QueueJisModel() { + } + + public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber) { + this.jisNo = jisNo; + this.vinCode = vinCode; + this.carNo = carNo; + this.seq = seq; + this.status = status; + this.prodCfgCode = prodCfgCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.produceCategoryCode = produceCategoryCode; + this.detailStatus = detailStatus; + this.serialNumber = serialNumber; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesJisPatternRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesJisPatternRepository.java new file mode 100644 index 0000000..8c06cef --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesJisPatternRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesJisPattern; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Repository +public interface MesJisPatternRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java new file mode 100644 index 0000000..bd19fef --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueJisDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Repository +public interface MesQueueJisDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java new file mode 100644 index 0000000..8a08948 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueJis; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Repository +public interface MesQueueJisRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java index f3c9f89..ad8bc0b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java @@ -57,8 +57,8 @@ public class MesJisPattern extends BaseBean { @ApiParam("模式类型") private Integer patternType; - @Column(name = "SCAN_SEQ_TYPE") - @ApiParam("产品组扫描顺序类型") - private Integer scanSeqType; + @Column(name = "SCAN_TYPE") + @ApiParam("是否按主队列顺序扫描") + private Integer scanType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java index 6f65fce..87f6946 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java @@ -53,4 +53,12 @@ public class MesQueueJis extends BaseBean { @ApiParam("状态") private Integer status; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java deleted file mode 100644 index be4145b..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java +++ /dev/null @@ -1,100 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; - -@Data -public class QueueJisModel implements Serializable { - @ApiParam("id") - private Long id; - - @ApiParam("作业任务编号") - private String taskNo; - - @ApiParam("作业类型") - private Integer taskType; - - @ApiParam("作业状态") - private Integer taskStatus; - - @ApiParam(value="生产线") - private String workCenterCode; - - @ApiParam("计划日期") - private String planTime; - - @ApiParam("任务来源") - private Integer taskSource; - - @ApiParam("备注") - private String memo; - - @ApiParam("通知标识") - private Integer notifyFlag; - - @ApiParam("关联任务") - private String relateTask; - - @ApiParam("组织代码") - public String organizeCode; - - @ApiParam("有效性") - public Integer isValid; - - @ApiParam("是否已删除") - public Integer isDeleted; - - @ApiParam("创建用户") - public String createUser; - - @ApiParam("创建日期") - public String createDatetime; - - @ApiParam("修改人") - public String modifyUser; - - @ApiParam("修改日期") - public String modifyDatetime; - - @ApiParam("作业类型") - private String taskTypeName; - - @ApiParam("作业状态") - private String taskStatusName; - - @ApiParam("任务来源") - private String taskSourceName; - - @ApiParam("通知标识") - private String notifyFlagName; - - @ApiParam("mes设备作业任务页面按钮控制") - private MesButtonFlagModel mesButtonFlagModel; - - - public QueueJisModel() { - - } - - public QueueJisModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { - this.id = id; - this.taskNo = taskNo; - this.taskType = taskType; - this.taskStatus = taskStatus; - this.workCenterCode = workCenterCode; - this.planTime = planTime; - this.taskSource = taskSource; - this.memo = memo; - this.notifyFlag = notifyFlag; - this.relateTask = relateTask; - this.organizeCode = organizeCode; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.createUser = createUser; - this.createDatetime = createDatetime; - this.modifyUser = modifyUser; - this.modifyDatetime = modifyDatetime; - } -} 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 19d4f8c..e0d2e6e 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 @@ -2118,9 +2118,6 @@ public class MesHqlPack { if (!StringUtils.isEmpty(jisPattern.getPatternType())) { DdlPreparedPack.getNumEqualPack(jisPattern.getPatternType(), "patternType", packBean); } - if (!StringUtils.isEmpty(jisPattern.getScanSeqType())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getScanSeqType(), "scanSeqType", packBean); - } return packBean; } From bcec1d7e6222e58e4edde1c438c14d9e1ce8e278 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 6 Jan 2020 13:19:17 +0800 Subject: [PATCH 086/139] JIS --- .../{MesJisPattern.java => MesPatternJis.java} | 8 ++++---- ...epository.java => MesPatternJisRepository.java} | 4 ++-- .../{MesJisPattern.java => MesPatternJis.java} | 8 ++++---- ...epository.java => MesPatternJisRepository.java} | 4 ++-- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 22 +++++++++++----------- 5 files changed, 23 insertions(+), 23 deletions(-) rename modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/{MesJisPattern.java => MesPatternJis.java} (90%) rename modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/{MesJisPatternRepository.java => MesPatternJisRepository.java} (65%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/{MesJisPattern.java => MesPatternJis.java} (90%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/{MesJisPatternRepository.java => MesPatternJisRepository.java} (66%) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesJisPattern.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java similarity index 90% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesJisPattern.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java index 4b02d0a..09b331d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesJisPattern.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java @@ -25,9 +25,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_JIS_PATTERN") +@Table(name = "MES_PATTERN_JIS") @Api("JIS发运模式") -public class MesJisPattern extends BaseBean { +public class MesPatternJis extends BaseBean { @Column(name = "PATTERN_NO") @ApiParam("模式编号") @@ -41,9 +41,9 @@ public class MesJisPattern extends BaseBean { @ApiParam("规则") private String rule; - @Column(name = "DESC") + @Column(name = "PATTERN_DESC") @ApiParam("描述") - private String desc; + private String patternDesc; @Column(name = "TOP_NO") @ApiParam("一次显示TOP数") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesJisPatternRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java similarity index 65% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesJisPatternRepository.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java index 8c06cef..87029c6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesJisPatternRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesJisPattern; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPatternJis; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesJisPatternRepository extends BaseRepository { +public interface MesPatternJisRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java similarity index 90% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java index ad8bc0b..34911dd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java @@ -25,9 +25,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_JIS_PATTERN") +@Table(name = "MES_PATTERN_JIS") @Api("JIS发运模式") -public class MesJisPattern extends BaseBean { +public class MesPatternJis extends BaseBean { @Column(name = "PATTERN_NO") @ApiParam("模式编号") @@ -41,9 +41,9 @@ public class MesJisPattern extends BaseBean { @ApiParam("规则") private String rule; - @Column(name = "DESC") + @Column(name = "PATTERN_DESC") @ApiParam("描述") - private String desc; + private String patternDesc; @Column(name = "TOP_NO") @ApiParam("一次显示TOP数") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPatternJisRepository.java similarity index 66% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPatternJisRepository.java index 11e0ba0..59da062 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPatternJisRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesJisPattern; +import cn.estsh.i3plus.pojo.mes.bean.MesPatternJis; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesJisPatternRepository extends BaseRepository { +public interface MesPatternJisRepository 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 e0d2e6e..d2241c4 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 @@ -2100,23 +2100,23 @@ public class MesHqlPack { /** * JIS发运模式 - * @param jisPattern + * @param patternJis * @param organizeCode * @return */ - public static DdlPackBean getJisPatternCondition(MesJisPattern jisPattern, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(jisPattern, organizeCode); - if (!StringUtils.isEmpty(jisPattern.getPatternNo())) { - DdlPreparedPack.getStringLikerPack(jisPattern.getPatternNo(), "patternNo", packBean); + public static DdlPackBean getPatternJisCondition(MesPatternJis patternJis, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(patternJis, organizeCode); + if (!StringUtils.isEmpty(patternJis.getPatternNo())) { + DdlPreparedPack.getStringLikerPack(patternJis.getPatternNo(), "patternNo", packBean); } - if (!StringUtils.isEmpty(jisPattern.getTopNo())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getTopNo(), "topNo", packBean); + if (!StringUtils.isEmpty(patternJis.getTopNo())) { + DdlPreparedPack.getNumEqualPack(patternJis.getTopNo(), "topNo", packBean); } - if (!StringUtils.isEmpty(jisPattern.getHandleNo())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getHandleNo(), "handleNo", packBean); + if (!StringUtils.isEmpty(patternJis.getHandleNo())) { + DdlPreparedPack.getNumEqualPack(patternJis.getHandleNo(), "handleNo", packBean); } - if (!StringUtils.isEmpty(jisPattern.getPatternType())) { - DdlPreparedPack.getNumEqualPack(jisPattern.getPatternType(), "patternType", packBean); + if (!StringUtils.isEmpty(patternJis.getPatternType())) { + DdlPreparedPack.getNumEqualPack(patternJis.getPatternType(), "patternType", packBean); } return packBean; } From fea1811191306ad73b1363a01c5f88e03661520c Mon Sep 17 00:00:00 2001 From: jokelone Date: Mon, 6 Jan 2020 16:59:34 +0800 Subject: [PATCH 087/139] =?UTF-8?q?=E3=80=90bug=EF=BC=9A7153=20JIT?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java index b7f831b..a3f4547 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java @@ -17,6 +17,7 @@ import java.io.Serializable; @Data @Api("JIT队列列表Model") public class QueueOrderModel implements Serializable { + private Long id; @ApiParam("队列序号") public Double queueSeq; @ApiParam("队列明细序号") @@ -52,8 +53,9 @@ public class QueueOrderModel implements Serializable { public QueueOrderModel() { } - public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { + this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; this.custFlagNo = custFlagNo; 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 19d4f8c..1fe9483 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 @@ -1483,7 +1483,7 @@ public class MesHqlPack { public static DdlPackBean getMesTypeCfg(MesTypeCfg mesTypeCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesTypeCfg, organizeCode); if (!StringUtils.isEmpty(mesTypeCfg.getTypeCode())) { - DdlPreparedPack.getStringLikerPack(mesTypeCfg.getTypeCode(), "typeCode", packBean); + DdlPreparedPack.getStringEqualPack(mesTypeCfg.getTypeCode(), "typeCode", packBean); } if (!StringUtils.isEmpty(mesTypeCfg.getBusinessTypeCode())) { DdlPreparedPack.getStringLikerPack(mesTypeCfg.getBusinessTypeCode(), "businessTypeCode", packBean); From a9f2cf25015ddc58032e1a01240e0e54b4524cea Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 6 Jan 2020 19:12:44 +0800 Subject: [PATCH 088/139] =?UTF-8?q?task=201309=20=E5=A4=A7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java | 10 ++++++---- .../annotation/{UseMongoDb.java => ElasticSearch.java} | 2 +- .../cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java | 15 +++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesProductData.java | 17 ++++++++++------- 4 files changed, 32 insertions(+), 12 deletions(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/{UseMongoDb.java => ElasticSearch.java} (87%) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java index 532ec2a..5bd3895 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java @@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description :生产数据 @@ -102,4 +99,9 @@ public class MesProductData extends BaseBean { @ApiParam("数据组号") private String groupNo; + @Lob + @Column(name = "TEST_DATA") + @ApiParam("测试json数据") + private String testData; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/ElasticSearch.java similarity index 87% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/ElasticSearch.java index e4d90a6..93e0ba9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/ElasticSearch.java @@ -11,5 +11,5 @@ import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) @Documented -public @interface UseMongoDb { +public @interface ElasticSearch { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java new file mode 100644 index 0000000..3921f97 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.annotation; + + +import java.lang.annotation.*; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/25 1:45 下午 + * @Description: + **/ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +@Documented +public @interface Json4Es { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index 602bb21..fc86e50 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -2,7 +2,8 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.mes.annotation.UseMongoDb; +import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch; +import cn.estsh.i3plus.pojo.mes.annotation.Json4Es; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -10,11 +11,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description :生产数据 @@ -34,7 +31,7 @@ import javax.persistence.Transient; @Index(columnList = "OBJECT_CODE"), @Index(columnList = "MODIFY_DATE_TIME") }) -//@UseMongoDb +@ElasticSearch @Api("生产数据") public class MesProductData extends BaseBean { @Column(name = "WORK_CENTER_CODE") @@ -109,6 +106,12 @@ public class MesProductData extends BaseBean { @ApiParam("数据组号") private String groupNo; + @Json4Es + @Column(name = "TEST_DATA") + @ApiParam("测试json数据") + private String testData; + + @Lob @Transient @ApiParam("字段总数") private Integer fieldNum; From 8584946ce5bb67150ed64ddd088f46c74cfb2a4a Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 6 Jan 2020 21:51:29 +0800 Subject: [PATCH 089/139] =?UTF-8?q?=E3=80=90=20=20=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=8A=A5=E8=A1=A8=EF=BC=8C=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=97=B6=E4=B8=8B=E5=88=97=E4=B8=89=E4=B8=AA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=B8=BA=E4=B8=AD=E6=96=87=20=E3=80=91bug7196?= 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 f2ef95b..a05fe1b 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 @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -66,7 +67,7 @@ public abstract class BaseBean implements Serializable { @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) @ApiParam(value = "有效性",example = "1") - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) From bf624942363519243b0a68a2aff80c1ecbbede67 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 7 Jan 2020 09:22:04 +0800 Subject: [PATCH 090/139] JIS --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 1 + .../i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java | 51 ++++++++++++++++++++++ .../pojo/mes/pcn/bean/MesProduceCategory.java | 38 ++++++++++++++++ .../pcn/repository/MesProdCfgDetailRepository.java | 16 +++++++ .../repository/MesProduceCategoryRepository.java | 16 +++++++ .../estsh/i3plus/pojo/mes/bean/MesPatternJis.java | 2 + 6 files changed, 124 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.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 0f44cb0..86a66f5 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 @@ -2620,6 +2620,7 @@ public class MesEnumUtil { PUBLIC(10, "公用"), JIT(20, "JIT生产"), WORK_ORDER(30, "工单生产"), + JIS(40, "JIS发运"), OTHER(99, "其他"); private int value; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java new file mode 100644 index 0000000..cbb3f3d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 javax.persistence.Transient; + +/** + * @Description :产品配置明细 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_CFG_DETAIL") +@Api("产品配置明细") +public class MesProdCfgDetail extends BaseBean { + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "IS_VIRTUAL") + @ApiParam("是否虚零件") + private Integer isVirtual; + + @Transient + @ApiParam("零件名称") + private String partName; + + public int getIsVirtualVal() { + return this.isVirtual == null ? 0 : this.isVirtual; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java new file mode 100644 index 0000000..131674e --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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: Crish + * @CreateDate:2019-04-26-10:25 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_CATEGORY") +@Api("系统业务动作") +public class MesProduceCategory extends BaseBean { + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @Column(name = "PRODUCE_CTGY_NAME") + @ApiParam("产品类型名称") + private String produceCategoryName; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java new file mode 100644 index 0000000..c93700b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdCfgDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdCfgDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java new file mode 100644 index 0000000..50602d5 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceCategory; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-26-10:28 + * @Modify: + **/ +@Repository +public interface MesProduceCategoryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java index 34911dd..b7a7b64 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -37,6 +38,7 @@ public class MesPatternJis extends BaseBean { @ApiParam("模式名称") private String patternName; + @Lob @Column(name = "RULE") @ApiParam("规则") private String rule; From 7d63a933c02da36dd1db30e61af2a328e595c971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 7 Jan 2020 10:37:15 +0800 Subject: [PATCH 091/139] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5JOB?= =?UTF-8?q?=E5=87=BA=E9=94=99=E6=B2=A1=E6=9C=89=E6=9B=B4=E6=96=B0=E7=8A=B6?= =?UTF-8?q?=E6=80=81+=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E7=BB=84=E4=BB=B6=E6=B2=A1=E6=9C=89=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E5=8A=A0=E8=BD=BD=E7=BB=84=E4=BB=B6+=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=AE=A1=E5=AE=B6=EF=BC=9A=E5=8A=A0=E4=B8=8A=E5=8F=AF?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=98=AF=E5=90=A6=E6=8F=90=E4=BA=A4=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 36ce2dc..9a726ee 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 @@ -75,6 +75,12 @@ public class WmsActionGroup extends BaseBean { @AnnoOutputColumn private Integer isCommitRefMove; + // 1=true, 2 = false + @Column(name = "IS_AUTO_COMMIT", nullable = false) + @ApiParam(value = "是否自动提交", example = "1") + @AnnoOutputColumn + private Integer isAutoCommit; + @Lob @Column(name = "POSITION") @ApiParam(value = "GOJS位置") @@ -99,6 +105,11 @@ public class WmsActionGroup extends BaseBean { public int getIsCommitRefMoveVal() { return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue(); } + + public int getIsAutoCommitVal() { + return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue(); + } + public int getAutoInitVal() { return this.autoInit == null ? 0 : this.autoInit.intValue(); } From b939ce66253140c7becc3b6af73e503c6f54f426 Mon Sep 17 00:00:00 2001 From: e-jiawentao1 Date: Tue, 7 Jan 2020 11:10:36 +0800 Subject: [PATCH 092/139] =?UTF-8?q?2020-01-07=E5=88=9B=E5=BB=BA=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java | 51 +++++++++++++++ .../pojo/wms/bean/dynamic/WmsListElement.java | 75 ++++++++++++++++++++++ .../wms/bean/dynamic/WmsListElementFunction.java | 47 ++++++++++++++ .../pojo/wms/bean/dynamic/WmsSearchElement.java | 51 +++++++++++++++ .../wms/bean/dynamic/WmsSearchElementFunction.java | 55 ++++++++++++++++ 5 files changed, 279 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java new file mode 100644 index 0000000..718dd49 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.wms.bean.dynamic; + +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 : WMS字段信息表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 09:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_FIELDINFO") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="WMS字段信息表",description = "WMS字段信息表") +public class WmsFieldInfo extends BaseBean { + + private static final long serialVersionUID = 3903166651913139064L; + @Column(name = "FIELD_NAME") + @ApiParam(value = "字段名称") + private String fieldName; + + @Column(name = "FIELD_DESC") + @ApiParam(value = "字段描述") + private String fieldDesc; + + @Column(name = "FIELD_TYPE") + @ApiParam(value = "字段类型") + private String fieldType; + + @Column(name = "ENTITY_NAME") + @ApiParam(value = "实体名称") + private String entityName; + + @Column(name = "ENTITY_DESC") + @ApiParam(value = "实体描述") + private String entityDesc; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java new file mode 100644 index 0000000..bd3d125 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.wms.bean.dynamic; + +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 : WMS列表元素表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 09:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_LISTELEMENT") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="WMS列表元素表",description = "WMS列表元素表") +public class WmsListElement extends BaseBean { + + private static final long serialVersionUID = 3903166651913139060L; + @Column(name = "FIELD_NAME") + @ApiParam(value = "字段名称") + private String fieldName; + + @Column(name = "TITLE_NAME") + @ApiParam(value = "标题名称") + private String titleName; + + @Column(name = "SEQ") + @ApiParam(value = "序列号:字段标题排序使用默认0（不排序）") + private Integer seq; + + @Column(name = "IS_REQUIRE") + @ApiParam(value = "是否必选:默认1-必选，2-非必选") + private Integer isRequire; + + @Column(name = "WIDTH", columnDefinition = "decimal(2,5)") + @ApiParam(value = "宽度", example = "0") + private Double width; + + public Double getWidth() { + return this.width == null ? 0 : this.width.doubleValue(); + } + + @Column(name = "SORT") + @ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序") + private Integer sort; + + @Column(name = "IS_WIDER") + @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗") + private Integer isWider; + + @Column(name = "IS_SELECT") + @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选") + private Integer isSelect; + + @Column(name = "ISSHOW") + @ApiParam(value = "是否表单字段展示:默认1-显示，2-隐藏") + private Integer isShow; + + @Column(name = "DEFAULT_VALUE") + @ApiParam(value = "表单字段默认值") + private String defaultValue; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java new file mode 100644 index 0000000..18ff672 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.wms.bean.dynamic; + +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 : WMS列表元素菜单关系表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 09:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_LISTELEMENT_FUNCTION") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="WMS列表元素菜单关系表",description = "WMS列表元素菜单关系表") +public class WmsListElementFunction extends BaseBean { + + private static final long serialVersionUID = 3903166651913139061L; + @Column(name = "FUNCTION_ID") + @ApiParam(value = "功能菜单ID") + private Long functionId; + + @Column(name = "ELEMENT_ID") + @ApiParam(value = "元素ID") + private Long elementId; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号") + private String userCode; + + @Column(name = "IS_DEFAULT") + @ApiParam(value = "是否默认配置") + private Integer isDefault; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java new file mode 100644 index 0000000..cdae331 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.wms.bean.dynamic; + +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 : WMS搜索元素表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 09:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_SEARCHELEMENT") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="WMS搜索元素表",description = "WMS搜索元素表") +public class WmsSearchElement extends BaseBean { + + private static final long serialVersionUID = 3903166651913139062L; + @Column(name = "FIELD_NAME") + @ApiParam(value = "字段名称") + private String fieldName; + + @Column(name = "TITLE_NAME") + @ApiParam(value = "标题名称") + private String titleName; + + @Column(name = "CONDITION_EXPRE") + @ApiParam(value = "条件表达式:>,<,>=等") + private String conditionExpre; + + @Column(name = "VALUE") + @ApiParam(value = "检索值") + private String value; + + @Column(name = "CONDITION_CONNECTOR") + @ApiParam(value = "条件连接符:and/or") + private String conditionConnector; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java new file mode 100644 index 0000000..4e0a3fd --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.wms.bean.dynamic; + +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 : WMS搜索元素菜单关系表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 09:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_SEARCHELEMENT_FUNCTION") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="WMS搜索元素菜单关系表",description = "WMS搜索元素菜单关系表") +public class WmsSearchElementFunction extends BaseBean { + + private static final long serialVersionUID = 3903166651913139063L; + @Column(name = "FUNCTION_ID") + @ApiParam(value = "功能菜单ID") + private Long functionId; + + @Column(name = "GROUP_NAME") + @ApiParam(value = "组名称") + private String groupName; + + @Column(name = "SEARCH_ELEMENT_ID") + @ApiParam(value = "搜索元素ID") + private Long searchElementId; + + @Column(name = "GROUP_CONNECTOR") + @ApiParam(value = "组条件连接符") + private String groupConnector; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号") + private String userCode; + + @Column(name = "IS_SHAER") + @ApiParam(value = "是否共享") + private Integer isShaer; +} From b2edab4ef403dc6e7ec251dc4a69109f3ae1f5f6 Mon Sep 17 00:00:00 2001 From: e-jiawentao1 Date: Tue, 7 Jan 2020 11:38:51 +0800 Subject: [PATCH 093/139] =?UTF-8?q?2020-01-07=E5=88=9B=E5=BB=BA=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2=E4=B8=8E=E8=A1=A8=E5=8D=95dao?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/repository/WmsFieldInfoRepository.java | 16 ++++++++++++++++ .../wms/repository/WmsListElementFunctionRepository.java | 16 ++++++++++++++++ .../pojo/wms/repository/WmsListElementRepository.java | 16 ++++++++++++++++ .../repository/WmsSearchElementFunctionRepository.java | 16 ++++++++++++++++ .../pojo/wms/repository/WmsSearchElementRepository.java | 16 ++++++++++++++++ 5 files changed, 80 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java new file mode 100644 index 0000000..f1e59d0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS字段信息表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsFieldInfoRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java new file mode 100644 index 0000000..5b724e6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElementFunction; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS列表元素菜单关系表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsListElementFunctionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java new file mode 100644 index 0000000..9433e7d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElement; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS列表元素表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsListElementRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java new file mode 100644 index 0000000..1746d7e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElementFunction; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS搜索元素菜单关系表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsSearchElementFunctionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java new file mode 100644 index 0000000..028586d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS搜索元素表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsSearchElementRepository extends BaseRepository { +} From 9fbc12066626290854f75e5a34930f705228fd2a Mon Sep 17 00:00:00 2001 From: e-jiawentao1 Date: Tue, 7 Jan 2020 18:09:50 +0800 Subject: [PATCH 094/139] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E6=89=AB=E6=8F=8FBean=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/annotation/FieldAnnotation.java | 16 ++++++++++ .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 4 +++ .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 36 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 8 +++++ 4 files changed, 64 insertions(+) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java new file mode 100644 index 0000000..5a6b149 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.base.annotation; + +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; + +import java.lang.annotation.*; + +/** + * 字段类型属性注解 + */ +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +public @interface FieldAnnotation { + // Web前端字段数据类型 + WmsEnumUtil.FIELD_TYPE webFieldType(); +} 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 a05fe1b..5ba62b3 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import com.alibaba.fastjson.annotation.JSONField; @@ -67,11 +68,13 @@ public abstract class BaseBean implements Serializable { @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) @ApiParam(value = "有效性",example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) @ApiParam(value = "是否已删除",example = "2") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @AnnoOutputColumn(hidden = true) //逻辑删除，软删除 public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA @@ -127,6 +130,7 @@ public abstract class BaseBean implements Serializable { @Transient @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc public transient Integer ascOrDesc = 1; 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 665cbcb..a25a0d7 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 @@ -4792,5 +4792,41 @@ public class WmsEnumUtil { } } + /** + * WEB页面字段类型 + * 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FIELD_TYPE { + TEXT(10, "text"), NUMBER(20, "number"), + SELECT(30, "select"), DATETIME(40, "datetime"), + LIST(50, "list"); + + private int value; + private String description; + + FIELD_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; + } + } } \ No newline at end of file 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 0f31d20..1b049a9 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; @@ -46,6 +47,7 @@ public class WmsPart extends BaseBean { @Column(name = "PART_TYPE") @ApiParam(value = "物料类型") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description") private String partType; @@ -96,6 +98,7 @@ public class WmsPart extends BaseBean { @ColumnDefault("2") @Column(name = "IQC") @ApiParam(value = "是否免检", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) private Integer iqc; @Column(name = "MIN", columnDefinition = "decimal(18,8)") @@ -116,6 +119,7 @@ public class WmsPart extends BaseBean { @Column(name = "SN_CONTROL") @ApiParam(value = "是否条码管理", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) private Integer snControl; @Column(name = "VENDOR_NO") @@ -152,6 +156,7 @@ public class WmsPart extends BaseBean { @Column(name = "IS_REPORT_PARTNO") @ApiParam("是否报工零件") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) private Integer isReportPartNo; @Column(name = "REPORT_LOCATE_NO") @@ -172,6 +177,7 @@ public class WmsPart extends BaseBean { @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @ApiParam(value = "是否贵重") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description") private Integer isValuable; @@ -189,10 +195,12 @@ public class WmsPart extends BaseBean { private Double verbNum; @Column(name = "IS_PROD_LOT") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @ApiParam(value = "是否录入生产批次", example = "1") private Integer isProdLot = 2; @Column(name = "PULL_WAY") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) @ApiParam(value = "拉动方式", example = "0") private Integer pullWay = 0; From a92090a3ab9f4a032099b06b39d8f4544debb274 Mon Sep 17 00:00:00 2001 From: e-jiawentao1 Date: Tue, 7 Jan 2020 18:11:40 +0800 Subject: [PATCH 095/139] =?UTF-8?q?2020-01-07=E5=88=9B=E5=BB=BA=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2=E4=B8=8E=E8=A1=A8=E5=8D=95=E5=90=84?= =?UTF-8?q?=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/bean/dynamic/WmsSearchElementFunction.java | 4 +- .../pojo/wms/modelbean/WmsListElementModel.java | 55 ++++++++++++++++++++++ .../pojo/wms/modelbean/WmsSearchElementModel.java | 48 +++++++++++++++++++ 3 files changed, 105 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java index 4e0a3fd..81bf452 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java @@ -49,7 +49,7 @@ public class WmsSearchElementFunction extends BaseBean { @ApiParam(value = "用户编号") private String userCode; - @Column(name = "IS_SHAER") + @Column(name = "IS_SHARE") @ApiParam(value = "是否共享") - private Integer isShaer; + private Integer isShare; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java new file mode 100644 index 0000000..1c2eb95 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : WMS列表菜单model + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 14:33 + * @Modify: + **/ +@Data +@Api("WMS列表菜单model") +public class WmsListElementModel extends BaseBean { + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("标题名称") + private String titleName; + + @ApiParam("序列号:字段标题排序使用默认0（不排序）") + private Integer seq; + + @ApiParam(value = "是否必选:默认1-必选，2-非必选") + private Integer isRequire; + + @ApiParam(value = "宽度") + private Double width; + + @ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序") + private Integer sort; + + @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗") + private Integer isWider; + + @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选") + private Integer isSelect; + + @ApiParam(value = "表单字段默认值") + private String defaultValue; + + @ApiParam(value = "功能菜单ID") + private Long functionId; + + @ApiParam(value = "用户编号") + private String userCode; + + @ApiParam(value = "是否默认配置") + private Integer isDefault; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java new file mode 100644 index 0000000..b9a1224 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : WMS列表搜索model + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 14:33 + * @Modify: + **/ +@Data +@Api("WMS列表搜索model") +public class WmsSearchElementModel extends BaseBean { + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("标题名称") + private String titleName; + + @ApiParam(value = "条件表达式:>,<,>=等") + private String conditionExpre; + + @ApiParam(value = "检索值") + private String value; + + @ApiParam(value = "条件连接符:and/or") + private String conditionConnector; + + @ApiParam(value = "功能菜单ID") + private Long functionId; + + @ApiParam(value = "组名称") + private String groupName; + + @ApiParam(value = "组条件连接符") + private String groupConnector; + + @ApiParam(value = "用户编号") + private String userCode; + + @ApiParam(value = "是否共享") + private Integer isShare; +} From 54bdf8f6a0e80185ec0f3a2b9ae1af058c9beebf Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 7 Jan 2020 19:48:51 +0800 Subject: [PATCH 096/139] JIS --- .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 9 --------- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java | 6 +++--- .../estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 12 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 86a66f5..9af8a31 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 @@ -187,15 +187,6 @@ public class MesEnumUtil { return tmp; } - public static String valueOfDescription2(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; - } - } - return tmp; - } } @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java index 1859025..78b1e77 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java @@ -69,9 +69,9 @@ public class MesPart extends BaseBean { @ApiParam("默认工作中心") private String defaultWorkCenter; - @Column(name = "PRODUCE_CATEGORY") - @ApiParam("产品类型") - private String produceCategory; + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型代码") + private String produceCategoryCode; @Column(name = "PROCESS_MATCH_TYPE") @ApiParam("过程编码匹配类型") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java index 1cd6a17..7a32f8b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.pcn.model; +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -41,6 +42,20 @@ public class QueueJisModel implements Serializable { @ApiParam("产品条码") private String serialNumber; + @ApiParam("状态名称") + private String statusName; + + @ApiParam("明细状态名称") + private String detailStatusName; + + public String getStatusName() { + return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.status); + } + + public String getDetailStatusName() { + return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.detailStatus); + } + public QueueJisModel() { } @@ -57,4 +72,5 @@ public class QueueJisModel implements Serializable { this.detailStatus = detailStatus; this.serialNumber = serialNumber; } + } From 0d7aca73a85e09c4fe91bf4dd7d651547b7607a6 Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 7 Jan 2020 20:05:36 +0800 Subject: [PATCH 097/139] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A731?= =?UTF-8?q?5=20=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95=E5=8F=98=E6=9B=B4?= =?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/base/enumutil/MesEnumUtil.java | 3 +-- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 86a66f5..d6e4051 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 @@ -2889,8 +2889,7 @@ public class MesEnumUtil { STANDARD_ORDER(10, "标准工单"), BTS_ORDER(20, "BTS工单"), ATTEMPT_ORDER(30, "试制工单"), - BH_ORDER(40, "B&H工单"), - JIT_ORDER(50, "JIT工单"); + BH_ORDER(40, "B&H工单"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index 20a1b79..e358ca6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -37,7 +37,7 @@ public class MesPackageDetail extends BaseBean { private String serialNumber; @Column(name = "PART_NO") - @ApiParam("产品条码") + @ApiParam("物料号") private String partNo; @Column(name = "PART_NAME_RDD") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java index a67a223..d3ab791 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java @@ -23,8 +23,8 @@ public class MesButtonFlagModel implements Serializable { @ApiParam("修改按钮") private boolean updateButton; -// @ApiParam("按配置修改按钮") -// private boolean updateButtonConfig; + @ApiParam("按配置修改按钮") + private boolean updateButtonConfig; @ApiParam("下达按钮") private boolean transmitButton; From 68fc275565ff4b973b497d7b42449aaff34fbf0e Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 8 Jan 2020 09:54:27 +0800 Subject: [PATCH 098/139] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E6=8B=96=E6=8B=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index 18d4ace..26e9d6c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -8,10 +8,10 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Column; +import javax.persistence.Lob; import javax.persistence.MappedSuperclass; import javax.persistence.Transient; import java.util.HashMap; -import java.util.Map; /** * @Description :APS基类 @@ -26,7 +26,9 @@ import java.util.Map; @ExcludeImportExport public abstract class BaseAPS extends BaseBean { @JsonIgnore - private transient Map customFields = new HashMap<>(); + @Lob + @FieldAnnotation(property = false) + private HashMap customFields = new HashMap<>(); @Column(name="KEY") @ApiParam(value ="主键值") From b0f60a9176fa8da0a2e02c3ff6a893911f31984c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 8 Jan 2020 10:04:20 +0800 Subject: [PATCH 099/139] =?UTF-8?q?2020-01-08=E5=88=9B=E5=BB=BA=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E5=88=97=E8=A1=A8=E4=B8=8E=E6=9F=A5=E8=AF=A2model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms}/WmsListElementModel.java | 2 +- .../java/cn/estsh/i3plus/pojo/model/wms}/WmsSearchElementModel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename modules/{i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean => i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms}/WmsListElementModel.java (96%) rename modules/{i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean => i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms}/WmsSearchElementModel.java (96%) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java similarity index 96% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java index 1c2eb95..a286a2e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.modelbean; +package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java similarity index 96% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java index b9a1224..b785f96 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.modelbean; +package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; From f323637c94ad1302fafc5f35f70665cecbe11d8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 8 Jan 2020 10:44:34 +0800 Subject: [PATCH 100/139] =?UTF-8?q?Wms=E5=88=9D=E5=A7=8B=E5=8C=96=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsFieldInfoModel.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java new file mode 100644 index 0000000..ecbf355 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : Wms实体字段Model信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-01-08 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class WmsFieldInfoModel implements Serializable { + + private static final long serialVersionUID = -6376845639646427495L; + + @ApiParam(value = "字段信息列表") + public List wmsFieldInfoList; + + @ApiParam(value = "新增数据操作类") + private String baseRepository; + + public WmsFieldInfoModel (String baseRepository, List wmsFieldInfoList) { + this.baseRepository = baseRepository; + this.wmsFieldInfoList = wmsFieldInfoList; + } +} From c53c8c04e340b59676f7737f78110de3a69f9163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 8 Jan 2020 11:18:10 +0800 Subject: [PATCH 101/139] BUG#7186 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.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/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 9a726ee..41e57d1 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 @@ -107,7 +107,7 @@ public class WmsActionGroup extends BaseBean { } public int getIsAutoCommitVal() { - return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue(); + return this.isAutoCommit == null ? 0 : this.isAutoCommit.intValue(); } public int getAutoInitVal() { From 7d4ba10449d80125659d4a9c00278e6e79583a50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 8 Jan 2020 15:23:43 +0800 Subject: [PATCH 102/139] =?UTF-8?q?Wms=E5=88=9D=E5=A7=8B=E5=8C=96=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/annotation/FieldAnnotation.java | 18 ++++++++++ .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 5 +++ .../pojo/model/wms/WmsSearchElementModel.java | 3 ++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 34 +++++++++++++++++++ .../i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java | 38 +++++++++++++++++++++- .../pojo/wms/bean/dynamic/WmsListElement.java | 11 ++++--- .../wms/bean/dynamic/WmsSearchElementFunction.java | 4 +++ 7 files changed, 107 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java index 5a6b149..2e2b0a2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java @@ -13,4 +13,22 @@ import java.lang.annotation.*; public @interface FieldAnnotation { // Web前端字段数据类型 WmsEnumUtil.FIELD_TYPE webFieldType(); + // 条件表达式:>,<,>=等 + String conditionExpre() default "="; + // 条件连接符:and/or + String conditionConnector() default "and"; + // 排序序号 + int seq() default 0; + // 字段列宽度 + double width() default 0d; + // 排序规则:默认0-不排序，1-升序2-降序 + int sort() default 0; + // 是否标题字段加粗 是否加粗:默认1-加粗，2-非加粗 + int isWider() default 2; + // 是否勾选:默认1-勾选，2-非勾选 + int isSelect() default 1; + // 是否必选:默认1-必选，2-非必选 + int isRequire() default 1; + // 是否表单字段展示:默认1-显示，2-隐藏 + int isShow() default 1; } 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 5ba62b3..9c10c6c 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 @@ -41,6 +41,7 @@ public abstract class BaseBean implements Serializable { @ApiParam(value = "主键",example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) public Long id; //get单独处理 @@ -63,6 +64,7 @@ public abstract class BaseBean implements Serializable { @Column(name="ORGANIZE_CODE") @ApiParam(value ="组织代码") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) // @AnnoOutputColumn(hidden = true) public String organizeCode; @@ -87,15 +89,18 @@ public abstract class BaseBean implements Serializable { @Indexed(direction = IndexDirection.DESCENDING) @Column(name="CREATE_DATE_TIME",updatable = false) @ApiParam(value = "创建日期") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) public String createDatetime; @Column(name="MODIFY_USER") @ApiParam(value = "修改人") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) public String modifyUser; @Column(name="MODIFY_DATE_TIME") @ApiParam(value = "修改日期") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) public String modifyDatetime; @Transient diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java index b785f96..9ca8e79 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java @@ -45,4 +45,7 @@ public class WmsSearchElementModel extends BaseBean { @ApiParam(value = "是否共享") private Integer isShare; + + @ApiParam(value = "搜索名称") + private String searchName; } 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 1b049a9..748e194 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 @@ -35,14 +35,17 @@ public class WmsPart extends BaseBean { private static final long serialVersionUID = 4849044986767609346L; @Column(name = "PART_NO") @ApiParam(value = "物料编码") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partNo; @Column(name = "PART_NAME") @ApiParam(value = "物料名称") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partName; @Column(name = "PART_SPEC") @ApiParam(value = "物料规格") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partSpec; @Column(name = "PART_TYPE") @@ -53,46 +56,57 @@ public class WmsPart extends BaseBean { @Column(name = "PART_TYPE_DESC") @ApiParam(value = "物料类型描述") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partTypeDesc; @Column(name = "GRAPHI_NO") @ApiParam(value = "图号") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String graphiNo; @Column(name = "VERSION") @ApiParam(value = "版本") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String version; @Column(name = "COLOR") @ApiParam(value = "颜色") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String color; @Column(name = "STOCK_UNIT") @ApiParam(value = "库存单位") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String stockUnit; @Column(name = "ABC") @ApiParam(value = "分类") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String abc; @Column(name = "BUY_UNIT") @ApiParam(value = "采购单位") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String buyUnit; @Column(name = "BU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率1", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double bu2su; @Column(name = "PRICE_UNIT") @ApiParam(value = "计价单位") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String priceUnit; @Column(name = "PU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率2", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double pu2su; @Column(name = "SNP", columnDefinition = "decimal(18,8)") @ApiParam(value = "标包", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double snp; @ColumnDefault("2") @@ -103,18 +117,22 @@ public class WmsPart extends BaseBean { @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最低库存", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double min; @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最高库存", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double max; @Column(name = "PART_GROUP") @ApiParam(value = "物料组") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partGroup; @Column(name = "LOT_CHECK_RULE") @ApiParam(value = "批次校验规则") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String lotCheckRule; @Column(name = "SN_CONTROL") @@ -124,34 +142,42 @@ public class WmsPart extends BaseBean { @Column(name = "VENDOR_NO") @ApiParam(value = "供应商代码") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String vendorNo; @Column(name = "IN_LOCATE_NO") @ApiParam(value = "默认入库库位") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String inLocateNo; @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String prodCfgTypeCode; @Column(name = "PROD_CFG_TYPE_NAME") @ApiParam("项目名称") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String prodCfgTypeName; @Column(name = "OUT_CLOSE_FLAG") @ApiParam("項目结算标识") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String outCloseFlag = "2"; @Column(name = "OUT_CLOSE_TYPE") @ApiParam("结算方式") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String outCloseType; @Column(name = "OUT_CLOSE_VENDOR") @ApiParam("结算供应商") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String outCloseVendor; @Column(name = "QUALITY_DAYS") @ApiParam("保质期天数") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer qualityDays; @Column(name = "IS_REPORT_PARTNO") @@ -161,18 +187,22 @@ public class WmsPart extends BaseBean { @Column(name = "REPORT_LOCATE_NO") @ApiParam("报工库位") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String reportLocateNo; @Column(name = "REPORT_ZONE_NO") @ApiParam("报工存储区") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String reportZoneNo; @Column(name = "PRODUCT_LINES") @ApiParam("报工产线") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String productLines; @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)") @ApiParam(value = "待质检比例", example = "1") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double proportion; @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @@ -183,11 +213,13 @@ public class WmsPart extends BaseBean { @Transient @ApiParam("总数量") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double qty; @Transient @ApiParam("库存水平") @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String stockLevelStatus; @Column(name="verb_num") @@ -206,10 +238,12 @@ public class WmsPart extends BaseBean { @Column(name = "CYCLE_RQUEST_PERIOD") @ApiParam(value = "循环补货周期", example = "0") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer cycleRquestPeriod = 0; @Column(name = "CYCLE_RQUEST_QTY") @ApiParam(value = "循环补货数量", example = "0") + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double cycleRquestQty = 0d; public int getIqcVal(){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java index 718dd49..7ef1220 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java @@ -7,7 +7,6 @@ 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; @@ -29,6 +28,7 @@ import javax.persistence.Table; public class WmsFieldInfo extends BaseBean { private static final long serialVersionUID = 3903166651913139064L; + @Column(name = "FIELD_NAME") @ApiParam(value = "字段名称") private String fieldName; @@ -48,4 +48,40 @@ public class WmsFieldInfo extends BaseBean { @Column(name = "ENTITY_DESC") @ApiParam(value = "实体描述") private String entityDesc; + + @Column(name = "SEQ") + @ApiParam(value = "序列号:字段标题排序使用默认0（不排序）") + private Integer seq; + + @Column(name = "IS_REQUIRE") + @ApiParam(value = "是否必选:默认1-必选，2-非必选") + private Integer isRequire; + + @Column(name = "WIDTH", columnDefinition = "decimal(18,8)") + @ApiParam(value = "宽度", example = "0") + private Double width; + + @Column(name = "SORT") + @ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序") + private Integer sort; + + @Column(name = "IS_WIDER") + @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗") + private Integer isWider; + + @Column(name = "IS_SELECT") + @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选") + private Integer isSelect; + + @Column(name = "IS_SHOW") + @ApiParam(value = "是否表单字段展示:默认1-显示，2-隐藏") + private Integer isShow; + + @Column(name = "CONDITION_EXPRE") + @ApiParam(value = "条件表达式:>,<,>=等") + private String conditionExpre; + + @Column(name = "CONDITION_CONNECTOR") + @ApiParam(value = "条件连接符:and/or") + private String conditionConnector; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java index bd3d125..09109a7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java @@ -29,6 +29,7 @@ import javax.persistence.Table; public class WmsListElement extends BaseBean { private static final long serialVersionUID = 3903166651913139060L; + @Column(name = "FIELD_NAME") @ApiParam(value = "字段名称") private String fieldName; @@ -45,14 +46,10 @@ public class WmsListElement extends BaseBean { @ApiParam(value = "是否必选:默认1-必选，2-非必选") private Integer isRequire; - @Column(name = "WIDTH", columnDefinition = "decimal(2,5)") + @Column(name = "WIDTH", columnDefinition = "decimal(18,8)") @ApiParam(value = "宽度", example = "0") private Double width; - public Double getWidth() { - return this.width == null ? 0 : this.width.doubleValue(); - } - @Column(name = "SORT") @ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序") private Integer sort; @@ -72,4 +69,8 @@ public class WmsListElement extends BaseBean { @Column(name = "DEFAULT_VALUE") @ApiParam(value = "表单字段默认值") private String defaultValue; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号") + private String userCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java index 81bf452..d10ef27 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java @@ -37,6 +37,10 @@ public class WmsSearchElementFunction extends BaseBean { @ApiParam(value = "组名称") private String groupName; + @Column(name = "SEARCH_NAME") + @ApiParam(value = "搜索名称") + private String searchName; + @Column(name = "SEARCH_ELEMENT_ID") @ApiParam(value = "搜索元素ID") private Long searchElementId; From 25606ea25ac1b36aeaed58b408d6af8b490d494b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 8 Jan 2020 15:26:46 +0800 Subject: [PATCH 103/139] =?UTF-8?q?=E3=80=906847=20=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=BC=82=E5=B8=B8=E7=9A=84=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E3=80=82=E5=AD=98=E5=9C=A8=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E4=BE=9B=E6=8A=A5=E8=A1=A8=E5=B1=95=E7=A4=BA=E3=80=82=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E5=89=8D=E6=89=80=E6=9C=89=E5=BC=82=E5=B8=B8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=9D=87=E9=9C=80=E5=A4=84=E7=90=86=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsDataMigrationConfig.java | 90 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 11 +++ .../WmsDataMigrationConfigRepository.java | 17 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 21 +++++ 4 files changed, 139 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataMigrationConfigRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java new file mode 100644 index 0000000..9038989 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.wms.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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : WMS数据迁移配置表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-08 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_DATA_MIGRATION_CONFIG") +@Api("WMS数据迁移配置表") +public class WmsDataMigrationConfig extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592777L; + + @Column(name="MIG_NAME") + @ApiParam("名称") + private String migName; + + @Column(name="REMARK") + @ApiParam("描述") + private String remark; + + @Column(name="MIGRATION_CYCLE") + @ApiParam("迁移周期") + private String migrationCycle; + + @Column(name="LAST_EXECUTION_TIME") + @ApiParam("末次迁移时间") + private String lastExecutionTime; + + @Column(name="LAST_MRGRATION_QTY") + @ApiParam(value = "末次迁移记录数", example = "0") + private Integer LastmMigrationQty; + + @Column(name="NEXT_EXECUTION_TIME") + @ApiParam("下次执行时间") + private String nextExecutionTime; + + @Column(name="SRC_TABLE_NAME") + @ApiParam("来源表名") + private String srcTableName; + + @Column(name="SRC_QUERY_CONDITIONS") + @ApiParam("来源表查询条件") + private String srcQueryConditions; + + @Column(name="PROCESS_QTY") + @ApiParam(value = "每次处理行数", example = "0") + private Integer processQty; + + @Column(name="DEST_TABLE_NAME") + @ApiParam("目标表名") + private String destTableName; + + @Column(name="IS_PHYSICAL_DELETE") + @ApiParam(value = "是否物理删除", example = "0") + private Integer isPhysicalDelete; + + @Column(name="ERROR_MESSAGE") + @ApiParam("执行错误日志") + private String errorMessage; + + @Transient + @ApiParam(value ="开始时间") + private String mcStartTime; + + @Transient + @ApiParam(value ="结束时间") + private String mcEndTime; +} \ No newline at end of file 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 335aac9..a4405ea 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 @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -156,6 +157,10 @@ public class WmsMoveMaster extends BaseBean { @Transient private Integer isSnapshot; + @Transient + @ApiParam("总行数") + private Integer itemQty; + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1") @@ -220,6 +225,12 @@ public class WmsMoveMaster extends BaseBean { this.modifyDatetime = modifyDatetime; } + public WmsMoveMaster(Integer itemQty , String transTypeCode , Integer itemStatus){ + this.itemQty = itemQty; + this.transTypeCode = transTypeCode; + this.itemStatus = itemStatus; + } + public Double getTransQty() { return this.transQty == null ? 0 : this.transQty.doubleValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataMigrationConfigRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataMigrationConfigRepository.java new file mode 100644 index 0000000..080bf9d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataMigrationConfigRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.BasVendor; +import cn.estsh.i3plus.pojo.wms.bean.WmsDataMigrationConfig; +import org.springframework.stereotype.Repository; + +/** + * @Description :WMS数据迁移配置实体 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-08 14:49 + * @Modify: + **/ +@Repository +public interface WmsDataMigrationConfigRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 215fb1b..55724ff 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2692,4 +2692,25 @@ public class WmsHqlPack { return result; } + /** + * 数据迁移配置信息分页查询条件 + * + * @param wmsDataMigrationConfig + * @return + */ + public static DdlPackBean packHqlWmsDataMigrationConfig(WmsDataMigrationConfig wmsDataMigrationConfig) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsDataMigrationConfig.getMigName(), "migName", result); + DdlPreparedPack.getStringLikerPack(wmsDataMigrationConfig.getRemark(), "remark", result); + DdlPreparedPack.getStringLikerPack(wmsDataMigrationConfig.getSrcTableName(), "srcTableName", result); + DdlPreparedPack.getNumEqualPack(wmsDataMigrationConfig.getIsPhysicalDelete(), "isPhysicalDelete", result); + DdlPreparedPack.getStringBiggerPack(wmsDataMigrationConfig.getMcStartTime(), "nextExecutionTime", result); + DdlPreparedPack.getStringSmallerPack(wmsDataMigrationConfig.getMcEndTime(), "nextExecutionTime", result); + + getStringBuilderPack(wmsDataMigrationConfig, result); + + return result; + } + } From bca93691baf09fc82b1238fbbddea22bc435682e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 8 Jan 2020 15:35:48 +0800 Subject: [PATCH 104/139] =?UTF-8?q?2020-01-08=E6=B7=BB=E5=8A=A0=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=8F=9C=E5=8D=95=E4=B8=8E=E5=AF=B9=E5=BA=94=E5=92=8C?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsListElementModel.java | 33 ++++------------------ 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java index a286a2e..2c8f6f2 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java @@ -1,10 +1,14 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElement; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; +import java.util.List; + /** * @Description : WMS列表菜单model * @Reference : @@ -16,33 +20,6 @@ import lombok.Data; @Api("WMS列表菜单model") public class WmsListElementModel extends BaseBean { - @ApiParam("字段名称") - private String fieldName; - - @ApiParam("标题名称") - private String titleName; - - @ApiParam("序列号:字段标题排序使用默认0（不排序）") - private Integer seq; - - @ApiParam(value = "是否必选:默认1-必选，2-非必选") - private Integer isRequire; - - @ApiParam(value = "宽度") - private Double width; - - @ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序") - private Integer sort; - - @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗") - private Integer isWider; - - @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选") - private Integer isSelect; - - @ApiParam(value = "表单字段默认值") - private String defaultValue; - @ApiParam(value = "功能菜单ID") private Long functionId; @@ -52,4 +29,6 @@ public class WmsListElementModel extends BaseBean { @ApiParam(value = "是否默认配置") private Integer isDefault; + List wmsListElementList; + } From e1386275d0f9d71396f585ab962bc3f2c8e81939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 8 Jan 2020 15:49:57 +0800 Subject: [PATCH 105/139] =?UTF-8?q?Wms=E5=88=9D=E5=A7=8B=E5=8C=96=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=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/wms/bean/dynamic/WmsFieldInfo.java | 6 +++++- .../cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java | 6 +++++- .../i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java | 7 ++++++- .../cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java | 5 ++++- .../i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java | 9 ++++++++- 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java index 7ef1220..b1f3e68 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -20,7 +21,10 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_FIELDINFO") +@Table(name="WMS_FIELDINFO", indexes = { + @Index(columnList = "FIELD_NAME"), + @Index(columnList = "ENTITY_NAME") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java index 09109a7..d654c64 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -21,7 +22,10 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_LISTELEMENT") +@Table(name="WMS_LISTELEMENT", indexes = { + @Index(columnList = "FIELD_NAME"), + @Index(columnList = "USER_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java index 18ff672..dc94f0a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -21,7 +22,11 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_LISTELEMENT_FUNCTION") +@Table(name="WMS_LISTELEMENT_FUNCTION", indexes = { + @Index(columnList = "FUNCTION_ID"), + @Index(columnList = "ELEMENT_ID"), + @Index(columnList = "USER_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java index cdae331..de0aaf6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -21,7 +22,9 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_SEARCHELEMENT") +@Table(name="WMS_SEARCHELEMENT", indexes = { + @Index(columnList = "FIELD_NAME") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java index d10ef27..54f31aa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -21,7 +22,13 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_SEARCHELEMENT_FUNCTION") +@Table(name="WMS_SEARCHELEMENT_FUNCTION", indexes = { + @Index(columnList = "FUNCTION_ID"), + @Index(columnList = "SEARCH_NAME"), + @Index(columnList = "SEARCH_ELEMENT_ID"), + @Index(columnList = "IS_SHARE"), + @Index(columnList = "USER_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) From d05fd542b37d0b24a7ec595ffd03e9ba3f01da4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 8 Jan 2020 16:29:07 +0800 Subject: [PATCH 106/139] =?UTF-8?q?2020-01-08=E6=B7=BB=E5=8A=A0=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=8F=9C=E5=8D=95=E4=B8=8E=E5=AF=B9=E5=BA=94=E5=92=8C?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java index 2c8f6f2..0a11f26 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java @@ -6,7 +6,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; import java.util.List; /** From c14d6c6916ea260c967fb4a5baad4fbee39f2b7a Mon Sep 17 00:00:00 2001 From: gcj Date: Wed, 8 Jan 2020 17:31:45 +0800 Subject: [PATCH 107/139] =?UTF-8?q?=E3=80=90=E5=AE=81=E5=BE=B7=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=B8=85=E5=8D=95=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 35 ++++++++ .../estsh/i3plus/pojo/wms/bean/WmsPushConfig.java | 92 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java | 52 ++++++++++++ .../pojo/wms/modelbean/MailMessageModel.java | 15 ++++ .../pojo/wms/modelbean/PushMessageModel.java | 25 ++++++ .../wms/repository/WmsPushConfigRepository.java | 19 +++++ .../pojo/wms/repository/WmsPushLogRepository.java | 18 +++++ 7 files changed, 256 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushConfigRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushLogRepository.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 665cbcb..33d06b5 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 @@ -4793,4 +4793,39 @@ public class WmsEnumUtil { } + /** + * 推送类型 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PUSH_TYPE { + EMAIL(10, "邮件"), SMS(20, "短信"); + + private int value; + private String description; + + PUSH_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; + } + } + } \ No newline at end of file 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 new file mode 100644 index 0000000..374abd7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java @@ -0,0 +1,92 @@ +package cn.estsh.i3plus.pojo.wms.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 : gcj + * @CreateDate : 2020-01-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PUSH_CONFIG") +@Api("推送配置") +public class WmsPushConfig extends BaseBean{ + + private static final long serialVersionUID = 2701710669030092153L; + @ApiParam("推送名称") + @Column(name = "PUSH_NAME") + private String pushName; + + @ApiParam("规则类型") + @Column(name = "QUARTZ_CRON") + private String quartzCron; + + @ApiParam("末次执行时间") + @Column(name = "LAST_EXE_TIME") + private String lastExeTime; + + @ApiParam("下次执行时间") + @Column(name = "NEXT_EXE_TIME") + private String nextExeTime; + + @ApiParam("序号") + @Column(name = "SERIAL_NUMBER") + private Integer serialNumber; + + @ApiParam("查询Hql") + @Column(name = "HQL_STR") + private String hqlStr; + + @ApiParam("查询Sql") + @Column(name = "SQL_STR") + private String sqlStr; + + @ApiParam("脚本编号") + @Column(name = "SCRIPT_NO") + private String scriptNo; + + @ApiParam("标题模板") + @Column(name = "TITLE_TEMPLATE") + private String titleTemplate; + + @ApiParam("消息体模板") + @Column(name = "CONTENT_TEMPLATE") + private String contentTemplate; + + @ApiParam("推送类型") + @Column(name = "PUSH_TYPE") + private Integer pushType; + + @ApiParam("描述") + @Column(name = "REMARK") + private String remark; + + @ApiParam("推送地址") + @Column(name ="PATH_URL") + private String pathUrl; + + @ApiParam("头标签") + @Column(name = "TITLE_LABEL") + private String titleLabel; + + @ApiParam("内容标签") + @Column(name = "CONTENT_LABEL") + private String contentLabel; + +} 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 new file mode 100644 index 0000000..6a57625 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.wms.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 : gcj + * @CreateDate : 2020-01-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PUSH_LOG") +@Api("推送日志") +public class WmsPushLog extends BaseBean{ + + private static final long serialVersionUID = -1708833666516164845L; + @Column(name = "EXE_HQL") + @ApiParam("执行Hql") + private String exeHql; + + @Column(name = "PUSH_TITLE") + @ApiParam("推送标题") + private String pushTitle; + + @Column(name = "PUSH_CONTENT") + @ApiParam("推送内容") + private String pushContent; + + @Column(name = "PUSH_TYPE") + @ApiParam("推送类型") + private String pushType; + + @Column(name = "PUSH_RESULT") + @ApiParam("推送结果") + private String pushResult; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java new file mode 100644 index 0000000..6667a49 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import lombok.Data; + +import java.util.Map; + +@Data +public class MailMessageModel extends PushMessageModel { + + + //附加，value 文件的绝对地址/动态模板数据 + private Map attachment; + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java new file mode 100644 index 0000000..1e2ff26 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +@Data +public class PushMessageModel { + + + //标题 + public String title; + //内容 + public String content; + + //推送类型 + public String pushType; + + //推送地址 + public String pathUrl; + + //推送数据 + List> dataList; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushConfigRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushConfigRepository.java new file mode 100644 index 0000000..65de6a6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushConfigRepository.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPushConfig; +import cn.estsh.i3plus.pojo.wms.bean.WmsPushLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : 推送日志配置信息 + * @Reference : + * @Author : gcj + * @CreateDate : 2020-01-06 9:47 + * @Modify: + **/ +@Repository +public interface WmsPushConfigRepository extends BaseRepository { + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushLogRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushLogRepository.java new file mode 100644 index 0000000..209b9a7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushLogRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsPushLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : 推送日志保存对象 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2020-01-06 9:47 + * @Modify: + **/ +@Repository +public interface WmsPushLogRepository extends BaseRepository { + +} From daf3365ce3a222c4b5330e76861bb4d1d8373781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 8 Jan 2020 18:22:00 +0800 Subject: [PATCH 108/139] =?UTF-8?q?Wms=E5=88=9D=E5=A7=8B=E5=8C=96=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsSearchElementModel.java | 22 +++++----------------- .../pojo/wms/bean/dynamic/WmsSearchElement.java | 15 +++++++++++++-- .../wms/bean/dynamic/WmsSearchElementFunction.java | 6 +----- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java index 9ca8e79..0056ba7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java @@ -1,10 +1,13 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.List; + /** * @Description : WMS列表搜索model * @Reference : @@ -16,21 +19,6 @@ import lombok.Data; @Api("WMS列表搜索model") public class WmsSearchElementModel extends BaseBean { - @ApiParam("字段名称") - private String fieldName; - - @ApiParam("标题名称") - private String titleName; - - @ApiParam(value = "条件表达式:>,<,>=等") - private String conditionExpre; - - @ApiParam(value = "检索值") - private String value; - - @ApiParam(value = "条件连接符:and/or") - private String conditionConnector; - @ApiParam(value = "功能菜单ID") private Long functionId; @@ -46,6 +34,6 @@ public class WmsSearchElementModel extends BaseBean { @ApiParam(value = "是否共享") private Integer isShare; - @ApiParam(value = "搜索名称") - private String searchName; + @ApiParam(value = "Wms查询元素列表") + private List searchElementList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java index de0aaf6..8ffe833 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java @@ -16,14 +16,16 @@ import javax.persistence.Table; /** * @Description : WMS搜索元素表 * @Reference : - * @Author : sjc + * @Author : siliter.yuan * @CreateDate : 2020-01-07 09:06 * @Modify: **/ @Data @Entity @Table(name="WMS_SEARCHELEMENT", indexes = { - @Index(columnList = "FIELD_NAME") + @Index(columnList = "FIELD_NAME"), + @Index(columnList = "SEARCH_NAME"), + @Index(columnList = "USER_CODE") }) @DynamicInsert @DynamicUpdate @@ -32,6 +34,7 @@ import javax.persistence.Table; public class WmsSearchElement extends BaseBean { private static final long serialVersionUID = 3903166651913139062L; + @Column(name = "FIELD_NAME") @ApiParam(value = "字段名称") private String fieldName; @@ -51,4 +54,12 @@ public class WmsSearchElement extends BaseBean { @Column(name = "CONDITION_CONNECTOR") @ApiParam(value = "条件连接符:and/or") private String conditionConnector; + + @Column(name = "SEARCH_NAME") + @ApiParam(value = "搜索名称") + private String searchName; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号") + private String userCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java index 54f31aa..43cbb23 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java @@ -24,7 +24,6 @@ import javax.persistence.Table; @Entity @Table(name="WMS_SEARCHELEMENT_FUNCTION", indexes = { @Index(columnList = "FUNCTION_ID"), - @Index(columnList = "SEARCH_NAME"), @Index(columnList = "SEARCH_ELEMENT_ID"), @Index(columnList = "IS_SHARE"), @Index(columnList = "USER_CODE") @@ -36,6 +35,7 @@ import javax.persistence.Table; public class WmsSearchElementFunction extends BaseBean { private static final long serialVersionUID = 3903166651913139063L; + @Column(name = "FUNCTION_ID") @ApiParam(value = "功能菜单ID") private Long functionId; @@ -44,10 +44,6 @@ public class WmsSearchElementFunction extends BaseBean { @ApiParam(value = "组名称") private String groupName; - @Column(name = "SEARCH_NAME") - @ApiParam(value = "搜索名称") - private String searchName; - @Column(name = "SEARCH_ELEMENT_ID") @ApiParam(value = "搜索元素ID") private Long searchElementId; From 42bbb852c4451475cfe482e3fa4832046e8aa545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 8 Jan 2020 20:02:45 +0800 Subject: [PATCH 109/139] =?UTF-8?q?Wms=E5=88=9D=E5=A7=8B=E5=8C=96=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=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/wms/sqlpack/WmsHqlPack.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 55724ff..65c25de 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; @@ -2713,4 +2714,17 @@ public class WmsHqlPack { return result; } + /** + * WMS实体字段信息分页查询条件 + * + * @param wmsFieldInfo + * @return + */ + public static DdlPackBean packHqlWmsFieldInfo(WmsFieldInfo wmsFieldInfo) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getFieldName(), "fieldName", result); + DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "entityName", result); + getStringBuilderPack(wmsFieldInfo, result); + return result; + } } From 0a70a42336fb0310e622f2ecee5ae885af4c5513 Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 8 Jan 2020 20:34:46 +0800 Subject: [PATCH 110/139] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A138?= =?UTF-8?q?1=20=E5=85=BC=E5=AE=B9Sql=20server=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java | 6 +++++- .../i3plus/pojo/mes/model/MesEquTaskStandardModel.java | 9 ++++++++- .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 15 --------------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java index b8e6909..e632a49 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java @@ -58,6 +58,9 @@ public class MesEquTaskPlanModel implements Serializable { @ApiParam("修改日期") public String modifyDatetime; + @ApiParam("修改日期") + public String modifyDatetimePlan; + @ApiParam("作业类型名称") private String taskTypeName; @@ -69,7 +72,7 @@ public class MesEquTaskPlanModel implements Serializable { } - public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimePlan) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -87,5 +90,6 @@ public class MesEquTaskPlanModel implements Serializable { this.createDatetime = createDatetime; this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; + this.modifyDatetimePlan = modifyDatetimePlan; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java index ca5f0ce..732f977 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java @@ -55,6 +55,9 @@ public class MesEquTaskStandardModel implements Serializable { @ApiParam("修改日期") public String modifyDatetime; + @ApiParam("修改日期") + public String modifyDatetimeStandard; + @ApiParam("作业类型") private String taskTypeName; @@ -66,7 +69,10 @@ public class MesEquTaskStandardModel implements Serializable { } - public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String actionItem, String actionStandard, String actionGuide, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String actionItem, + String actionStandard, String actionGuide, String workCenterCode, String equipmentCategory, + String organizeCode, Integer isValid, Integer isDeleted, String createUser, + String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimeStandard) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -83,5 +89,6 @@ public class MesEquTaskStandardModel implements Serializable { this.createDatetime = createDatetime; this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; + this.modifyDatetimeStandard = modifyDatetimeStandard; } } 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 93083c2..7df0f79 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 @@ -102,10 +102,6 @@ public class MesHqlPack { mesPlanOrder.getCreateDateTimeEnd(), "createDatetime", packBean, true); } - - // 排序 - DdlPreparedPack.getOrderDefault(mesPlanOrder); - DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPlanOrder.getOrderByParam()}, packBean); return packBean; } @@ -141,8 +137,6 @@ public class MesHqlPack { } else { DdlPreparedPack.getStringNoEqualPack("WXJ", "produceCategoryCode", packBean); } - DdlPreparedPack.getOrderDefault(mesPart); - DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPart.getOrderByParam()}, packBean); return packBean; } @@ -205,7 +199,6 @@ public class MesHqlPack { "createDatetime", packBean, true); } DdlPreparedPack.getOrderDefault(mesWorkOrder); - DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean); return packBean; } @@ -243,8 +236,6 @@ public class MesHqlPack { "createDatetime", packBean, true); // DdlPreparedPack.getOrderDefault(mesQueueOrder); - // 按照队列序列号倒序 - DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{"seq"}, packBean); return packBean; } @@ -321,7 +312,6 @@ public class MesHqlPack { DdlPackBean packBean = getAllBaseDataByNormalPro(mesRoute, organizeCode); DdlPreparedPack.getStringLikerPack(mesRoute.getRouteCode(), "routeCode", packBean); DdlPreparedPack.getStringLikerPack(mesRoute.getRouteName(), "routeName", packBean); - packBean.setOrderByStr(mesRoute.orderBy()); return packBean; } @@ -337,7 +327,6 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean); - packBean.setOrderByStr(mesProdRouteCfg.orderBy()); return packBean; } @@ -1163,8 +1152,6 @@ public class MesHqlPack { if (null != numberRule.getIsCycle()) { DdlPreparedPack.getNumEqualPack(numberRule.getIsCycle(), "isCycle", packBean); } - - packBean.setOrderByStr(numberRule.orderBy()); return packBean; } @@ -1183,7 +1170,6 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesPcnTask.getTaskName())) { DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean); } - packBean.setOrderByStr(mesPcnTask.orderBy()); return packBean; } @@ -1230,7 +1216,6 @@ public class MesHqlPack { if (!StringUtils.isEmpty(buttonStatus.getButtonCode())) { DdlPreparedPack.getStringLikerPack(buttonStatus.getButtonCode(), "buttonCode", packBean); } - packBean.setOrderByStr(buttonStatus.orderBy()); return packBean; } From 031d57e0816f7695719136c670abb7b17b3c82a8 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 9 Jan 2020 09:30:06 +0800 Subject: [PATCH 111/139] JIS --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java | 2 ++ .../java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java index 09b331d..6635e25 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -37,6 +38,7 @@ public class MesPatternJis extends BaseBean { @ApiParam("模式名称") private String patternName; + @Lob @Column(name = "RULE") @ApiParam("规则") private String rule; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java index c838c4d..19d1a22 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -102,6 +102,7 @@ public class MesEquipmentModel implements Serializable { } + //根据条件查询设备所有有效数据-设备作业任务下拉框 queryMesEquipmentListByParams public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory) { this.id = id; this.equipmentCode = equipmentCode; @@ -111,6 +112,8 @@ public class MesEquipmentModel implements Serializable { this.equipmentCategory = equipmentCategory; } + //根据生产线，工位获取设备集合 findMesEquipmentList + //获取设备分页数据-组织模型 queryMesEquipmentByPagerOrg public MesEquipmentModel(Long wcId, Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode) { this.wcId = wcId; this.id = id; @@ -122,6 +125,7 @@ public class MesEquipmentModel implements Serializable { this.areaCode = areaCode; } + //根据条件查询设备所有有效数据-组织模型下拉框及联 queryMesEquipmentList public MesEquipmentModel(Long id, String equipmentNameAndworkCellName, String equipmentCode, String equipmentName, Integer status, String areaCode, String workCenterCode, String workCellCode) { this.id = id; this.equipmentNameAndworkCellName = equipmentNameAndworkCellName; @@ -134,13 +138,13 @@ public class MesEquipmentModel implements Serializable { } - public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + //获取设备分页数据 queryMesEquipmentByPager + public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; this.status = status; this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; this.areaCode = areaCode; this.equipmentType = equipmentType; this.equipmentCategory = equipmentCategory; From fa576d7a6d0cb4fb2c72dc79d179739e2b9b5e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 9 Jan 2020 09:56:40 +0800 Subject: [PATCH 112/139] =?UTF-8?q?=E3=80=906847=20=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=BC=82=E5=B8=B8=E7=9A=84=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E3=80=82=E5=AD=98=E5=9C=A8=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E4=BE=9B=E6=8A=A5=E8=A1=A8=E5=B1=95=E7=A4=BA=E3=80=82=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E5=89=8D=E6=89=80=E6=9C=89=E5=BC=82=E5=B8=B8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=9D=87=E9=9C=80=E5=A4=84=E7=90=86=E5=AE=8C=E6=88=90?= =?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/WmsMoveMaster.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 a4405ea..ec13c1e 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 @@ -159,7 +159,7 @@ public class WmsMoveMaster extends BaseBean { @Transient @ApiParam("总行数") - private Integer itemQty; + private Long itemQty; // @Version // @Column(name = "LOCK_VERSION") @@ -225,10 +225,10 @@ public class WmsMoveMaster extends BaseBean { this.modifyDatetime = modifyDatetime; } - public WmsMoveMaster(Integer itemQty , String transTypeCode , Integer itemStatus){ + public WmsMoveMaster(Long itemQty , String transTypeCode , Integer orderStatus){ this.itemQty = itemQty; this.transTypeCode = transTypeCode; - this.itemStatus = itemStatus; + this.orderStatus = orderStatus; } public Double getTransQty() { From 4e0f40042a55701dbb42a3ea782c8671baad6f62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 9 Jan 2020 11:49:03 +0800 Subject: [PATCH 113/139] =?UTF-8?q?Wms=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/dynamic/WmsSearchElementFunction.java | 11 +++++++++-- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 +++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java index 43cbb23..dd1b7b9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java @@ -25,8 +25,8 @@ import javax.persistence.Table; @Table(name="WMS_SEARCHELEMENT_FUNCTION", indexes = { @Index(columnList = "FUNCTION_ID"), @Index(columnList = "SEARCH_ELEMENT_ID"), - @Index(columnList = "IS_SHARE"), - @Index(columnList = "USER_CODE") + @Index(columnList = "USER_CODE"), + @Index(columnList = "SEARCH_NAME") }) @DynamicInsert @DynamicUpdate @@ -56,7 +56,14 @@ public class WmsSearchElementFunction extends BaseBean { @ApiParam(value = "用户编号") private String userCode; + /** + * 1-共享，2-不共享 + */ @Column(name = "IS_SHARE") @ApiParam(value = "是否共享") private Integer isShare; + + @Column(name = "SEARCH_NAME") + @ApiParam(value = "搜索名称") + private String searchName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 65c25de..cdf4f66 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElementFunction; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; @@ -2727,4 +2729,19 @@ public class WmsHqlPack { getStringBuilderPack(wmsFieldInfo, result); return result; } + + /** + * WMS搜索记录查询条件 + * + * @param searchElementFunction + * @return + */ + public static DdlPackBean packHqlWmsSearchElementRecord(WmsSearchElementFunction searchElementFunction) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getNumEqualPack(searchElementFunction.getFunctionId(), "functionId", result); + DdlPreparedPack.getNumEqualPackOr(searchElementFunction.getIsShare(), "isShare", result); + DdlPreparedPack.getStringEqualPack(searchElementFunction.getUserCode(), "userCode", result); + getStringBuilderPack(searchElementFunction, result); + return result; + } } From ded27853a88cbec2ad9df60584fe735f6ee3feaf Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 9 Jan 2020 13:28:53 +0800 Subject: [PATCH 114/139] =?UTF-8?q?task=20=20=E4=BF=AE=E6=94=B9=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java | 6 +++--- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java index 5bd3895..5db9c07 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java @@ -100,8 +100,8 @@ public class MesProductData extends BaseBean { private String groupNo; @Lob - @Column(name = "TEST_DATA") - @ApiParam("测试json数据") - private String testData; + @Column(name = "LINE_DATA") + @ApiParam("生产数据") + private String lineData; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index fc86e50..35c9d9f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -10,6 +10,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.context.annotation.Lazy; import javax.persistence.*; @@ -107,9 +108,10 @@ public class MesProductData extends BaseBean { private String groupNo; @Json4Es - @Column(name = "TEST_DATA") - @ApiParam("测试json数据") - private String testData; + @Lob + @Column(name = "LINE_DATA") + @ApiParam("生产数据") + private String lineData; @Lob @Transient From 0cc70fe2d059b4ed0a2f376307e6d9e58fcca3d5 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Thu, 9 Jan 2020 18:30:52 +0800 Subject: [PATCH 115/139] =?UTF-8?q?=E3=80=90#1390=20=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE-=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=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/BasCustomer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java index f2a841b..60cabe4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java @@ -30,7 +30,7 @@ public class BasCustomer extends BaseBean { private static final long serialVersionUID = -1980207700343546396L; @Column(name = "CUST_NO") - @ApiParam(value = "客户编号") + @ApiParam(value = "客户编码") private String custNo; @Column(name = "CUST_NAME") @@ -54,7 +54,7 @@ public class BasCustomer extends BaseBean { private String custEmail; @Column(name = "CUST_TEL") - @ApiParam(value = "联系人电话") + @ApiParam(value = "电话号码") private String custTel; @Column(name = "CUST_FAX") From 241350ae83bc08a6aa6f989a8b70707e234fef6a Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 9 Jan 2020 19:18:43 +0800 Subject: [PATCH 116/139] =?UTF-8?q?=E3=80=90=E7=9B=98=E7=82=B9--=E8=B0=83?= =?UTF-8?q?=E5=B7=AE=E5=90=8E=E5=BA=93=E5=AD=98=E5=AF=B9=E4=B8=8D=E4=B8=8A?= =?UTF-8?q?(C202001070020=EF=BC=8CC202001070021)=E3=80=91=E3=80=90bug7314?= =?UTF-8?q?=09=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/WmsCSFactTrans.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index c08e1eb..8b4fda5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -132,12 +132,12 @@ public class WmsCSFactTrans extends BaseBean { * 60=在途,70=已隔离,80=破包,90=冻结,100=作废 */ @Transient - @AnnoOutputColumn(hidden = true) @ApiParam(value = "条码状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer snStatus; @Transient - @AnnoOutputColumn(hidden = true) + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") @ApiParam(value = "条码状态(冻结时)", example = "1") public Integer destSnStatus; From add40a27e31ec102a062c78c63deda271095fa02 Mon Sep 17 00:00:00 2001 From: zcg Date: Thu, 9 Jan 2020 19:28:17 +0800 Subject: [PATCH 117/139] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A138?= =?UTF-8?q?2=EF=BC=8C=E6=95=B0=E6=8D=AE=E7=9B=91=E5=90=AC=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 82 ++++++++++++++++++++++ .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 47 +++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesMonitorTask.java | 50 +++++++++++++ .../pojo/mes/pcn/bean/MesMonitorTaskDetail.java | 46 ++++++++++++ .../repository/MesMonitorTaskDetailRepository.java | 15 ++++ .../pcn/repository/MesMonitorTaskRepository.java | 15 ++++ .../estsh/i3plus/pojo/mes/bean/MesMonitorTask.java | 50 +++++++++++++ .../i3plus/pojo/mes/bean/MesMonitorTaskDetail.java | 51 ++++++++++++++ .../repository/MesMonitorTaskDetailRepository.java | 15 ++++ .../mes/repository/MesMonitorTaskRepository.java | 15 ++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 47 +++++++++++++ 11 files changed, 433 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskRepository.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 2a7e925..4323d3e 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 @@ -3945,4 +3945,86 @@ public class MesEnumUtil { } } + /** + * MesMonitorTask实体对应的status值 监听任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MONITOR_TASK_STATUS { + + NORMAL(10, "正常"), + CLOSE(20, "关闭"); + + private int value; + private String description; + + MONITOR_TASK_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; + } + } + + /** + * 监听任务任务对象类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MONITOR_TASK_OBJECT_TYPE { + + PLC(10, "PLC"), + DB(20, "DB"), + OTHER(30, "其他"); + + private int value; + private String description; + + MONITOR_TASK_OBJECT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 5c3308e..63a107d 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 @@ -2685,4 +2685,51 @@ public class MesPcnEnumUtil { } } + /** + * 监听任务任务对象类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MONITOR_TASK_OBJECT_TYPE { + + PLC(10, "PLC"), + DB(20, "DB"), + OTHER(30, "其他"); + + private int value; + private String description; + + MONITOR_TASK_OBJECT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java new file mode 100644 index 0000000..d3b50c3 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 : zcg + * @Date : 2020/1/8 0008 - 17:11 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_MONITOR_TASK") +@Api("监听任务") +public class MesMonitorTask extends BaseBean { + + @Column(name = "TASK_NO") + @ApiParam("任务编号") + private String taskNo; + + @Column(name = "TASK_NAME") + @ApiParam("任务名称") + private String taskName; + + @Column(name = "TASK_OBJECT_TYPE") + @ApiParam("任务对象类型") + private String taskObjectType; + + @Column(name = "TASK_STATUS") + @ApiParam("任务状态") + private Integer taskStatus; + + @Column(name = "TASK_EXCEPTION_DESC") + @ApiParam("异常描述") + private String taskExceptionDesc; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java new file mode 100644 index 0000000..baa40e9 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 : zcg + * @Date : 2020/1/8 0008 - 17:19 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_MONITOR_TASK_DETAIL") +@Api("监听任务明细") +public class MesMonitorTaskDetail extends BaseBean { + + @Column(name = "TASK_NO") + @ApiParam("任务编号") + private String taskNo; + + @Column(name = "DATA_OBJECT_NO") + @ApiParam("数据对象编号") + private String dataObjectNo; + +// @Column(name = "STORE_OBJECT_CODE") +// @ApiParam("存储对象代码") +// private String storeObjectCode; +// +// @Column(name = "STORE_FIELD_CODE") +// @ApiParam("存储字段代码") +// private String storeFieldCode; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java new file mode 100644 index 0000000..46e8f5d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMonitorTaskDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 18:42 + */ +@Repository +public interface MesMonitorTaskDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java new file mode 100644 index 0000000..f87ff43 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMonitorTask; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 18:43 + */ +@Repository +public interface MesMonitorTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java new file mode 100644 index 0000000..6cfb945 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 17:11 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_MONITOR_TASK") +@Api("监听任务") +public class MesMonitorTask extends BaseBean { + + @Column(name = "TASK_NO") + @ApiParam("任务编号") + private String taskNo; + + @Column(name = "TASK_NAME") + @ApiParam("任务名称") + private String taskName; + + @Column(name = "TASK_OBJECT_TYPE") + @ApiParam("任务对象类型") + private String taskObjectType; + + @Column(name = "TASK_STATUS") + @ApiParam("任务状态") + private Integer taskStatus; + + @Column(name = "TASK_EXCEPTION_DESC") + @ApiParam("异常描述") + private String taskExceptionDesc; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java new file mode 100644 index 0000000..643be95 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java @@ -0,0 +1,51 @@ +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 javax.persistence.Transient; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 17:19 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_MONITOR_TASK_DETAIL") +@Api("监听任务明细") +public class MesMonitorTaskDetail extends BaseBean { + + @Column(name = "TASK_NO") + @ApiParam("任务编号") + private String taskNo; + + @Column(name = "DATA_OBJECT_NO") + @ApiParam("数据对象编号") + private String dataObjectNo; + +// @Column(name = "STORE_OBJECT_CODE") +// @ApiParam("存储对象代码") +// private String storeObjectCode; +// +// @Column(name = "STORE_FIELD_CODE") +// @ApiParam("存储字段代码") +// private String storeFieldCode; + + @Transient + @ApiParam("任务名称") + private String taskName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskDetailRepository.java new file mode 100644 index 0000000..5bd0ae1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskDetailRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesMonitorTaskDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 18:42 + */ +@Repository +public interface MesMonitorTaskDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskRepository.java new file mode 100644 index 0000000..335ca46 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesMonitorTask; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 18:43 + */ +@Repository +public interface MesMonitorTaskRepository 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 7df0f79..aa3623c 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 @@ -2085,6 +2085,7 @@ public class MesHqlPack { /** * JIS发运模式 + * * @param patternJis * @param organizeCode * @return @@ -2106,5 +2107,51 @@ public class MesHqlPack { return packBean; } + /** + * 监听任务查询条件封装 + * + * @param monitorTask + * @param organizeCode + * @return + */ + public static DdlPackBean getMesMonitorTask(MesMonitorTask monitorTask, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(monitorTask.getTaskNo())) { + DdlPreparedPack.getStringLikerPack(monitorTask.getTaskNo(), "taskNo", packBean); + } + if (!StringUtils.isEmpty(monitorTask.getTaskName())) { + DdlPreparedPack.getStringLikerPack(monitorTask.getTaskName(), "taskName", packBean); + } + if (!StringUtils.isEmpty(monitorTask.getTaskObjectType())) { + DdlPreparedPack.getStringEqualPack(monitorTask.getTaskObjectType(), "taskObjectType", packBean); + } + if (!StringUtils.isEmpty(monitorTask.getTaskStatus())) { + DdlPreparedPack.getNumEqualPack(monitorTask.getTaskStatus(), "taskStatus", packBean); + } + if (monitorTask.getIsValid() != null) { + DdlPreparedPack.getNumEqualPack(monitorTask.getIsValid(), "isValid", packBean); + } + return packBean; + } + /** + * 监听任务明细查询条件封装 + * + * @param monitorTaskDetail + * @param organizeCode + * @return + */ + public static DdlPackBean getMesMonitorTaskDetail(MesMonitorTaskDetail monitorTaskDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(monitorTaskDetail.getTaskNo())) { + DdlPreparedPack.getStringLikerPack(monitorTaskDetail.getTaskNo(), "taskNo", packBean); + } + if (!StringUtils.isEmpty(monitorTaskDetail.getDataObjectNo())) { + DdlPreparedPack.getStringLikerPack(monitorTaskDetail.getDataObjectNo(), "dataObjectNo", packBean); + } + if (monitorTaskDetail.getIsValid() != null) { + DdlPreparedPack.getNumEqualPack(monitorTaskDetail.getIsValid(), "isValid", packBean); + } + return packBean; + } } From 51839d7be5beb3733e8d7b740282b83f2da0bdf7 Mon Sep 17 00:00:00 2001 From: jokelone Date: Thu, 9 Jan 2020 20:09:11 +0800 Subject: [PATCH 118/139] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A138?= =?UTF-8?q?1=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 34 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 5 ---- .../i3plus/pojo/mes/model/ActionRequestBean.java | 3 ++ 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 2a7e925..05d0ea7 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,40 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * 动作-module + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_ACTION_MODULE { + WORK_ORDER_LANDED(10, "生产工单下达"); + + private int value; + private String description; + + MES_ACTION_MODULE(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; + } + } + + /** * JIS发运模式类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index 6eea3a5..8d48efd 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -173,8 +173,6 @@ public class MesHqlPack { mesWorkOrder.getCreateDateTimeEnd(), "createDatetime", packBean, true); } - DdlPreparedPack.getOrderDefault(mesWorkOrder); - DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean); return packBean; } @@ -205,9 +203,6 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) { DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean); } - - DdlPreparedPack.getOrderDefault(mesPart); - DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPart.getOrderByParam()}, packBean); return packBean; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java index 944b7fd..3c022ef 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java @@ -32,4 +32,7 @@ public class ActionRequestBean implements Serializable { @ApiParam("Map请求集") public Map resultMap; + + @ApiParam("module代码") + public Integer moduleCode; } From cf92fb2b2345470637867aad804a75c68696e175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 9 Jan 2020 20:16:26 +0800 Subject: [PATCH 119/139] =?UTF-8?q?Wms=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java | 2 +- .../java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java index 0a11f26..9007f92 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java @@ -25,7 +25,7 @@ public class WmsListElementModel extends BaseBean { @ApiParam(value = "用户编号") private String userCode; - @ApiParam(value = "是否默认配置") + @ApiParam(value = "是否默认配置 1-默认，2-自定义") private Integer isDefault; List wmsListElementList; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java index 0056ba7..d554934 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java @@ -34,6 +34,9 @@ public class WmsSearchElementModel extends BaseBean { @ApiParam(value = "是否共享") private Integer isShare; + @ApiParam(value = "搜索名称") + private String searchName; + @ApiParam(value = "Wms查询元素列表") private List searchElementList; } From 29220002b125ffeddcd58e806adba7766d3e917a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 9 Jan 2020 20:55:45 +0800 Subject: [PATCH 120/139] =?UTF-8?q?Wms=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsSearchGroupModel.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java new file mode 100644 index 0000000..22e8533 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : WMS列表搜索model + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 14:33 + * @Modify: + **/ +@Data +public class WmsSearchGroupModel { + + @ApiParam(value = "组列表") + private List searchElementModelList; +} From 7090f30b944c54dc18e7e9b64ddab4aeb33168c0 Mon Sep 17 00:00:00 2001 From: gcj Date: Fri, 10 Jan 2020 13:26:08 +0800 Subject: [PATCH 121/139] =?UTF-8?q?=E3=80=90=E6=8C=89=E8=A7=84=E5=88=99?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=82=AE=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java | 14 +++++++------- .../estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java | 7 +++---- .../estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java | 6 ++++-- 4 files changed, 18 insertions(+), 14 deletions(-) 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 374abd7..823a810 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 @@ -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; /** @@ -33,7 +34,7 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "PUSH_NAME") private String pushName; - @ApiParam("规则类型") + @ApiParam("规则表达式") @Column(name = "QUARTZ_CRON") private String quartzCron; @@ -61,10 +62,12 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "SCRIPT_NO") private String scriptNo; + @Lob @ApiParam("标题模板") @Column(name = "TITLE_TEMPLATE") private String titleTemplate; + @Lob @ApiParam("消息体模板") @Column(name = "CONTENT_TEMPLATE") private String contentTemplate; 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 6a57625..e10dca9 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 @@ -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; /** @@ -29,24 +30,23 @@ import javax.persistence.Table; public class WmsPushLog extends BaseBean{ private static final long serialVersionUID = -1708833666516164845L; - @Column(name = "EXE_HQL") - @ApiParam("执行Hql") - private String exeHql; @Column(name = "PUSH_TITLE") @ApiParam("推送标题") private String pushTitle; + @Lob @Column(name = "PUSH_CONTENT") @ApiParam("推送内容") private String pushContent; @Column(name = "PUSH_TYPE") @ApiParam("推送类型") - private String pushType; + private Integer pushType; + + @Column(name = "PATH_URL") + @ApiParam("推送地址") + private String pathUrl; - @Column(name = "PUSH_RESULT") - @ApiParam("推送结果") - private String pushResult; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java index 6667a49..7c2fd7c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java @@ -2,14 +2,13 @@ package cn.estsh.i3plus.pojo.wms.modelbean; import lombok.Data; +import java.util.List; import java.util.Map; @Data public class MailMessageModel extends PushMessageModel { - - //附加，value 文件的绝对地址/动态模板数据 - private Map attachment; - + //推送数据 + List dataList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java index 1e2ff26..66d8f9f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java @@ -20,6 +20,8 @@ public class PushMessageModel { //推送地址 public String pathUrl; - //推送数据 - List> dataList; + //工厂代码 + private String organizeCode; + + } From 8414af2011d52a1ef2c06db84949d9ffb9a81f3b Mon Sep 17 00:00:00 2001 From: gcj Date: Fri, 10 Jan 2020 13:37:33 +0800 Subject: [PATCH 122/139] =?UTF-8?q?=E3=80=90=E6=8C=89=E8=A7=84=E5=88=99?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=82=AE=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/modelbean/MailMessageModel.java | 2 ++ .../i3plus/pojo/wms/modelbean/PushMessageModel.java | 16 +++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java index 7c2fd7c..28fbe82 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.modelbean; +import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; @@ -9,6 +10,7 @@ import java.util.Map; public class MailMessageModel extends PushMessageModel { //推送数据 + @ApiParam("推送数据集合") List dataList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java index 66d8f9f..8c7abb5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.wms.modelbean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; @@ -9,18 +11,22 @@ import java.util.Map; public class PushMessageModel { - //标题 + @ApiParam("标题") public String title; - //内容 + + @ApiParam("内容") public String content; - //推送类型 + //推送类型-枚举 ：WmsEnumUtil.PUSH_TYPE + @ApiParam("推送类型") public String pushType; - //推送地址 + //推送地址，邮箱以逗号分割 + @ApiParam("推送地址") public String pathUrl; - //工厂代码 + + @ApiParam("工厂代码") private String organizeCode; From 3d7f88d2ee0c4cd0a1ff16fa132e7db55636839f Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 10 Jan 2020 14:19:03 +0800 Subject: [PATCH 123/139] =?UTF-8?q?=E3=80=907201=20=E6=94=B6=E8=B4=A7BOP?= =?UTF-8?q?=E7=A7=BB=E5=BA=93=E6=B5=81=E7=A8=8B=E5=9B=BE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java | 113 +++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/QadItemPacking.java | 91 +++++++++++++++++ .../pojo/wms/repository/QadBopRepository.java | 14 +++ .../wms/repository/QadItemPackingRepository.java | 14 +++ 4 files changed, 232 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadItemPackingRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java new file mode 100644 index 0000000..323ed7b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java @@ -0,0 +1,113 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description : 包材BOM信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-01-09 14:40 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="QAD_BOP") +@Api("包材BOM信息") +public class QadBop implements Serializable { + + private static final long serialVersionUID = 4673217061075875734L; + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name="ID") + @ApiParam(value = "主键",example = "0") + @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + public Long id; + + //get单独处理 + public Long getId() { + if(id != null) { + return id.longValue(); + }else{ + return id; + } + } + + /** + * MonogoDB _id映射 + * @param id + */ + @JSONField(name="_id") + public void setId(Long id) { + this.id = id; + } + + @Column(name="BOP_CODE") + @ApiParam("BOP编号") + public String bopCode; + + @Column(name="BOP_DESC") + @ApiParam("BOP描述") + public String bopDesc; + + @Column(name="BOP_DOMAIN") + @ApiParam("BOP所属Domain") + public String bopDomain; + + @Column(name="PARENT_PART") + @ApiParam("父层级packcode对应的qad零件号") + public String parentPart; + + @Column(name="PARENT_RETURN_PART") + @ApiParam("父层级packcode对应的可回用零件号") + public String parentReturnPart; + + @Column(name="BOPDW_QTY") + @ApiParam("默认1 不考虑") + public String bopdwQty; + + @Column(name="SUB_BOP_CODE") + @ApiParam("子层级packcode代码或者是物料零件号") + public String subBopCode; + + @Column(name="SUB_BOP_PART") + @ApiParam("子层级packcode对应的qad零件号，如果是物料零件这里为空") + public String subBopPart; + + @Column(name="SUB_ITEM_PART") + @ApiParam("子层级packcode对应的可回用零件号，如果是物料零件这里为空") + public String subItemPart; + + @Column(name="SUB_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "该层级在父层级中的个数", example = "0") + public String subQty; + + @Column(name="SUB_UNIT") + @ApiParam("单位") + public String subUnit; + + @Column(name="CREATE_DATE_TIME") + @ApiParam("创建时间") + public String createDateTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java new file mode 100644 index 0000000..82c26a9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description : 零件包装主数据信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-01-09 14:04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="QAD_ITEM_PACKING") +@Api("零件包装主数据信息") +public class QadItemPacking implements Serializable { + + private static final long serialVersionUID = -9204074690166851001L; + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name="ID") + @ApiParam(value = "主键",example = "0") + @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + public Long id; + + //get单独处理 + public Long getId() { + if(id != null) { + return id.longValue(); + }else{ + return id; + } + } + + /** + * MonogoDB _id映射 + * @param id + */ + @JSONField(name="_id") + public void setId(Long id) { + this.id = id; + } + + @Column(name="IN_ADDR") + @ApiParam("收货时是供应商编号，发运时是客户发往地") + public String inAddr; + + @Column(name="IN_BOP_CODE") + @ApiParam("BOP编号") + public String inBopCode; + + @Column(name="IN_DOMAIN") + @ApiParam("所属Domain") + public String inDomain; + + @Column(name="IN_PART") + @ApiParam("物料代码") + public String inPart; + + @Column(name="IN_SITE") + @ApiParam("工厂代码") + public String inSite; + + @Column(name="IN_TRANS_TYPE") + @ApiParam("交易类型") + public String inTransType; + + @Column(name="CREATE_DATE_TIME") + @ApiParam("创建时间") + public String createDateTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java new file mode 100644 index 0000000..f6c8ef8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.QadBop; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-01-09 15:06 + * @Modify: + **/ +public interface QadBopRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadItemPackingRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadItemPackingRepository.java new file mode 100644 index 0000000..21c95ef --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadItemPackingRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.QadItemPacking; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-01-09 15:06 + * @Modify: + **/ +public interface QadItemPackingRepository extends BaseRepository { +} From c24de431d4155caa727e964c185483d4c4528a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 10 Jan 2020 14:40:37 +0800 Subject: [PATCH 124/139] =?UTF-8?q?=E3=80=906853=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=EF=BC=9A=E4=BA=A7=E5=93=81=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8=E3=80=81=E4=BA=A7=E5=93=81=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E8=A1=A8=E3=80=81=E4=BA=A7=E5=93=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=A1=A8=E3=80=82=E5=AE=9A=E6=9C=9F=E8=BF=81=E7=A7=BB=E3=80=82?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.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/WmsDataMigrationConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java index 9038989..34ed123 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java @@ -50,7 +50,7 @@ public class WmsDataMigrationConfig extends BaseBean{ @Column(name="LAST_MRGRATION_QTY") @ApiParam(value = "末次迁移记录数", example = "0") - private Integer LastmMigrationQty; + private Integer lastmMigrationQty; @Column(name="NEXT_EXECUTION_TIME") @ApiParam("下次执行时间") From 51c66e9279e73fcac470045c13fe5f3643c45f84 Mon Sep 17 00:00:00 2001 From: gcj Date: Fri, 10 Jan 2020 15:34:03 +0800 Subject: [PATCH 125/139] =?UTF-8?q?=E3=80=90=E5=AE=81=E5=BE=B7=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=B8=85=E5=8D=95=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/WmsPushConfig.java | 2 ++ 1 file changed, 2 insertions(+) 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 823a810..ef75213 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 @@ -50,10 +50,12 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "SERIAL_NUMBER") private Integer serialNumber; + @Lob @ApiParam("查询Hql") @Column(name = "HQL_STR") private String hqlStr; + @Lob @ApiParam("查询Sql") @Column(name = "SQL_STR") private String sqlStr; From 5c841c706b244c1b1f126680bffdf25ce2fd4102 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 10 Jan 2020 16:16:44 +0800 Subject: [PATCH 126/139] =?UTF-8?q?=E3=80=907201=20=E6=94=B6=E8=B4=A7BOP?= =?UTF-8?q?=E7=A7=BB=E5=BA=93=E6=B5=81=E7=A8=8B=E5=9B=BE=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/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index e618c9d..e24bbf8 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 @@ -2107,7 +2107,8 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum COMMON_SN { PO_SN("PO_SN", "PO条码"), - VDA_SN("VDA_SN", "VDA条码"); + VDA_SN("VDA_SN", "VDA条码"), + SELF_SN("SELF_SN", "自制件条码"); private String code; private String description; From 503f3cd7a3f6c453840300930da88b7aa81e2a93 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 10 Jan 2020 16:27:22 +0800 Subject: [PATCH 127/139] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD=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/BlockReportEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java index 9fc03f1..f012813 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java @@ -286,7 +286,8 @@ public class BlockReportEnumUtil { ECHARTS_PIE(10, "饼图", "实芯饼图"), ECHARTS_BAR(20, "柱状图", "柱状图-向上具状图"), ECHARTS_LINE(30, "折线图", "向右折线条图"), - ECHARTS_TREEMAP(40, "矩形图", "矩形图"); + ECHARTS_TREEMAP(40, "矩形图", "矩形图"), + SELECT_SINGLE(50, "下拉单选", "下拉单选"); private int value; private String name; From 86694d3ceb4aca9ba8f41a49d6f70d5a94e22224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 10 Jan 2020 19:12:15 +0800 Subject: [PATCH 128/139] =?UTF-8?q?Wms=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java index 8ffe833..e9d4ccc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java @@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : WMS搜索元素表 @@ -62,4 +59,8 @@ public class WmsSearchElement extends BaseBean { @Column(name = "USER_CODE") @ApiParam(value = "用户编号") private String userCode; + + private String groupName; + + private String groupConnector; } From c2e66de6384048b95bb5aeaeed986d4d975852b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 10 Jan 2020 19:13:22 +0800 Subject: [PATCH 129/139] =?UTF-8?q?Wms=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java index e9d4ccc..302f426 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java @@ -60,7 +60,13 @@ public class WmsSearchElement extends BaseBean { @ApiParam(value = "用户编号") private String userCode; + /** + * 搜索组名称 + */ private String groupName; + /** + * 搜索组连接符 + */ private String groupConnector; } From 41047a17c1280836d11a26f3a9c35629c9da6622 Mon Sep 17 00:00:00 2001 From: qianhs Date: Sat, 11 Jan 2020 15:36:49 +0800 Subject: [PATCH 130/139] =?UTF-8?q?=E3=80=90=E7=9B=98=E7=82=B9--=E8=B0=83?= =?UTF-8?q?=E5=B7=AE=E5=90=8E=E5=BA=93=E5=AD=98=E5=AF=B9=E4=B8=8D=E4=B8=8A?= =?UTF-8?q?(C202001070020=EF=BC=8CC202001070021)=E3=80=91=E3=80=90bug7314?= =?UTF-8?q?=09=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 3bd0c51..ecc426c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -321,6 +321,15 @@ public class DdlPreparedPack { } /** + * 两个字段不相等 + * + * @param firstColumnName 列名 + * @param packBean + */ + public static void getNotEqueals(String firstColumnName, String twoColumnName, DdlPackBean packBean) { + packBean.addColumnQuery(null, " and UPPER(model." + firstColumnName + ")!= UPPER(model." + twoColumnName+")", null); + } + /** * 封装long或者int的负整数对象成equal语句 * * @param columnName 列名 From 2396863babacaf2a7ff4c868d2f6009d626bc676 Mon Sep 17 00:00:00 2001 From: zcg Date: Mon, 13 Jan 2020 14:15:16 +0800 Subject: [PATCH 131/139] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1:1383=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9B=91=E5=90=AC=E5=AE=9A=E6=97=B6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8A=93=E5=8F=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 70 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesMonitorTask.java | 2 +- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java | 4 ++ .../pojo/mes/pcn/model/DataAcquisitionModel.java | 35 +++++++++++ .../estsh/i3plus/pojo/mes/bean/MesMonitorTask.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 4 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 7 files changed, 116 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 63a107d..a17cee1 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 @@ -2732,4 +2732,74 @@ public class MesPcnEnumUtil { } } + /** + * MesMonitorTask实体对应的status值 监听任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MONITOR_TASK_STATUS { + + NORMAL(10, "正常"), + CLOSE(20, "关闭"); + + private int value; + private String description; + + MONITOR_TASK_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; + } + } + + /** + * 是否解析 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_IS_PARSE { + TRUE(1, "是"), + FALSE(2, "否"); + + private int value; + private String description; + + PLC_IS_PARSE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java index d3b50c3..cba8ef5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java @@ -37,7 +37,7 @@ public class MesMonitorTask extends BaseBean { @Column(name = "TASK_OBJECT_TYPE") @ApiParam("任务对象类型") - private String taskObjectType; + private Integer taskObjectType; @Column(name = "TASK_STATUS") @ApiParam("任务状态") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java index 2f172df..d995e03 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java @@ -96,6 +96,10 @@ public class MesPlc extends BaseBean { @ApiParam("反馈值") private String feedValue; + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + @Transient @ApiParam("设备名称") private String equipmentName; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java new file mode 100644 index 0000000..f70aaaa --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/10 0010 - 15:28 + */ +@Data +@Api("数据采集Model") +public class DataAcquisitionModel { + + @ApiParam("对象代码") + private String objectCode; + + @ApiParam("对象名称") + private String objectName; + + @ApiParam("字段代码") + private String fieldCode; + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("字段值") + private String fieldValue; +// +// @ApiParam("组号") +// private String groupNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java index 6cfb945..166a822 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java @@ -37,7 +37,7 @@ public class MesMonitorTask extends BaseBean { @Column(name = "TASK_OBJECT_TYPE") @ApiParam("任务对象类型") - private String taskObjectType; + private Integer taskObjectType; @Column(name = "TASK_STATUS") @ApiParam("任务状态") 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 5623665..98c4796 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 @@ -98,6 +98,10 @@ public class MesPlc extends BaseBean { @ApiParam("反馈值") private String feedValue; + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + @Transient @ApiParam("设备名称") private String equipmentName; 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 aa3623c..934414c 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 @@ -2123,7 +2123,7 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(monitorTask.getTaskName(), "taskName", packBean); } if (!StringUtils.isEmpty(monitorTask.getTaskObjectType())) { - DdlPreparedPack.getStringEqualPack(monitorTask.getTaskObjectType(), "taskObjectType", packBean); + DdlPreparedPack.getNumEqualPack(monitorTask.getTaskObjectType(), "taskObjectType", packBean); } if (!StringUtils.isEmpty(monitorTask.getTaskStatus())) { DdlPreparedPack.getNumEqualPack(monitorTask.getTaskStatus(), "taskStatus", packBean); From 2eb14492d43029b4bfa696171116efc276926ac5 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 13 Jan 2020 18:49:32 +0800 Subject: [PATCH 132/139] =?UTF-8?q?=E3=80=90=E7=9B=98=E7=82=B9--=E8=B0=83?= =?UTF-8?q?=E5=B7=AE=E5=90=8E=E5=BA=93=E5=AD=98=E5=AF=B9=E4=B8=8D=E4=B8=8A?= =?UTF-8?q?(C202001070020=EF=BC=8CC202001070021)=E3=80=91=E3=80=90bug7314?= =?UTF-8?q?=09=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index d5344c2..ba7a743 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -134,6 +134,11 @@ public class WmsLocate extends BaseBean { this.destBoxQty = destBoxQty; } + public WmsLocate(Integer boxQty , Double partQty,String locateNo){ + this.boxQty=boxQty; + this.partQty=partQty; + this.locateNo=locateNo; + } public Integer getMaxPackageQty() { return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue(); } From 328f2e64c55619c404e2cd16fdda13db927ce3c3 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 13 Jan 2020 18:51:24 +0800 Subject: [PATCH 133/139] =?UTF-8?q?=E3=80=90=E5=90=8C=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=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 | 4 ++++ 1 file changed, 4 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 0e5b1f3..e95da2c 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 @@ -286,6 +286,10 @@ public class WmsStockSn extends BaseBean { @ApiParam("打印模板名称") private String templateName; + @Transient + @ApiParam("是否同批次条码") + private Integer isSameBatch; + public WmsStockSn() { } From 8ef70ed627eee5f79f25d58ae71d37c98a745d5c Mon Sep 17 00:00:00 2001 From: jokelone Date: Mon, 13 Jan 2020 19:35:08 +0800 Subject: [PATCH 134/139] =?UTF-8?q?=E3=80=90=E7=8E=B0=E5=9C=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=9A59=20=E8=BF=87=E7=A8=8B=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/bean/MesQcCheckStandard.java | 11 ++- .../pojo/mes/pcn/model/QcCheckStandardModel.java | 80 ++++++++++++++++++++++ 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java index 9226c3a..6e00f6b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description: @@ -77,10 +78,17 @@ public class MesQcCheckStandard extends BaseBean { @ApiParam("检测项类型") private String checkItemType; + @ApiParam("检测项类型名称") + private String checkItemTypeName; + + @Transient + private List childQcList; + public MesQcCheckStandard() { } - public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) { + public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard + , String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) { this.id = id; this.partNo = partNo; this.workCenterCode = workCenterCode; @@ -92,5 +100,6 @@ public class MesQcCheckStandard extends BaseBean { this.checkFrequency = checkFrequency; this.partName = partName; this.checkItemType = checkItemType; + this.checkItemTypeName = checkItemTypeName; } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java new file mode 100644 index 0000000..b038988 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java @@ -0,0 +1,80 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQcCheckStandard; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2020\1\13 17:23 + * @Modify: + **/ +@Data +public class QcCheckStandardModel { + + private Long id; + + @ApiParam("物料编码") + private String partNo; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("检测类型") + private Integer checkType; + + @ApiParam("检测项") + private String checkItem; + + @ApiParam("检测标准") + private String checkStandard; + + @ApiParam("检测指导") + private String checkGuide; + + @ApiParam("频率") + private String checkFrequency; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("检测结果") + private String checkResult; + + @ApiParam("检测值") + private String checkValue; + + @ApiParam("检测项类型") + private String checkItemType; + + @ApiParam("检测项类型名称") + private String checkItemTypeName; + + private List childQcList; + + public QcCheckStandardModel() { + } + + public QcCheckStandardModel(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard + , String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) { + this.id = id; + this.partNo = partNo; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.checkType = checkType; + this.checkItem = checkItem; + this.checkStandard = checkStandard; + this.checkGuide = checkGuide; + this.checkFrequency = checkFrequency; + this.partName = partName; + this.checkItemType = checkItemType; + this.checkItemTypeName = checkItemTypeName; + } +} From 2d8b55b61a777a0b06c7c9e28beb974325ef94ba Mon Sep 17 00:00:00 2001 From: jokelone Date: Mon, 13 Jan 2020 19:43:50 +0800 Subject: [PATCH 135/139] =?UTF-8?q?=E3=80=90=E7=8E=B0=E5=9C=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=9A59=20=E8=BF=87=E7=A8=8B=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java index 6e00f6b..9c96abd 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java @@ -78,6 +78,7 @@ public class MesQcCheckStandard extends BaseBean { @ApiParam("检测项类型") private String checkItemType; + @Transient @ApiParam("检测项类型名称") private String checkItemTypeName; From 8285c87624dd1783989bc3eb1e9a87c4dd6f06ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Mon, 13 Jan 2020 19:59:33 +0800 Subject: [PATCH 136/139] =?UTF-8?q?Wms=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/annotation/FieldAnnotation.java | 2 + .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 22 ++++--- .../i3plus/pojo/model/wms/WmsFieldInfoModel.java | 6 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 74 +++++++++++----------- .../pojo/wms/bean/dynamic/WmsListElement.java | 4 ++ 5 files changed, 62 insertions(+), 46 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java index 2e2b0a2..6067155 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java @@ -31,4 +31,6 @@ public @interface FieldAnnotation { int isRequire() default 1; // 是否表单字段展示:默认1-显示，2-隐藏 int isShow() default 1; + // 是否跳过本字段扫描 0-不跳过，1-跳过 + int isSkip() default 0; } 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 9c10c6c..c91a810 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 @@ -41,7 +41,7 @@ public abstract class BaseBean implements Serializable { @ApiParam(value = "主键",example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) public Long id; //get单独处理 @@ -64,19 +64,19 @@ public abstract class BaseBean implements Serializable { @Column(name="ORGANIZE_CODE") @ApiParam(value ="组织代码") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) // @AnnoOutputColumn(hidden = true) public String organizeCode; @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) @ApiParam(value = "有效性",example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1) @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) @ApiParam(value = "是否已删除",example = "2") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1) @AnnoOutputColumn(hidden = true) //逻辑删除，软删除 public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA @@ -84,58 +84,64 @@ public abstract class BaseBean implements Serializable { @Column(name="CREATE_USER",updatable = false) @ApiParam(value = "创建用户") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) public String createUser; @Indexed(direction = IndexDirection.DESCENDING) @Column(name="CREATE_DATE_TIME",updatable = false) @ApiParam(value = "创建日期") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) public String createDatetime; @Column(name="MODIFY_USER") @ApiParam(value = "修改人") @AnnoOutputColumn(hidden = true) - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) public String modifyUser; @Column(name="MODIFY_DATE_TIME") @ApiParam(value = "修改日期") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) public String modifyDatetime; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String createDateTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String createDateTimeEnd; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="修改日期查询用，查询起始日期",example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String modifyDateTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "修改日期查询用，查询结束日期",example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String modifyDateTimeEnd; @Transient @ApiParam(value = "排序属性") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String orderByParam = ""; @Transient @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1") @AnnoOutputColumn(hidden = true) - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1) //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc public transient Integer ascOrDesc = 1; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java index ecbf355..8338df3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java @@ -27,8 +27,12 @@ public class WmsFieldInfoModel implements Serializable { @ApiParam(value = "新增数据操作类") private String baseRepository; - public WmsFieldInfoModel (String baseRepository, List wmsFieldInfoList) { + @ApiParam("处理类型") + private int handleType; + + public WmsFieldInfoModel (String baseRepository, int handleType, List wmsFieldInfoList) { this.baseRepository = baseRepository; this.wmsFieldInfoList = wmsFieldInfoList; + this.handleType = handleType; } } 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 748e194..0d4e335 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 @@ -56,170 +56,170 @@ public class WmsPart extends BaseBean { @Column(name = "PART_TYPE_DESC") @ApiParam(value = "物料类型描述") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String partTypeDesc; @Column(name = "GRAPHI_NO") @ApiParam(value = "图号") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String graphiNo; @Column(name = "VERSION") @ApiParam(value = "版本") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String version; @Column(name = "COLOR") @ApiParam(value = "颜色") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String color; @Column(name = "STOCK_UNIT") @ApiParam(value = "库存单位") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String stockUnit; @Column(name = "ABC") @ApiParam(value = "分类") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String abc; @Column(name = "BUY_UNIT") @ApiParam(value = "采购单位") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String buyUnit; @Column(name = "BU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率1", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double bu2su; @Column(name = "PRICE_UNIT") @ApiParam(value = "计价单位") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String priceUnit; @Column(name = "PU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率2", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double pu2su; @Column(name = "SNP", columnDefinition = "decimal(18,8)") @ApiParam(value = "标包", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double snp; @ColumnDefault("2") @Column(name = "IQC") @ApiParam(value = "是否免检", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) private Integer iqc; @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最低库存", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double min; @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最高库存", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double max; @Column(name = "PART_GROUP") @ApiParam(value = "物料组") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String partGroup; @Column(name = "LOT_CHECK_RULE") @ApiParam(value = "批次校验规则") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String lotCheckRule; @Column(name = "SN_CONTROL") @ApiParam(value = "是否条码管理", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) private Integer snControl; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商代码") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorNo; @Column(name = "IN_LOCATE_NO") @ApiParam(value = "默认入库库位") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String inLocateNo; @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String prodCfgTypeCode; @Column(name = "PROD_CFG_TYPE_NAME") @ApiParam("项目名称") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String prodCfgTypeName; @Column(name = "OUT_CLOSE_FLAG") @ApiParam("項目结算标识") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String outCloseFlag = "2"; @Column(name = "OUT_CLOSE_TYPE") @ApiParam("结算方式") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String outCloseType; @Column(name = "OUT_CLOSE_VENDOR") @ApiParam("结算供应商") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String outCloseVendor; @Column(name = "QUALITY_DAYS") @ApiParam("保质期天数") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer qualityDays; @Column(name = "IS_REPORT_PARTNO") @ApiParam("是否报工零件") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) private Integer isReportPartNo; @Column(name = "REPORT_LOCATE_NO") @ApiParam("报工库位") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String reportLocateNo; @Column(name = "REPORT_ZONE_NO") @ApiParam("报工存储区") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String reportZoneNo; @Column(name = "PRODUCT_LINES") @ApiParam("报工产线") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String productLines; @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)") @ApiParam(value = "待质检比例", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double proportion; @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @ApiParam(value = "是否贵重") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description") private Integer isValuable; @Transient @ApiParam("总数量") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty; @Transient @ApiParam("库存水平") @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String stockLevelStatus; @Column(name="verb_num") @@ -227,23 +227,23 @@ public class WmsPart extends BaseBean { private Double verbNum; @Column(name = "IS_PROD_LOT") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) @ApiParam(value = "是否录入生产批次", example = "1") private Integer isProdLot = 2; @Column(name = "PULL_WAY") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) @ApiParam(value = "拉动方式", example = "0") private Integer pullWay = 0; @Column(name = "CYCLE_RQUEST_PERIOD") @ApiParam(value = "循环补货周期", example = "0") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer cycleRquestPeriod = 0; @Column(name = "CYCLE_RQUEST_QTY") @ApiParam(value = "循环补货数量", example = "0") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double cycleRquestQty = 0d; public int getIqcVal(){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java index d654c64..7371f25 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java @@ -77,4 +77,8 @@ public class WmsListElement extends BaseBean { @Column(name = "USER_CODE") @ApiParam(value = "用户编号") private String userCode; + + @Column(name = "FUNCTION_ID") + @ApiParam(value = "功能菜单ID") + private Long functionId; } From 9d744318cd7b02619079c13fbf8ea4f988ca6033 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 13 Jan 2020 21:34:26 +0800 Subject: [PATCH 137/139] =?UTF-8?q?=E3=80=90=E7=9B=98=E7=82=B9--=E8=B0=83?= =?UTF-8?q?=E5=B7=AE=E5=90=8E=E5=BA=93=E5=AD=98=E5=AF=B9=E4=B8=8D=E4=B8=8A?= =?UTF-8?q?(C202001070020=EF=BC=8CC202001070021)=E3=80=91=E3=80=90bug7314?= =?UTF-8?q?=09=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/WmsCSFactTrans.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 8b4fda5..0d4fb51 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -136,7 +136,6 @@ public class WmsCSFactTrans extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer snStatus; - @Transient @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") @ApiParam(value = "条码状态(冻结时)", example = "1") public Integer destSnStatus; From f1afdf92e9d3df1b7801f1430e766eb12346f292 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 13 Jan 2020 22:22:28 +0800 Subject: [PATCH 138/139] =?UTF-8?q?=E3=80=90=E7=9B=98=E7=82=B9--=E8=B0=83?= =?UTF-8?q?=E5=B7=AE=E5=90=8E=E5=BA=93=E5=AD=98=E5=AF=B9=E4=B8=8D=E4=B8=8A?= =?UTF-8?q?(C202001070020=EF=BC=8CC202001070021)=E3=80=91=E3=80=90bug7314?= =?UTF-8?q?=09=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/WmsCSFactTrans.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 0d4fb51..69772a7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -89,7 +89,7 @@ public class WmsCSFactTrans extends BaseBean { @Transient @AnnoOutputColumn(hidden = true) - @ApiParam(value = "剩余数量", example = "1") + @ApiParam(value = "差异数量", example = "1") public Double surplusQty; @Column diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 086e420..b12010a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -122,7 +122,7 @@ public class WmsCSOrderDetails extends BaseBean { public Double factQty; @Transient - @ApiParam(value = "剩余数量", example = "1") + @ApiParam(value = "差异数量", example = "1") @AnnoOutputColumn(hidden = true) public Double surplusQty; From 28587fbb98aca9398d7a0b9b4fee45c79d3b7b00 Mon Sep 17 00:00:00 2001 From: luweihao Date: Tue, 14 Jan 2020 00:01:33 +0800 Subject: [PATCH 139/139] =?UTF-8?q?task=20`1392`=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=B7=A5=E6=AD=A5=20=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/model/StepResult.java | 69 ++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java new file mode 100644 index 0000000..d34c46d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import lombok.Data; + +import java.util.Collection; + +@Data +@Api("工步返回信息") +public class StepResult { + + private boolean isCompleted; + + private T data; + + private Collection dataCollection; + + private String msg; + + public static StepResult getSuccessComplete() { + return new StepResult(true); + } + + public static StepResult getNonComplete() { + return new StepResult(false); + } + + public static StepResult getSuccessComplete(String msg) { + return new StepResult(true, msg); + } + + public static StepResult getNonComplete(String msg) { + return new StepResult(false, msg); + } + + public static StepResult getSuccessData(T data, String msg) { + return new StepResult<>(true, data, msg); + } + + public static StepResult getSuccessData(Collection data, String msg) { + return new StepResult(true, data, msg); + } + + private StepResult() { + } + + private StepResult(boolean isCompleted) { + this.isCompleted = isCompleted; + } + + private StepResult(boolean isCompleted, String msg) { + this.isCompleted = isCompleted; + this.msg = msg; + } + + public StepResult(boolean isCompleted, T data, String msg) { + this.isCompleted = isCompleted; + this.data = data; + this.msg = msg; + } + + public StepResult(boolean isCompleted, Collection dataCollection, String msg) { + this.isCompleted = isCompleted; + this.dataCollection = dataCollection; + this.msg = msg; + } + +}