From 89a45d326b2166df915174460462b98da93d4ecf Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 20 Nov 2020 21:02:19 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E5=90=88=E5=B9=B6test=E4=BB=A3=E7=A0=81?= 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-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..11691be 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..8ef99a3 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..3751cf9 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..a6c1bea 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..0a2f9d4 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 9f5788e..2bf0e5c 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..557548a 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..f10cf39 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..34a7337 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..670eb15 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..ce2dc01 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..b8c9643 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..1d29933 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..284225c 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..7ff16c9 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..353a02b 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..b125cee 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..c9d54a9 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..39f1e2f 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..df01041 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc6131f..0cfb344 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..ae014e9 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-PROD-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 2fd1b8942537d2e5e62e1db96b47ed507ec5d202 Mon Sep 17 00:00:00 2001 From: shun Date: Thu, 17 Dec 2020 13:25:34 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E6=97=A0=E9=94=A1=E5=96=9C=E5=BE=B7WMS?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/modelbean/AutoPickingModel.java | 35 ++++++++++++++++++++ .../pojo/wms/modelbean/MinAndMaxStockModel.java | 37 ++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java new file mode 100644 index 0000000..39decb8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +/** + * @Description : 自动生成领料看板model + * @Author : shun.cui + * @CreateDate : 2020/12/17 10:34 + * @Modify : + **/ +@Data +@Api("自动生成领料看板") +public class AutoPickingModel { + @ApiParam("工厂名") + private String organizeCode; + @ApiParam("计划日期") + private String planDate; + @ApiParam("sap单号") + private String erpSrcNo; + @ApiParam("状态") + private String orderStatus; + @ApiParam("父零件号") + private String partNo; + @ApiParam("简称") + private String partNameRdd; + @ApiParam("完成数量") + private Double printQty; + @ApiParam("总数量") + private Double qty; + @ApiParam("操作时间") + private String modifyDateTime; + @ApiParam("操作人") + private String modifyUser; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java new file mode 100644 index 0000000..642c04d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 最低库存/最高库存 预警看板 Model + * @Author : shun.cui + * @CreateDate : 2020/12/17 10:55 + * @Modify : + **/ +@Data +@Api("最低库存/最高库存预警看板") +public class MinAndMaxStockModel { + @ApiParam("工厂名") + private String organizeCode; + @ApiParam("存储区") + private String zoneNo; + @ApiParam("库位") + private String locateNo; + @ApiParam("零件号") + private String partNo; + @ApiParam("简称") + private String partNameAdd; + @ApiParam("数量") + private Double qty; + @ApiParam("最低库存") + private Double min; + @ApiParam("最高库存") + private Double max; + @ApiParam("件号") + private String partTypeDesc; + @ApiParam("包装规格") + private String snp; + +} From 97e919552ad6b6c4920a9796009000d9d3f0c2fe Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 18 Dec 2020 09:59:27 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E6=8F=8F=E8=BF=B0=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java index d03759d..15c072a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage.java @@ -31,7 +31,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_PACKAGE") -@Api("料箱表") +@Api("包装条码接口表") public class IfPackage extends BaseBean implements Serializable { private static final long serialVersionUID = 9099416791684702129L; From ade905350227a9972a2e18bd91722f85b55e6bae Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Fri, 18 Dec 2020 10:25:21 +0800 Subject: [PATCH 04/17] =?UTF-8?q?13325=2020027--=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E8=BF=BD=E6=BA=AF=E6=8A=A5=E8=A1=A8--=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81=E8=BE=93?= =?UTF-8?q?=E5=85=A5GTB2A268000P1=E7=82=B9=E5=87=BB=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=98=BE=E7=A4=BAGTB2A268000P1A=E7=89=A9?= =?UTF-8?q?=E6=96=99=E7=BC=96=E5=8F=B7=E7=9A=84=E6=95=B0=E6=8D=AE-2020-12-?= =?UTF-8?q?18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 24e0a52..9ce9917 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 @@ -2084,7 +2084,7 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { - DdlPreparedPack.getStringRightLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getPartNo(), "partNo", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { DdlPreparedPack.getStringEqualPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); From c067c671a9348986707c2e9a859ec49eb4883632 Mon Sep 17 00:00:00 2001 From: shun Date: Fri, 18 Dec 2020 10:43:08 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E6=97=A0=E9=94=A1=E5=96=9C=E5=BE=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java index 39decb8..cfac2ee 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/AutoPickingModel.java @@ -19,7 +19,7 @@ public class AutoPickingModel { @ApiParam("sap单号") private String erpSrcNo; @ApiParam("状态") - private String orderStatus; + private int orderStatus; @ApiParam("父零件号") private String partNo; @ApiParam("简称") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java index 642c04d..5c4866a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MinAndMaxStockModel.java @@ -32,6 +32,6 @@ public class MinAndMaxStockModel { @ApiParam("件号") private String partTypeDesc; @ApiParam("包装规格") - private String snp; + private Double snp; } From 23bbde205707f357400ff3eb7d15c61127c6f95d Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Fri, 18 Dec 2020 14:13:03 +0800 Subject: [PATCH 06/17] =?UTF-8?q?13315=2020027-=E8=BF=94=E4=BF=AE=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=BA=8C=E7=BB=B4=E7=A0=81-202012-26?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index ef071db..0847a20 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -115,6 +115,10 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("维修状态名称") private String repairStatusName; + @Transient + @ApiParam("产品二维码") + private String productSn; + public int getRepairStatusVal() { return this.repairStatus == null ? 0 : this.repairStatus; } From 3c6b869821d31881d7a973614aa041dc2f924bcf Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Fri, 18 Dec 2020 14:19:37 +0800 Subject: [PATCH 07/17] =?UTF-8?q?13325=2020027--=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E8=BF=BD=E6=BA=AF=E6=8A=A5=E8=A1=A8--=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81=E8=BE=93?= =?UTF-8?q?=E5=85=A5GTB2A268000P1=E7=82=B9=E5=87=BB=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=98=BE=E7=A4=BAGTB2A268000P1A=E7=89=A9?= =?UTF-8?q?=E6=96=99=E7=BC=96=E5=8F=B7=E7=9A=84=E6=95=B0=E6=8D=AE-2020-12-?= =?UTF-8?q?18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 09faa0d..efd9773 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 @@ -2081,7 +2081,7 @@ public class MesHqlPack { public static DdlPackBean getMesProduceSn(MesProduceSn mesProduceSn, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceSn, organizeCode); if (!StringUtils.isEmpty(mesProduceSn.getWorkOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { DdlPreparedPack.getStringEqualPack(mesProduceSn.getPartNo(), "partNo", packBean); @@ -2093,7 +2093,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesProduceSn.getProductSn(), "productSn", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getWorkCenterCode())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean); } if (mesProduceSn.getSnStatus() != null) { DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); @@ -2102,7 +2102,7 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean); } if (!StringUtils.isEmpty(mesProduceSn.getVinCode())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getVinCode(), "vinCode", packBean); + DdlPreparedPack.getStringEqualPack(mesProduceSn.getVinCode(), "vinCode", packBean); } if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) { DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean); From 419fe3a62e8ab800576f04f6e871d33cbd7fb417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 18 Dec 2020 15:04:02 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E3=80=9013330=2020027--BI=E8=AF=A6?= =?UTF-8?q?=E6=83=85----=E4=BA=A7=E7=BA=BF=E8=BF=90=E8=A1=8C=E6=83=85?= =?UTF-8?q?=E5=86=B5--=E8=AE=A1=E5=88=92=E5=AE=8C=E6=88=90=E7=8E=87?= =?UTF-8?q?=E6=B5=AE=E7=AA=97=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9=E4=BC=98?= =?UTF-8?q?=E5=8C=96--2020-12-18=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java index 17d1089..73a1815 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -20,4 +21,8 @@ public class ProductBiSeriesModel { private String type; @ApiParam("显示的数据") private List data; + @ApiParam("实际数量集合") + private List snQtyList = new ArrayList<>(); + @ApiParam("计划数量集合") + private List planQtyList = new ArrayList<>(); } From ded63e25dbc59a9ba59fad1f77a8d313ec5af24c Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Dec 2020 21:07:54 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E5=9D=A4=E6=B3=B0=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 8ab7b56..1ccf8d2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -278,10 +278,11 @@ public class WmsPOMasterDetails extends BaseBean { this.rcQty = rcQty; } - public WmsPOMasterDetails(String orderNo ,String erpAreaNo,String organizeCode){ + public WmsPOMasterDetails(String orderNo ,String erpAreaNo,String organizeCode, String createDatetime){ this.orderNo = orderNo; this.erpAreaNo = erpAreaNo; this.organizeCode = organizeCode; + this.createDatetime = createDatetime; } public WmsPOMasterDetails( From 6c2569ee924c59c89a06494f4f378cf2b2743050 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 19 Dec 2020 07:02:45 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E7=9B=98=E7=82=B9=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/WmsStockSn.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) 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 4173305..7023c0c 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 @@ -8,8 +8,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -19,6 +17,8 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; import java.util.Date; @@ -923,4 +923,14 @@ public class WmsStockSn extends BaseBean { this.snStatus = snStatus; this.lotNo = lotNo; } + + public WmsStockSn(String organizeCode, String sn, String partNo, String locateNo, String whNo, String zoneNo, String vendorNo) { + this.organizeCode = organizeCode; + this.sn = sn; + this.partNo = partNo; + this.locateNo = locateNo; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.vendorNo = vendorNo; + } } From c016cb734b4bf601613deab66e56a4f7461ca111 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Mon, 21 Dec 2020 14:30:28 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A8=A1=E7=B3=8A?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 efd9773..1c1a2b0 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 @@ -156,10 +156,10 @@ public class MesHqlPack { public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); } if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPartNo(), "partNo", packBean); } if (!StringUtils.isEmpty(mesWorkOrder.getPartNameRdd())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNameRdd(), "partNameRdd", packBean); @@ -177,10 +177,10 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); } if (!StringUtils.isEmpty(mesWorkOrder.getCustOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean); } if (!StringUtils.isEmpty(mesWorkOrder.getPlanOrderNo())) { - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); } if (!StringUtils.isEmpty(mesWorkOrder.getCreateUser())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean); @@ -208,7 +208,7 @@ public class MesHqlPack { mesWorkOrder.getCreateDateTimeEnd(), "createDatetime", packBean, true); } - DdlPreparedPack.getStringLikerPack(mesWorkOrder.getAreaCode(), "areaCode", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getAreaCode(), "areaCode", packBean); DdlPreparedPack.getOrderDefault(mesWorkOrder); return packBean; } From b58904bd949f70cd327bdbe411b032ee9f0ca809 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 21 Dec 2020 17:47:03 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BC=98?= =?UTF-8?q?=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/MesPcnEnumUtil.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/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 574d56d..b2c21d4 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 @@ -355,7 +355,7 @@ public class MesPcnEnumUtil { PCN_LOGOUT(190, "PCN_LOGOUT", ""), UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"), PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""), - PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"), + PCN_SYS_ALL_LANGUAGE_URL(220, "PCN_SYS_ALL_LANGUAGE_URL", "PCN_SYS_ALL_LANGUAGE_URL"), PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"), SYNC_PHOTO_COLLECT_URL(240, "SYNC_PHOTO_COLLECT_URL", "PCN推送图片采集数据至mes"); From 268c04ddf3924593cd1b95e9b0797c8276ddda1b Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 21 Dec 2020 19:38:08 +0800 Subject: [PATCH 13/17] Fix bug#13229 --- .../i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java index e4212d3..143d55d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java @@ -49,4 +49,19 @@ public class WmsCSOrderDetailsModel implements Serializable { @ApiParam("目标库位") public String destLocateNo; + + @ApiParam("应盘人") + public String detailsCreateUser; + + @ApiParam("应盘时间") + public String detailsCreateDatetime; + + @ApiParam("实盘人") + public String factCreateUser; + + @ApiParam("实盘时间") + public String factCreateDatetime; + + + } From 05dca352dd6ccc472161a614f2b962ba9f41de39 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 22 Dec 2020 13:14:21 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=B1=A5=E5=8E=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java index 704035a..1c6e43c 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java @@ -53,4 +53,15 @@ public class SwebPurchaseChangeLog extends BaseBean { @Column(name = "REMARK") @ApiParam("备注") private String remark; + + public SwebPurchaseChangeLog() { + + } + + public SwebPurchaseChangeLog(Integer itemStatus, String remark, String modifyDatetime, String modifyUser) { + this.itemStatus = itemStatus; + this.remark = remark; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + } } From 6e5ea4462f461c9ea9c7f6c6f59235994b7f4c6e Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 22 Dec 2020 14:34:29 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E5=90=88=E5=B9=B6master=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= 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-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 11691be..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 8ef99a3..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 3751cf9..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index a6c1bea..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 0a2f9d4..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 2bf0e5c..9f5788e 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 557548a..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index f10cf39..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 34a7337..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 670eb15..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ce2dc01..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index b8c9643..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 1d29933..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 284225c..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 7ff16c9..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 353a02b..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index b125cee..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index c9d54a9..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 39f1e2f..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index df01041..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index a18cef1..f611147 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index ae014e9..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-PROD-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 72d9f64a685e35849ab29cae114640137de64b27 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 22 Dec 2020 14:43:43 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E5=90=88=E5=B9=B6test=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..268eaf2 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 60ef8f3b96fb16e173bfe33b8a9a4bf55d556a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 25 Dec 2020 13:50:37 +0800 Subject: [PATCH 17/17] =?UTF-8?q?feat(sms):=E5=B9=B3=E5=8F=B0=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 165 ++++++++++++++++++++- .../i3plus/pojo/base/tool/DdlPreparedPack.java | 12 ++ .../i3plus/pojo/model/common/ImppSmsContent.java | 38 +++++ .../pojo/platform/bean/SysSmsSendRecord.java | 128 ++++++++++++++++ .../i3plus/pojo/platform/bean/SysSmsSign.java | 54 +++++++ .../i3plus/pojo/platform/bean/SysSmsTemplate.java | 101 +++++++++++++ .../repository/SysSmsSendRecordRepository.java | 14 ++ .../platform/repository/SysSmsSignRepository.java | 14 ++ .../repository/SysSmsTemplateRepository.java | 14 ++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 157 +++++++++++++++----- 10 files changed, 661 insertions(+), 36 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppSmsContent.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSign.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSendRecordRepository.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSignRepository.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsTemplateRepository.java 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 c18a856..017b3c5 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 @@ -1081,7 +1081,8 @@ public class ImppEnumUtil { BASIS(5, "基础"), CONFIG(6, "系统配置"), LOG(7, "日志配置"), - WORK_WECHAT(8, "企业微信配置"); + WORK_WECHAT(8, "企业微信配置"), + SMS(9, "短信配置"); private int value; private String description; @@ -1471,4 +1472,166 @@ public class ImppEnumUtil { return null; } } + + /** + * 短信供应商 + */ + public enum SMS_SUPPLIER { + + ALI_CLOUD(1, "阿里云"); + + private int value; + private String description; + + SMS_SUPPLIER() { + } + + SMS_SUPPLIER(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 SMS_SUPPLIER valueOf(int val) { + SMS_SUPPLIER tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i]; + } + } + return tmp; + } + } + + /** + * 短信模板状态 + */ + public enum SMS_TEMPLATE_STATUS { + VER_CODE(10, "审核中"), + NOTICE_SMS(20, "审核通过"), + PROMOTE_SMS(30, "审核失败"); + + private int value; + private String description; + + SMS_TEMPLATE_STATUS() { + } + + SMS_TEMPLATE_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; + } + } + + /** + * 短信模板类型 + */ + public enum SMS_TEMPLATE_TYPE { + VER_CODE(10, "验证码"), + NOTICE_SMS(20, "短信通知"), + PROMOTE_SMS(30, "推广短信"), + INTL_SMS(40, "国际/港澳台消息"); + + private int value; + private String description; + + SMS_TEMPLATE_TYPE() { + } + + SMS_TEMPLATE_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 enum SMS_SEND_STATUS { + WAIT_RECEIPT(10, "等待回执"), + FAIL(20, "发送失败"), + SUCCESS(30, "发送成功"); + + private int value; + private String description; + + SMS_SEND_STATUS() { + } + + SMS_SEND_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; + } + } } 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 8daabbc..eaafc21 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 @@ -294,6 +294,18 @@ public class DdlPreparedPack { } /** + * 不建议使用该方法，仅在特殊情况下使用。 + * 如sqlserver库中不允许对长数据字段进行=判断，可使用like替换 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikeEqualPack(String val, String columnName, DdlPackBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val); + } + } + + /** * 封装String对象成不等于语句 * * @param columnName 列名 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppSmsContent.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppSmsContent.java new file mode 100644 index 0000000..eb94499 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppSmsContent.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.model.common; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Map; + +/** + * @Description : Impp短信内容 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-24 20:31 + * @Modify: + **/ +@Data +@ApiModel("Impp短信内容") +public class ImppSmsContent implements Serializable { + + private static final long serialVersionUID = 3329812596753451793L; + + @ApiModelProperty(value = "软件模块") + private Integer softType; + + @ApiModelProperty(value = "接收手机号") + private String receivePhoneNumber; + + @ApiModelProperty(value = "短信签名代码") + private String smsSignCode; + + @ApiModelProperty(value = "模板代码") + private String templateCode; + + @ApiModelProperty(value = "短信参数") + private Map paramMap; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java new file mode 100644 index 0000000..64f297f --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSendRecord.java @@ -0,0 +1,128 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-13 16:13 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "SYS_SMS_SEND_RECORD") +@ApiModel(value = "短信发送记录", description = "短信发送记录") +public class SysSmsSendRecord extends BaseBean { + + private static final long serialVersionUID = -3745690058553350416L; + + /** + * 发送回执ID + */ + @Column(name = "BIZ_ID") + @ApiModelProperty(value = "回执id") + private String bizId; + + /** + * 软件模块 + */ + @Column(name = "SOFT_TYPE") + @ApiModelProperty(value = "软件模块") + private Integer softType; + + /** + * 接收手机号 + */ + @Column(name = "RECEIVE_PHONE_NUMBER") + @ApiModelProperty(value = "接收手机号") + private String receivePhoneNumber; + + /** + * 模板代码 + */ + @Column(name = "TEMPLATE_CODE") + @ApiModelProperty(value = "模板代码") + private String templateCode; + + /** + * 模板名称 + */ + @Column(name = "TEMPLATE_NAME") + @ApiModelProperty(value = "模板名称") + private String templateName; + + /** + * 短信签名代码 + */ + @Column(name = "SMS_SIGN_CODE") + @ApiModelProperty(value = "短信签名代码") + private String smsSignCode; + + /** + * 短信签名 + */ + @Column(name = "SMS_SIGN") + @ApiModelProperty(value = "短信签名") + private String smsSign; + + /** + * 短信内容 + */ + @Column(name = "SMS_CONTENT") + @ApiModelProperty(value = "短信内容") + private String smsContent; + + /** + * 短信内容 + */ + @Column(name = "SMS_Param", length = 1000) + @ApiModelProperty(value = "短信参数") + private String smsParam; + + /** + * 短信发送状态 + */ + @AnnoOutputColumn(refClass = ImppEnumUtil.SMS_SEND_STATUS.class) + @Column(name = "SMS_SEND_STATUS") + @ApiModelProperty(value = "短信发送状态") + private Integer smsSendStatus; + + /** + * 短信发送时间 + */ + @Column(name = "SEND_DATE_TIME") + @ApiModelProperty(value = "短信发送时间") + private String sendDateTime; + + /** + * 短信接收日期和时间 + */ + @Column(name = "RECEIVE_DATE_TIME") + @ApiModelProperty(value = "短信接收日期和时间") + private String receiveDateTime; + + /** + * 短信发送异常信息 + */ + @Lob + @Column(name = "SEND_ERR_MSG") + @ApiModelProperty(value = "短信发送异常信息") + private String sendErrMsg; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSign.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSign.java new file mode 100644 index 0000000..e3a4ef8 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsSign.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 短信签名 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-13 16:09 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "SYS_SMS_SIGN") +@ApiModel(value = "短信签名", description = "短信签名") +public class SysSmsSign extends BaseBean { + + private static final long serialVersionUID = -8979657974497978428L; + + /** + * 签名 + */ + @Column(name = "SIGN_NAME") + @ApiModelProperty(value = "签名") + private String signName; + + /** + * 签名代码 + */ + @Column(name = "SIGN_CODE") + @ApiModelProperty(value = "签名代码") + private String signCode; + + /** + * 签名描述 + */ + @Column(name = "SIGN_DESC") + @ApiModelProperty(value = "签名描述") + private String signDesc; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java new file mode 100644 index 0000000..c298f3e --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysSmsTemplate.java @@ -0,0 +1,101 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : 短信模板 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-13 16:11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "SYS_SMS_TEMPLATE") +@ApiModel(value = "短信模板", description = "短信模板") +public class SysSmsTemplate extends BaseBean { + + private static final long serialVersionUID = -3879367761511016412L; + + /** + * 模板名称 + */ + @Column(name = "TEMPLATE_NAME") + @ApiModelProperty(value = "模板名称") + private String templateName; + + /** + * 模板代码 + */ + @Column(name = "TEMPLATE_CODE") + @ApiModelProperty(value = "模板代码") + private String templateCode; + + /** + * 模板代码 + */ + @Column(name = "SUPPLIER_TEMPLATE_CODE") + @ApiModelProperty(value = "模板代码") + private String supplierTemplateCode; + + /** + * 模板类型 + */ + @Column(name = "TEMPLATE_TYPE") + @ApiModelProperty(value = "模板类型") + private Integer templateType; + + /** + * 供应商类型 + */ + @Column(name = "SUPPLIER_TYPE") + @ApiModelProperty(value = "供应商类型") + private Integer supplierType; + + /** + * 模板状态 + */ + @Column(name = "TEMPLATE_STATUS") + @ApiModelProperty(value = "模板状态") + @AnnoOutputColumn(refClass = ImppEnumUtil.SMS_TEMPLATE_STATUS.class) + private Integer templateStatus; + + /** + * 模板内容 + */ + @Column(name = "TEMPLATE_CONTENT") + @ApiModelProperty(value = "模板内容") + private String templateContent; + + /** + * 模板描述 + */ + @Column(name = "TEMPLATE_DESC") + @ApiModelProperty(value = "模板描述") + private String templateDesc; + + + /** + * 审批备注 + */ + @Transient + @ApiModelProperty(value = "审批备注") + private String reason; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSendRecordRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSendRecordRepository.java new file mode 100644 index 0000000..2ea1dd5 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSendRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysSmsSendRecord; + +/** + * @Description : 短信发送记录 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-14 17:52 + * @Modify: + **/ +public interface SysSmsSendRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSignRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSignRepository.java new file mode 100644 index 0000000..0e1adaf --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsSignRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysSmsSign; + +/** + * @Description : 短信签名 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-14 17:51 + * @Modify: + **/ +public interface SysSmsSignRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsTemplateRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsTemplateRepository.java new file mode 100644 index 0000000..94d50ba --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysSmsTemplateRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysSmsTemplate; + +/** + * @Description : 短信模板 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-12-14 17:52 + * @Modify: + **/ +public interface SysSmsTemplateRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 694c194..b5b3a86 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -584,11 +584,11 @@ public class CoreHqlPack { DdlPreparedPack.getNumEqualPack(user.getUserStatus(), "userStatus", result); // DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); - DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); - DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result); - DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); - DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); - DdlPreparedPack.getStringLikerPack(user.getUserEmpNo(),"userEmpNo",result); + DdlPreparedPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", result); + DdlPreparedPack.getStringLikerPack(user.getUserName(), "userName", result); + DdlPreparedPack.getStringLikerPack(user.getUserEmail(), "userEmail", result); + DdlPreparedPack.getStringLikerPack(user.getUserPhone(), "userPhone", result); + DdlPreparedPack.getStringLikerPack(user.getUserEmpNo(), "userEmpNo", result); // DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); DdlPreparedPack.getInPackList(idList, "id", result); @@ -1143,66 +1143,68 @@ public class CoreHqlPack { return ddlPackBean; } - public static DdlPackBean packHqlSysTaskPlanOnly(SysTaskPlan sysTaskPlan){ + public static DdlPackBean packHqlSysTaskPlanOnly(SysTaskPlan sysTaskPlan) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysTaskPlan); - DdlPreparedPack.getNumEqualPack(sysTaskPlan.getId(),"id",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysTaskPlan.getName(),"name",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysTaskPlan.getGroupName(),"groupName",ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysTaskPlan.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysTaskPlan.getName(), "name", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysTaskPlan.getGroupName(), "groupName", ddlPackBean); return ddlPackBean; } - public static DdlPackBean packHqlSysUserCustomizeConfigOnly(SysUserCustomizeConfig sysUserCustomizeConfig){ + + public static DdlPackBean packHqlSysUserCustomizeConfigOnly(SysUserCustomizeConfig sysUserCustomizeConfig) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysUserCustomizeConfig); - DdlPreparedPack.getNumNOEqualPack(sysUserCustomizeConfig.getId(),"id",ddlPackBean); - DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(),"userId",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(),"configKey",ddlPackBean); - DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(),"customizeConfigType",ddlPackBean); + DdlPreparedPack.getNumNOEqualPack(sysUserCustomizeConfig.getId(), "id", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(), "userId", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(), "configKey", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(), "customizeConfigType", ddlPackBean); return ddlPackBean; } - public static DdlPackBean packHqlGetSysUserCustomizeConfig(SysUserCustomizeConfig sysUserCustomizeConfig){ + public static DdlPackBean packHqlGetSysUserCustomizeConfig(SysUserCustomizeConfig sysUserCustomizeConfig) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysUserCustomizeConfig); - DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(),"userId",ddlPackBean); - DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(),"configKey",ddlPackBean); - DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(),"customizeConfigType",ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(), "userId", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(), "configKey", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(), "customizeConfigType", ddlPackBean); return ddlPackBean; } - public static DdlPackBean packHqlQuerySysLogUserLogin(SysLogUserLogin sysLogUserLogin){ + public static DdlPackBean packHqlQuerySysLogUserLogin(SysLogUserLogin sysLogUserLogin) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysLogUserLogin); - DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginStatus(),"logLoginStatus",ddlPackBean); - DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginPlatform(),"logLoginPlatform",ddlPackBean); - DdlPreparedPack.getStringLikerPack(sysLogUserLogin.getLogLoginName(),"logLoginName",ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginStatus(), "logLoginStatus", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginPlatform(), "logLoginPlatform", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysLogUserLogin.getLogLoginName(), "logLoginName", ddlPackBean); DdlPreparedPack.getStringLikerPack(sysLogUserLogin.getLogLoginHost(), "logLoginHost", ddlPackBean); DdlPreparedPack.timeBuilder(sysLogUserLogin.getLogLoginDateTime(), "logLoginDateTime", ddlPackBean, false, true); return ddlPackBean; } - public static DdlPackBean packHqlFindUserIdByExternalRef(Integer externalRef,List valueList){ + public static DdlPackBean packHqlFindUserIdByExternalRef(Integer externalRef, List valueList) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(externalRef,"externalRef",ddlPackBean); - DdlPreparedPack.getInPackList(valueList,"valueList",ddlPackBean); + DdlPreparedPack.getNumEqualPack(externalRef, "externalRef", ddlPackBean); + DdlPreparedPack.getInPackList(valueList, "valueList", ddlPackBean); return ddlPackBean; } - public static DdlPackBean packHqlFindExternalRefByUserId(Integer externalRef,List userIdList){ + + public static DdlPackBean packHqlFindExternalRefByUserId(Integer externalRef, List userIdList) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(externalRef,"externalRef",ddlPackBean); - DdlPreparedPack.getInPackList(userIdList,"userId",ddlPackBean); + DdlPreparedPack.getNumEqualPack(externalRef, "externalRef", ddlPackBean); + DdlPreparedPack.getInPackList(userIdList, "userId", ddlPackBean); return ddlPackBean; } - public static DdlPackBean packHqlGetSysRefUserExternal(SysRefUserExternal sysRefUserExternal){ + public static DdlPackBean packHqlGetSysRefUserExternal(SysRefUserExternal sysRefUserExternal) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysRefUserExternal); DdlPreparedPack.getNumEqualPack(sysRefUserExternal.getUserId(), "userId", ddlPackBean); @@ -1213,7 +1215,7 @@ public class CoreHqlPack { } - public static DdlPackBean packHqlQuerySysSoftUpdateRecord(SysSoftUpdateRecord sysSoftUpdateRecord){ + public static DdlPackBean packHqlQuerySysSoftUpdateRecord(SysSoftUpdateRecord sysSoftUpdateRecord) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSoftUpdateRecord); DdlPreparedPack.getNumEqualPack(sysSoftUpdateRecord.getSystemSoftType(), "systemSoftType", ddlPackBean); @@ -1224,7 +1226,7 @@ public class CoreHqlPack { return ddlPackBean; } - public static DdlPackBean packHqlCheckSysSoftUpdateRecordOnly(SysSoftUpdateRecord sysSoftUpdateRecord){ + public static DdlPackBean packHqlCheckSysSoftUpdateRecordOnly(SysSoftUpdateRecord sysSoftUpdateRecord) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSoftUpdateRecord); DdlPreparedPack.getNumNOEqualPack(sysSoftUpdateRecord.getId(), "id", ddlPackBean); @@ -1235,20 +1237,105 @@ public class CoreHqlPack { } - public static DdlPackBean packHqlCheckSysDepartmentOnly(SysDepartment sysDepartment){ + public static DdlPackBean packHqlCheckSysDepartmentOnly(SysDepartment sysDepartment) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysDepartment); DdlPreparedPack.getNumNOEqualPack(sysDepartment.getId(), "id", ddlPackBean); - DdlPreparedPack.getNumEqualPack(sysDepartment.getDepartmentCode(), "departmentCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysDepartment.getDepartmentCode(), "departmentCode", ddlPackBean); return ddlPackBean; } - public static DdlPackBean packHqlCheckSysOrganizeOnly(SysOrganize sysOrganize){ + public static DdlPackBean packHqlCheckSysOrganizeOnly(SysOrganize sysOrganize) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysOrganize); DdlPreparedPack.getNumNOEqualPack(sysOrganize.getId(), "id", ddlPackBean); - DdlPreparedPack.getNumEqualPack(sysOrganize.getOrganizeCode(), "organizeCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysOrganize.getOrganizeCode(), "organizeCode", ddlPackBean); + + return ddlPackBean; + } + + /** + * 封装检查短信签名唯一hql + * + * @param sysSmsSign 短信签名信息 + * @return 封装信息 + */ + public static DdlPackBean packHqlCheckSysSmsSignOnly(SysSmsSign sysSmsSign) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsSign); + + DdlPreparedPack.getNumNOEqualPack(sysSmsSign.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysSmsSign.getSignCode(), "signCode", ddlPackBean); + + return ddlPackBean; + } + + /** + * 封装短信签名查询hql + * + * @param sysSmsSign 短信签名信息 + * @return 封装信息 + */ + public static DdlPackBean packHqlFindSysSmsSign(SysSmsSign sysSmsSign) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsSign); + + DdlPreparedPack.getStringLikerPack(sysSmsSign.getSignCode(), "signCode", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysSmsSign.getSignName(), "signName", ddlPackBean); + + return ddlPackBean; + } + + /** + * 封装检查短信模板唯一hql + * + * @param sysSmsTemplate 短信模板信息 + * @return 封装信息 + */ + public static DdlPackBean packHqlCheckSysSmsTemplateOnly(SysSmsTemplate sysSmsTemplate) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsTemplate); + + DdlPreparedPack.getNumNOEqualPack(sysSmsTemplate.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysSmsTemplate.getTemplateCode(), "templateCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysSmsTemplate.getTemplateName(), "templateName", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsTemplate.getTemplateType(), "templateType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsTemplate.getTemplateStatus(), "templateStatus", ddlPackBean); + + return ddlPackBean; + } + + /** + * 封装短信模板查询hql + * + * @param sysSmsTemplate 短信模板信息 + * @return 封装信息 + */ + public static DdlPackBean packHqlFindSysSmsTemplate(SysSmsTemplate sysSmsTemplate) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsTemplate); + + DdlPreparedPack.getStringLikerPack(sysSmsTemplate.getTemplateCode(), "templateCode", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysSmsTemplate.getTemplateName(), "templateName", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsTemplate.getTemplateType(), "templateType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsTemplate.getTemplateStatus(), "templateStatus", ddlPackBean); + + return ddlPackBean; + } + + /** + * 封装短信发送记录查询hql + * + * @param sysSmsSendRecord 短信发送记录 + * @return 封装信息 + */ + public static DdlPackBean packHqlFindSysSmsSendRecord(SysSmsSendRecord sysSmsSendRecord) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysSmsSendRecord); + + DdlPreparedPack.getStringLikerPack(sysSmsSendRecord.getTemplateCode(), "templateCode", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysSmsSendRecord.getTemplateName(), "templateName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysSmsSendRecord.getReceivePhoneNumber(), "receivePhoneNumber", ddlPackBean); + DdlPreparedPack.getStringLikerPack(sysSmsSendRecord.getBizId(), "bizId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsSendRecord.getSoftType(), "softType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysSmsSendRecord.getSmsSendStatus(), "smsSendStatus", ddlPackBean); + DdlPreparedPack.timeBuilder(sysSmsSendRecord.getSendDateTime(), "smsSendStatus", ddlPackBean,false,true); return ddlPackBean; }