From 6061f89d43525d02e18e878efddf1093b181b4d8 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 3 Jun 2020 11:34:50 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..11691be 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..8ef99a3 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 807bef5..577686d 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b948580..f714b7d 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index e12eaee..b7991cc 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index c338f71..0648e9f 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..f10cf39 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 7637865..3b9e57a 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d98b7d8..b1911ec 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index bf96e57..56d54cb 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index a758a6a..830caa5 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index efacfd2..fb51da0 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index dba12cc..78bbdef 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 81670b2..fb44d00 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26a7311..dc4ea86 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index eaf2544..8571a5f 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 0f615b6..e36258d 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 9e5f745..9915420 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 0fea52b..61027b2 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc8fce6..c2104bf 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 0727370002a06958deec661d56e62424abf53803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 3 Jun 2020 17:31:13 +0800 Subject: [PATCH 02/25] =?UTF-8?q?8660=20MES-202005-PCN=E9=A6=96=E6=A3=80?= =?UTF-8?q?=E3=80=81=E5=B7=A1=E6=A3=80=E9=9C=80=E8=A6=81=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E4=BA=A7=E5=93=81=E6=9D=A1=E7=A0=81=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E6=A3=80=E6=B5=8B=E5=80=BC-20200527?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 26afb75..5dd373d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -116,4 +116,8 @@ public class MesQcOrder extends BaseBean implements Serializable { @Transient private String mesWorkNo; + @Transient + @ApiParam("产品条码") + private String productSn; + } From 6232d14e6184ca7c350aa4d64bab63b76bb9ec96 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 4 Jun 2020 11:44:14 +0800 Subject: [PATCH 03/25] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A2066=EF=BC=8C?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9C=BA=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonRouteStatus.java | 12 ---- .../andon/bean/AndonRouteStatusErrorRecord.java | 10 --- .../i3plus/pojo/andon/model/CommonMsgModel.java | 3 - .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 71 +++++++++------------- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 52 ---------------- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 52 ---------------- .../estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java | 13 ---- .../pojo/ptl/bean/PtlRouteStatusErrorRecord.java | 10 --- .../i3plus/pojo/ptl/model/CommonMsgModel.java | 3 - .../estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java | 10 +++ 10 files changed, 40 insertions(+), 196 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java index c74a432..bf2755c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java @@ -85,10 +85,6 @@ public class AndonRouteStatus extends BaseBean implements Serializable { private Long alarmRouteId; @Transient - @ApiParam("状态机异常时默认不缓存") - private boolean cacheFlag = false; - - @Transient @ApiParam("当前状态点的触发组件集默认未执行") private boolean actionAmgIdFalg = false; @@ -100,12 +96,4 @@ public class AndonRouteStatus extends BaseBean implements Serializable { @ApiParam("每个组件执行完成根据业务设置下个触发事件，如果需要外部告知下个触发事件则设置null，一个组件集执行完毕后将这个值赋给CommonMsgModel的triggerEvent") private String nextTriggerEvent; - @Transient - @ApiParam("在一个组件集中默认继续执行下一个组件，当组件集中一个组件执行失败或者根据业务需要跳出去进去下个状态点，则设置未false(即这个组件集中剩余的组件停止执行),同时配置下个状态点的触发事件nextTriggerEvent") - private boolean execNextModuleFlag = true; - - @Transient - @ApiParam("默认异常未处理，业务异常抛出后，如果需要缓存，则设置cacheFlag为true，因为会被catch捕获，所以这里需要设置为true，避免异常重复被处理") - private boolean doErrorFlag = false; - } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java index 153b1ad..a71f88e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.andon.bean; - import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -17,7 +16,6 @@ import java.io.Serializable; * @date 2020/2/12 17:41 * @desc */ - @Data @Entity @DynamicInsert @@ -61,18 +59,10 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl @ApiParam(value = "安灯来源类型") private String sourceType; - @Column(name = "CACHE_FLAG") - @ApiParam(value = "缓存标识") - private Integer cacheFlag; - @Column(name = "CACHE_KEY") @ApiParam(value = "缓存KEY") private String cacheKey; - @Column(name = "HANDLE_TYPE") - @ApiParam(value = "处理方式") - private Integer handleType; - @Column(name = "HANDLE_STATUS") @ApiParam(value = "处理状态") private Integer handleStatus; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java index 8efdfa3..c677396 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java @@ -42,9 +42,6 @@ public class CommonMsgModel implements Serializable { @ApiModelProperty("触发事件") private String triggerEvent; - @ApiModelProperty("缓存KEY") - private String cacheKey; - @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true") private boolean errorInnerAction = false; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index b30f6cd..b56e7c1 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -1,46 +1,6 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; -import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule; -import cn.estsh.i3plus.pojo.andon.bean.AndonActionModuleParam; -import cn.estsh.i3plus.pojo.andon.bean.AndonActionRoute; -import cn.estsh.i3plus.pojo.andon.bean.AndonActor; -import cn.estsh.i3plus.pojo.andon.bean.AndonActorRule; -import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause; -import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmDetailType; -import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmResponseCfg; -import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRoute; -import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType; -import cn.estsh.i3plus.pojo.andon.bean.AndonBroadCast; -import cn.estsh.i3plus.pojo.andon.bean.AndonBroadCastCfg; -import cn.estsh.i3plus.pojo.andon.bean.AndonCellAlarmCause; -import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventCause; -import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventMethod; -import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventPhenomenon; -import cn.estsh.i3plus.pojo.andon.bean.AndonCellGroupCfg; -import cn.estsh.i3plus.pojo.andon.bean.AndonConfig; -import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalCfg; -import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalMaintenCfg; -import cn.estsh.i3plus.pojo.andon.bean.AndonEventCause; -import cn.estsh.i3plus.pojo.andon.bean.AndonEventMethod; -import cn.estsh.i3plus.pojo.andon.bean.AndonEventPhenoMenon; -import cn.estsh.i3plus.pojo.andon.bean.AndonHaltCfg; -import cn.estsh.i3plus.pojo.andon.bean.AndonHaltType; -import cn.estsh.i3plus.pojo.andon.bean.AndonKnowledgeBase; -import cn.estsh.i3plus.pojo.andon.bean.AndonManageQueue; -import cn.estsh.i3plus.pojo.andon.bean.AndonManageRecord; -import cn.estsh.i3plus.pojo.andon.bean.AndonMessageRecord; -import cn.estsh.i3plus.pojo.andon.bean.AndonMessageType; -import cn.estsh.i3plus.pojo.andon.bean.AndonPLC; -import cn.estsh.i3plus.pojo.andon.bean.AndonQueueAttach; -import cn.estsh.i3plus.pojo.andon.bean.AndonResponse; -import cn.estsh.i3plus.pojo.andon.bean.AndonResponseObject; -import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRoute; -import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRouteDetail; -import cn.estsh.i3plus.pojo.andon.bean.MesArea; -import cn.estsh.i3plus.pojo.andon.bean.MesEquipment; -import cn.estsh.i3plus.pojo.andon.bean.MesShift; -import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell; -import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter; +import cn.estsh.i3plus.pojo.andon.bean.*; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -1086,6 +1046,12 @@ public class AndonHqlPack { return packBean; } + /** + * 作业流程 + * @param actionRoute + * @param organizeCode + * @return + */ public static DdlPackBean packHqlAndonActionRoute(AndonActionRoute actionRoute, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(actionRoute, organizeCode); DdlPreparedPack.getStringLikerPack(actionRoute.getRouteCode(), "routeCode", packBean); @@ -1094,6 +1060,12 @@ public class AndonHqlPack { return packBean; } + /** + * 安灯作业流程配置 + * @param alarmRoute + * @param organizeCode + * @return + */ public static DdlPackBean packHqlAndonAlarmRoute(AndonAlarmRoute alarmRoute, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(alarmRoute, organizeCode); DdlPreparedPack.getStringLikerPack(alarmRoute.getRouteCode(), "routeCode", packBean); @@ -1101,4 +1073,21 @@ public class AndonHqlPack { DdlPreparedPack.getNumEqualPack(alarmRoute.getRouteType(), "routeType", packBean); return packBean; } + + /** + * 流程状态异常记录 + * @param routeStatusErrorRecord + * @param organizeCode + * @return + */ + public static DdlPackBean getAndonRouteStatusErrorRecord(AndonRouteStatusErrorRecord routeStatusErrorRecord, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(routeStatusErrorRecord, organizeCode); + DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getRouteCode(), "routeCode", packBean); + DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getStatusCode(), "statusCode", packBean); + DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getAndonOrderNo(), "andonOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(routeStatusErrorRecord.getAlarmCode(), "alarmCode", packBean); + DdlPreparedPack.getStringEqualPack(routeStatusErrorRecord.getSourceType(), "sourceType", packBean); + DdlPreparedPack.getNumEqualPack(routeStatusErrorRecord.getHandleStatus(), "handleStatus", packBean); + return packBean; + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 58d22b3..8775387 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -13,32 +13,6 @@ import org.apache.commons.lang3.StringUtils; public class AndonEnumUtil { /** - * 状态机异常处理方式 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE { - INNER(10, "内部处理"), - OUTER(20, "外部处理"), - REVIEW(30, "人工确认"); - - private int value; - private String description; - - ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - } - - /** * 状态机异常处理状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -64,32 +38,6 @@ public class AndonEnumUtil { } /** - * 状态机异常缓存标识 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG { - FALSE(10, "否"), - TRUE(20, "是"), - ORIGINAL(30, "原先"); - - private int value; - private String description; - - ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - } - - /** * 状态机执行方法 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 679e650..7889a71 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -14,32 +14,6 @@ import static cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil.MONITOR_PROCESS_ public class PtlPcnEnumUtil { /** - * 状态机异常处理方式 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE { - INNER(10, "内部处理"), - OUTER(20, "外部处理"), - REVIEW(30, "人工确认"); - - private int value; - private String description; - - ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - } - - /** * 状态机异常处理状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -65,32 +39,6 @@ public class PtlPcnEnumUtil { } /** - * 状态机异常缓存标识 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG { - FALSE(10, "否"), - TRUE(20, "是"), - ORIGINAL(30, "原先"); - - private int value; - private String description; - - ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - } - - /** * 控制器状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java index d81607b..319d501 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java @@ -77,10 +77,6 @@ public class PtlRouteStatus extends BaseBean implements Serializable { private Integer statusType; @Transient - @ApiParam("默认不缓存") - private boolean cacheFlag = false; - - @Transient @ApiParam("触发组件集默认未执行") private boolean actionAmgIdFalg = false; @@ -92,13 +88,4 @@ public class PtlRouteStatus extends BaseBean implements Serializable { @ApiParam("组件执行完成根据业务设置下个触发事件，如果是外部告知下个触发事件则设置null，一个组件集执行完毕后这个值赋给CommonMsgModel的triggerEvent") private String nextTriggerEvent; - @Transient - @ApiParam("默认继续执行下个组件，当组件集中一个组件根据业务需要跳出去进去下个状态点，则设置未false,同时配置下个状态点的触发事件nextTriggerEvent") - private boolean execNextModuleFlag = true; - - @Transient - @ApiParam("默认异常未处理") - private boolean doErrorFlag = false; - - } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java index 1795f20..cc36903 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.ptl.bean; - import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -19,7 +18,6 @@ import java.io.Serializable; * @date 2020/2/12 17:41 * @desc */ - @Data @Entity @DynamicInsert @@ -51,18 +49,10 @@ public class PtlRouteStatusErrorRecord extends BaseBean implements Serializable @ApiParam("区域代码") private String areaNo; - @Column(name = "CACHE_FLAG") - @ApiParam(value = "缓存标识") - private Integer cacheFlag; - @Column(name = "CACHE_KEY") @ApiParam(value = "缓存KEY") private String cacheKey; - @Column(name = "HANDLE_TYPE") - @ApiParam(value = "处理方式") - private Integer handleType; - @Column(name = "HANDLE_STATUS") @ApiParam(value = "处理状态") private Integer handleStatus; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java index 249a802..1f9945f 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java @@ -48,9 +48,6 @@ public class CommonMsgModel implements Serializable { @ApiModelProperty("外部触发事件") private String triggerEvent; - @ApiModelProperty("缓存KEY") - private String cacheKey; - @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true") private boolean errorInnerAction = false; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 3fc6e54..c40e78d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -341,4 +341,14 @@ public class PtlHqlPack { DdlPreparedPack.getStringLikerPack(area.getAreaName(), "areaName", packBean); return packBean; } + + public static DdlPackBean getPtlRouteStatusErrorRecord(PtlRouteStatusErrorRecord routeStatusErrorRecord, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(routeStatusErrorRecord, organizeCode); + DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getRouteCode(), "routeCode", packBean); + DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getStatusCode(), "statusCode", packBean); + DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getTaskNo(), "taskNo", packBean); + DdlPreparedPack.getStringEqualPack(routeStatusErrorRecord.getAreaNo(), "areaNo", packBean); + DdlPreparedPack.getNumEqualPack(routeStatusErrorRecord.getHandleStatus(), "handleStatus", packBean); + return packBean; + } } From 414b8118716e63b5505403ad6b0354999b06c8ce Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 4 Jun 2020 17:01:13 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 5 +++++ sonar-project.properties | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index b8ed589..49cf675 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -16,6 +16,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.lang.reflect.Method; import java.sql.JDBCType; @@ -122,11 +123,15 @@ public class FieldInfo extends BaseAPS { private Boolean notEmpty; @JsonIgnore + @Transient private transient Class clazz; @JsonIgnore + @Transient private transient Class typeClass; @JsonIgnore + @Transient private transient Method getMethod; @JsonIgnore + @Transient private transient Method setMethod; } diff --git a/sonar-project.properties b/sonar-project.properties index 3428e74..55e4e84 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-PROD-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From b946ca7fa1e16c4e5bc04e4cbece654c9ea080f9 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 4 Jun 2020 19:45:59 +0800 Subject: [PATCH 05/25] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A2066=EF=BC=8C?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9C=BA=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java | 2 +- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java index a71f88e..ceaea06 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java @@ -40,7 +40,7 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl public String andonOrderNo; @Column(name = "ERROR_DESC") - @ApiParam(value = "失败描述") + @ApiParam(value = "异常描述") public String errorDesc; @Column(name = "WORK_CENTER_CODE") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java index cc36903..4e4d276 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java @@ -42,7 +42,7 @@ public class PtlRouteStatusErrorRecord extends BaseBean implements Serializable private String taskNo; @Column(name = "ERROR_DESC") - @ApiParam(value = "失败描述") + @ApiParam(value = "异常描述") public String errorDesc; @Column(name = "AREA_NO") From a2ef35082eb091266044857b5ccda35676da5864 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 4 Jun 2020 20:00:16 +0800 Subject: [PATCH 06/25] =?UTF-8?q?=E3=80=901794=20=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3WMS-=E6=8A=A5=E8=A1=A8-=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E5=88=A9=E7=94=A8=E7=8E=87=E7=9C=8B=E6=9D=BF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index efdb745..0876d86 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -202,6 +202,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", @ApiParam(value = "库龄") private String age; + @Transient + @ApiParam(value = "库位箱数") + private Long qty; + public WmsLocate() { } @@ -252,6 +256,12 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", this.z=z; } + public WmsLocate(Long qty, Integer status, String zoneNo) { + this.qty = qty; + this.status = status; + this.zoneNo = zoneNo; + } + public Integer getMaxPackageQty() { return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue(); } From 9f6ecf72a006451a60d36408a3931670d2e45e49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 5 Jun 2020 14:07:57 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E3=80=902002=20=E6=B3=B0=E5=9B=BD?= =?UTF-8?q?=E5=86=85=E9=A5=B0=E7=94=9F=E4=BA=A7=E4=BD=9C=E4=B8=9A-?= =?UTF-8?q?=E6=8C=89=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95=EF=BC=8C=E5=8D=95?= =?UTF-8?q?=E4=BB=B6=E7=94=9F=E4=BA=A7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 45 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 4 ++ .../i3plus/pojo/mes/bean/MesQueueOrderBom.java | 4 ++ .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 4 ++ .../pojo/mes/bean/MesQueueShippingDetail.java | 2 +- .../pojo/mes/model/SpQueueShippingModel.java | 2 +- .../i3plus/pojo/mes/model/StationRequestBean.java | 3 ++ .../i3plus/pojo/mes/model/StationResultBean.java | 3 ++ 8 files changed, 65 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index d115557..967bb24 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -6194,4 +6194,49 @@ public class MesEnumUtil { return tmp; } } + + /** + * 选配类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OPTION_TYPE { + OPTION(10, "选配件"), + BOM_DISASSEMBLY(20, "BOM拆解"); + + private int value; + private String description; + + OPTION_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 26afb75..5dd373d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -116,4 +116,8 @@ public class MesQcOrder extends BaseBean implements Serializable { @Transient private String mesWorkNo; + @Transient + @ApiParam("产品条码") + private String productSn; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java index 9906cd4..5a00f18 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java @@ -57,4 +57,8 @@ public class MesQueueOrderBom extends BaseBean implements Serializable { @Column(name = "COLOR_CODE") @ApiParam("颜色代码") private String colorCode; + + @Column(name = "OPTION_TYPE") + @ApiParam("选配类型") + private Integer optionType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 1e9fc97..fa22aa7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -92,6 +92,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品颜色") private String produceColor; + @Column(name = "PRODUCE_COLOR_CODE") + @ApiParam("产品颜色代码") + private String produceColorCode; + @Column(name = "OPTION_CODE") @ApiParam("选项代码") private String optionCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java index ab58514..6f0005e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java @@ -77,5 +77,5 @@ public class MesQueueShippingDetail extends BaseBean implements Serializable { @Column(name = "PRODUCE_COLOR") @ApiParam("产品颜色") - private Double produceColor; + private String produceColor; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SpQueueShippingModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SpQueueShippingModel.java index 82c0ac6..88da5e1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SpQueueShippingModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SpQueueShippingModel.java @@ -29,6 +29,6 @@ public class SpQueueShippingModel { private String gradeCode; @ApiParam("产品颜色") - private Double produceColor; + private String produceColor; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 3a4d2ed..bb6d667 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -138,6 +138,9 @@ public class StationRequestBean implements Serializable { @ApiParam("工步弹框状态") private Boolean stepDialogStatus = false; + @ApiParam("特殊展示数据") + private Map specialDisplayMap = new HashMap<>(); + @Override public String toString() { return "StationRequestBean{" + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java index 7740053..46db502 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java @@ -55,4 +55,7 @@ public class StationResultBean implements Serializable { @ApiParam("定制页面名称") private String customPageName; + + @ApiParam("特殊展示数据") + private Object specialDisplayData; } From 3c53d8a2f278d59f41a2202b4b916146c344a53e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 5 Jun 2020 15:20:20 +0800 Subject: [PATCH 08/25] Finish Task #2064 Cost:24h --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 +- .../i3plus/pojo/mes/bean/MesBoardWorkCell.java | 91 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/model/BoardModel.java | 11 ++- .../mes/repository/MesBoardWorkCellRepository.java | 15 ++++ 4 files changed, 115 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardWorkCellRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 967bb24..6243570 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -5091,7 +5091,8 @@ public class MesEnumUtil { public enum BOARD_TYPE { BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"), BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"), - BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"); + BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"), + BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"); private String code; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java new file mode 100644 index 0000000..59d5305 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description : MES_看板工位信息 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_BOARD_WORK_CELL") +@Api("MES_看板工位信息") +public class MesBoardWorkCell extends BaseBean implements Serializable { + private static final long serialVersionUID = 6251886604848913685L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "X_AXES") + @ApiParam("横坐标") + private Double xAxes = 0d; + + @Column(name = "Y_AXES") + @ApiParam("纵坐标") + private Double yAxes = 0d; + + @Column(name = "WORK_CELL_IP") + @ApiParam("工位IP") + private String workCellIp; + + @Transient + @ApiParam("看板工位状态") + private Boolean boardWorkCellStatus; + + @JsonProperty("xAxes") + public Double getxAxes() { + return xAxes; + } + + public void setxAxes(Double xAxes) { + this.xAxes = xAxes; + } + + @JsonProperty("yAxes") + public Double getyAxes() { + return yAxes; + } + + public void setyAxes(Double yAxes) { + this.yAxes = yAxes; + } + + public double getXAxes() { + return this.xAxes == null ? 0.0d : this.xAxes; + } + + public double getYAxes() { + return this.yAxes == null ? 0.0d : this.yAxes; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java index a115e99..8076ead 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java @@ -1,9 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model; -import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquDetail; -import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquStatus; -import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCapacity; -import cn.estsh.i3plus.pojo.mes.bean.MesOee; +import cn.estsh.i3plus.pojo.mes.bean.*; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -41,6 +38,9 @@ public class BoardModel { @ApiParam("看板图片路径") private String pictureUrl; + @ApiParam("当天停机时间(min)") + private String theDayShutDownTime; + @ApiParam("看板时段计划产量") private List boardShiftSectionCapacityList; @@ -52,4 +52,7 @@ public class BoardModel { @ApiParam("oee") private List oeeList; + + @ApiParam("工位状态监控明细") + private List boardWorkCellList; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardWorkCellRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardWorkCellRepository.java new file mode 100644 index 0000000..f403ceb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardWorkCellRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardWorkCell; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: adair.song + * @Date: 2020/06/04 13:23 + * @Modify: + */ +@Repository +public interface MesBoardWorkCellRepository extends BaseRepository { +} From 7f0b99297f8b8765ea3fbad132b2c9a0d9ea4c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 5 Jun 2020 18:17:25 +0800 Subject: [PATCH 09/25] Start Task #2019 Cost:16h Left:0h Finish Task #2019 Cost:16h --- .../main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java index 3dbf05e..fd4a786 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java @@ -51,4 +51,7 @@ public class MesElectricDataModel implements Serializable { @ApiParam(value = "文件名称") private String ftpFileName; + + @ApiParam(value = "FTP文件") + private Object ftpFile; } \ No newline at end of file From 86363b20123640834a230c05dcce2e309f9b595e Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sun, 7 Jun 2020 17:13:40 +0800 Subject: [PATCH 10/25] Finish Task #2098 Cost:8h --- .../cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java | 39 ++++++++++++++++++++++ .../pojo/mes/repository/MesSubPartRepository.java | 14 ++++++++ .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 20 ++++++----- 3 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSubPartRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java new file mode 100644 index 0000000..e0a1558 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/6/7 15:20 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SUB_PART") +@Api("数据同步死信") +public class MesSubPart extends BaseBean implements Serializable { + private static final long serialVersionUID = 4636507477301700549L; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "SUB_PART_NO") + @ApiParam("替代料") + private String subPartNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSubPartRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSubPartRepository.java new file mode 100644 index 0000000..5a4ca58 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSubPartRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesSubPart; +import org.springframework.stereotype.Repository; + +/** + * @author Wynne.Lu + * @date 2020/6/7 15:23 + * @desc + */ +@Repository +public interface MesSubPartRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 6c67531..b777cee 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -88,7 +88,7 @@ public class MesPcnHqlPack { * @param mesLabelTemplate * @return */ - public static DdlPackBean getLabelTemplate( MesLabelTemplate mesLabelTemplate) { + public static DdlPackBean getLabelTemplate(MesLabelTemplate mesLabelTemplate) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean); return packBean; @@ -113,20 +113,20 @@ public class MesPcnHqlPack { * 获取原材料扫描信息的对应工序BOM * * @param stationBom - * @param rawPartSn + * @param rawPartNo * @return */ - public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) { + public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, String rawPartNo) { DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean); DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean); DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean); - DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean); + DdlPreparedPack.getStringEqualPack(rawPartNo, "itemPartNo", packBean); return packBean; } - public static DdlPackBean getStationBom(String org,String workCenter,String workCell,String partNo) { + public static DdlPackBean getStationBom(String org, String workCenter, String workCell, String partNo) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(workCenter, "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(workCell, "workCellCode", packBean); @@ -180,7 +180,7 @@ public class MesPcnHqlPack { } // 工单管理，查询下达，启动，暂停状态 - if (!CollectionUtils.isEmpty(mesWorkOrder.getStatusList())){ + if (!CollectionUtils.isEmpty(mesWorkOrder.getStatusList())) { DdlPreparedPack.getInPackList(mesWorkOrder.getStatusList(), "workOrderStatus", packBean); } @@ -316,6 +316,7 @@ public class MesPcnHqlPack { /** * 按条件分页查询产品条码补打印数据 + * * @param mesProduceSn * @return */ @@ -355,6 +356,7 @@ public class MesPcnHqlPack { /** * 按条件分页查询包装条码补打印数据 + * * @param mesPackage * @return */ @@ -417,9 +419,9 @@ public class MesPcnHqlPack { } - /** * 按条件分页查询类型信息数据 + * * @param typeCfg * @return */ @@ -451,8 +453,8 @@ public class MesPcnHqlPack { DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getCheckType(), "checkType", packBean); DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getCheckItemType(), "checkItemType", packBean); - if(mesQcOrderDetail.getCheckType() == MesPcnEnumUtil.MES_QC_CHECK_TYPE.FIRST_CHECK.getValue()){ - DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getFinishQty()+1, "itemNo", packBean); + if (mesQcOrderDetail.getCheckType() == MesPcnEnumUtil.MES_QC_CHECK_TYPE.FIRST_CHECK.getValue()) { + DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getFinishQty() + 1, "itemNo", packBean); } return packBean; } From 08c52dc09f737411ac475a2dce83fd2dd7fbfef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 8 Jun 2020 13:31:07 +0800 Subject: [PATCH 11/25] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E4=BC=98=E5=8C=96=E6=89=A9=E5=B1=95=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0go-fastdfs=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/bean/DdlPackBean.java | 6 +- .../cn/estsh/i3plus/pojo/base/bean/ImppFile.java | 66 ++++++++++++++++++++++ 2 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/ImppFile.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index 8654728..fdd275f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -76,9 +76,9 @@ public class DdlPackBean { public static DdlPackBean getDdlPackBean(String organizeCode, int isValid){ DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); - DdlPreparedPack.getNumEqualPack(isValid,"isValid",result); - DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlPreparedPack.getNumEqualPack(isValid, "isValid", result); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", result); return result; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/ImppFile.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/ImppFile.java new file mode 100644 index 0000000..afb605a --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/ImppFile.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.base.bean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : 文件基础信息 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-06-01 20:33 + * @Modify: + **/ +@Data +@ApiModel("文件基础信息") +public class ImppFile { + + /******* 文件基础信息 ******/ + + @ApiModelProperty("文件名称") + private String name; //文件名 + + @ApiModelProperty("文件内容") + private byte[] content; //内容 + + @ApiModelProperty("文件后缀名称") + private String ext; //文件类型 + + public void setExt(String ext) { + if(ext.indexOf(".") != 0){ + ext ="."+ext; + } + this.ext = ext; + } + + @ApiModelProperty("文件md5") + private String md5; + + @ApiModelProperty("文件创建时间") + private String createDateTime; + + @ApiModelProperty("文件作者") + private String author; //作者 + + /******* 文件系统唯一信息 ******/ + + @ApiModelProperty("文件系统-组名称") + private String dfsGroupName; + + @ApiModelProperty("文件系统-名称") + private String dfsFileName; + + @ApiModelProperty("文件系统-唯一键") + private String dfsFileKey; + + /******* 构造方法 ******/ + + public ImppFile() { + } + + public ImppFile(String name, byte[] content, String ext) { + this.name = name; + this.content = content; + this.setExt(ext); + } +} From 79429024cf93b38d8576f8e95383daf79fc2e894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 8 Jun 2020 13:36:02 +0800 Subject: [PATCH 12/25] =?UTF-8?q?MDM=E5=9F=BA=E7=A1=80=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 1 + .../i3plus/pojo/base/enumutil/MdmEnumUtil.java | 165 ++++ .../i3plus/pojo/mdm/bean/base/BaseMdmBean.java | 56 +- .../pojo/mdm/bean/base/BaseMdmBusiExtdBean.java | 49 ++ .../pojo/mdm/bean/base/BaseMdmBusiModelBean.java | 64 ++ .../i3plus/pojo/mdm/bean/base/BaseMdmExtdBean.java | 30 - .../pojo/mdm/bean/base/DdlPackMdmModelBean.java | 271 +++++++ .../i3plus/pojo/mdm/bean/base/MdmSyncData.java | 74 ++ .../mdm/bean/busi/core/MdmGearCoreBusiExtd.java | 51 ++ .../pojo/mdm/bean/busi/core/MdmGearCoreExtd.java | 31 - .../estsh/i3plus/pojo/mdm/bean/master/MdmGear.java | 14 + .../pojo/mdm/bean/model/core/MdmGearCoreModel.java | 19 - .../pojo/mdm/jpa/dao/MdmBusiModelRepository.java | 112 +++ .../jpa/daoimpl/MdmBusiModelRepositoryImpl.java | 840 +++++++++++++++++++++ .../i3plus/pojo/mdm/model/MdmPagerQueryModel.java | 27 + .../pojo/mdm/model/core/MdmGearCoreBusiModel.java | 22 + .../core/MdmGearCoreRepository.java | 21 + .../i3plus/pojo/mdm/repository/MdmHqlPack.java | 51 ++ .../busi/core/MdmGearCoreBusiModelRepository.java | 16 + .../mdm/repository/master/MdmGearRepository.java | 16 + .../pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java | 699 +++++++++++++++++ 21 files changed, 2544 insertions(+), 85 deletions(-) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java delete mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmExtdBean.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/DdlPackMdmModelBean.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java delete mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreExtd.java delete mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/model/core/MdmGearCoreModel.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/dao/MdmBusiModelRepository.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/daoimpl/MdmBusiModelRepositoryImpl.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/MdmPagerQueryModel.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/core/MdmGearCoreBusiModel.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/modelrepository/core/MdmGearCoreRepository.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/core/MdmGearCoreBusiModelRepository.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmGearRepository.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 62b5ceb..a43cc1f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -59,6 +59,7 @@ public class CommonEnumUtil { /** 平台服务 */ CORE(2, 8100, 4, 101000000L, "i3core", "i3业务平台"), + MDM(29, 8150, 22, 0, "i3mdm", "数据中心MDM"), /** 调试服务 */ DEV(9999, 0000, 0, 120000000L, "Development", "系统调试"); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java new file mode 100644 index 0000000..e8c5618 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java @@ -0,0 +1,165 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * @Description : Model Pojo 枚举 + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2018-11-21 15:50 + * @Modify: + **/ +public class MdmEnumUtil { + + /** + * 操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MDM_OPERATE_TYPE { + INSERT(1, "新增"), + UPDATE(2, "修改"); + + private int value; + private String description; + + private MDM_OPERATE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static MdmEnumUtil.MDM_OPERATE_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } + + /** + * hql实体类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum HQL_ENTITY_TYPE { + MASTER(1, "master", "主数据"), + BUSI(2, "busi", "业务数据"); + + private int value; + private String alias; + private String description; + + private HQL_ENTITY_TYPE(int value, String alias, String description) { + this.value = value; + this.alias = alias; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getAlias() { + return alias; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfAlias(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].alias; + } + } + return tmp; + } + + public static MdmEnumUtil.HQL_ENTITY_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } + + /** + * mdm + */ + public enum MDM_SYNC_TYPE{ + INSERT(1, "新增"), + UPDATE(2, "修改"), + DELETE(2, "删除"); + + private int value; + private String description; + + private MDM_SYNC_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static MdmEnumUtil.MDM_SYNC_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java index f220dc7..859a6b3 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java @@ -3,10 +3,15 @@ package cn.estsh.i3plus.pojo.mdm.bean.base; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.persistence.Column; +import javax.persistence.MappedSuperclass; import javax.persistence.Transient; /** @@ -17,30 +22,71 @@ import javax.persistence.Transient; * @Modify: **/ @Data +@MappedSuperclass @ApiModel("MDM基础bean") -public class BaseMdmBean extends BaseBean { +public abstract class BaseMdmBean extends BaseBean { private static final long serialVersionUID = 3957595289035947441L; @Transient @ApiModelProperty("是否主数据") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) - public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); + public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); + @Column(name = "MDM_VERSION") @ApiModelProperty("mdm数据版本") + @JsonSerialize(using = ToStringSerializer.class) private Long mdmVersion; - public long getMdmVersion() { + public long getMdmVersionVal() { return mdmVersion == null ? 0 : mdmVersion; } // 版本递增 public long nextMdmVersion() { - return mdmVersion = getMdmVersion() + 1; + mdmVersion = getMdmVersionVal() + 1; + return mdmVersion; } + @Column(name = "IS_MDM_PUBLISHED") @ApiModelProperty("是否发布") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) - private Integer isPublished; + private Integer isMdmPublished; + @Column(name = "MDM_OPERATE_TYPE") + @ApiModelProperty("操作类型") + @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class) + private Integer mdmOperateType; + + public Integer getMdmOperateTypeVal() { + return mdmOperateType == null ? MdmEnumUtil.MDM_OPERATE_TYPE.INSERT.getValue() : mdmOperateType; + } + + @Column(name = "MDM_REF_ID") + @ApiModelProperty("关联id") + @JsonSerialize(using = ToStringSerializer.class) + private Long mdmRefId; + + //排序方式 + @Override + public String orderBy() { + String result = ""; + if (orderByParam != null && orderByParam.trim().length() > 0) { + result = " order by "; + if (CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == isMdmMaster) { + result += "master."; + } else { + result += "busi."; + } + + result += orderByParam; + + if (ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + result += " asc"; + } else { + result += " desc"; + } + } + return result; + } } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java new file mode 100644 index 0000000..96d8c16 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mdm.bean.base; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.MappedSuperclass; +import javax.persistence.Transient; + +/** + * @Description : MDM业务基础bean + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-12 17:30 + * @Modify: + **/ +@Data +@MappedSuperclass +@ApiModel("MDM业务基础bean") +public class BaseMdmBusiExtdBean extends BaseMdmBean { + + private static final long serialVersionUID = 4267453020130810967L; + + @Transient + @ApiModelProperty("是否主数据") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @Transient + @ApiModelProperty("主数据Class") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + public static Class mdmMasterClass = BaseMdmBean.class; + + @Transient + @ApiModelProperty("软件模块") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + public static Integer mdmSoftType; + + @Column(name = "MDM_MASTER_ID") + @ApiModelProperty("主数据id") + @JsonSerialize(using = ToStringSerializer.class) + private Long mdmMasterId; + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java new file mode 100644 index 0000000..3aafc4b --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mdm.bean.base; + +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description :MDM模型bean + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-18 20:52 + * @Modify: + **/ +public abstract class BaseMdmBusiModelBean { + + @ApiModelProperty("主数据") + private M mdmMasterBean; + + @ApiModelProperty("业务扩展") + private B mdmBusiBean; + + public BaseMdmBusiModelBean() { + } + + public BaseMdmBusiModelBean(M mdmMasterBean, B mdmBusiBean) { + this.mdmMasterBean = mdmMasterBean; + this.mdmBusiBean = mdmBusiBean; + } + + /** + * 获取主数据m + * + * @return + */ + public M getMaster() { + return mdmMasterBean; + } + + /** + * 获取业务扩展数据 + * + * @return + */ + public B getBusi() { + return mdmBusiBean; + } + + /** + * 设置主数据m + * + * @return + */ + public void setMaster(M baseMdmBean) { + this.mdmMasterBean = baseMdmBean; + } + + /** + * 设置业务扩展数据 + * + * @return + */ + public void setBusi(B baseMdmBusiExtdBean) { + this.mdmBusiBean = baseMdmBusiExtdBean; + } + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmExtdBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmExtdBean.java deleted file mode 100644 index 957a91e..0000000 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmExtdBean.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.estsh.i3plus.pojo.mdm.bean.base; - -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.persistence.Transient; - -/** - * @Description : MDM业务基础bean - * @Reference : - * @Author : yunhao - * @CreateDate : 2020-05-12 17:30 - * @Modify: - **/ -@Data -@ApiModel("MDM业务基础bean") -public class BaseMdmExtdBean extends BaseMdmBean { - - private static final long serialVersionUID = 4267453020130810967L; - - @Transient - @ApiModelProperty("软件模块") - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) - public static Integer mdmSoftType; - - -} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/DdlPackMdmModelBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/DdlPackMdmModelBean.java new file mode 100644 index 0000000..22475d9 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/DdlPackMdmModelBean.java @@ -0,0 +1,271 @@ +package cn.estsh.i3plus.pojo.mdm.bean.base; + + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import cn.estsh.i3plus.pojo.mdm.sqlpack.DdlMdmModelPreparedPack; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description : hql脚本封装类 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2019-03-29 15:57 + * @Modify: + **/ +public class DdlPackMdmModelBean { + + /** + * 条件实体 + */ + List entityTypeList; + + /** + * 条件属性名称 + */ + List keyList; + + /** + * 条件值 + */ + List valueList; + + //是否是hql + private boolean isHql; + + //手动hql，尽量避免直接传参，使用？代替 + private String hqlAppend; + + //where后跟着的hql/sql + private StringBuilder whereAppend; + + //排序内容 + private String orderByStr; + + //需要拼接的hql + private StringBuilder sb = null; + + public DdlPackMdmModelBean() { + this.isHql = true; + whereAppend = new StringBuilder(); + entityTypeList = new ArrayList<>(); + keyList = new ArrayList<>(); + valueList = new ArrayList<>(); + } + + public DdlPackMdmModelBean(boolean isHql) { + this.isHql = isHql; + whereAppend = new StringBuilder(); + entityTypeList = new ArrayList<>(); + keyList = new ArrayList<>(); + valueList = new ArrayList<>(); + } + + /** + * 查询制定组织有效的数据 + * + * @param organizeCode + * @return + */ + public static DdlPackMdmModelBean getDdlPackBean(String organizeCode) { + DdlPackMdmModelBean result = new DdlPackMdmModelBean(); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + DdlMdmModelPreparedPack.getStringEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, organizeCode, "organizeCode", result); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + DdlMdmModelPreparedPack.getStringEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, organizeCode, "organizeCode", result); + + return result; + } + + /** + * 查询指定组织、指定是否有效的数据 + * + * @param organizeCode + * @param isValid + * @return + */ + public static DdlPackMdmModelBean getDdlPackBean(String organizeCode, int isValid) { + DdlPackMdmModelBean result = new DdlPackMdmModelBean(); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, isValid, "isValid", result); + DdlMdmModelPreparedPack.getStringEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, organizeCode, "organizeCode", result); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, isValid, "isValid", result); + DdlMdmModelPreparedPack.getStringEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, organizeCode, "organizeCode", result); + + return result; + } + + public static DdlPackMdmModelBean getDdlPackBean() { + DdlPackMdmModelBean result = new DdlPackMdmModelBean(); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + + return result; + } + + public static DdlPackMdmModelBean getDdlPackBean(BaseMdmBusiModelBean bean) { + DdlPackMdmModelBean result = new DdlPackMdmModelBean(); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.MASTER, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlMdmModelPreparedPack.getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE.BUSI, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + + if (bean != null) { + if (bean.getBusi() != null) { + result.setOrderByStr(bean.getBusi().orderBy()); + } else if (bean.getMaster() != null) { + result.setOrderByStr(bean.getMaster().orderBy()); + } + } + + return result; + } + + public boolean isHql() { + return isHql; + } + + public void setHql(boolean hql) { + isHql = hql; + } + + public String getOrderByStr() { + return orderByStr; + } + + public void setOrderByStr(String orderByStr) { + this.orderByStr = orderByStr; + } + + public String getHqlAppend() { + return hqlAppend; + } + + public void setHqlAppend(String hqlAppend) { + this.hqlAppend = hqlAppend; + } + + public String getWhereAppend() { + return whereAppend.toString(); + } + + public void setWhereAppend(String whereAppend) { + this.whereAppend = new StringBuilder(whereAppend); + } + + public List getEntityTypeList() { + return entityTypeList; + } + + public void setEntityTypeList(List entityTypeList) { + this.entityTypeList = entityTypeList; + } + + public List getKeyList() { + return keyList; + } + + public void setKeyList(List keyList) { + this.keyList = keyList; + } + + public List getValueList() { + return valueList; + } + + public void setValueList(List valueList) { + this.valueList = valueList; + } + + /** + * 添加查询条件 + * + * @param hql + * @param val + */ + public void addColumnQuery(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String column, String hql, Object val) { + if (entityTypeList == null) { + entityTypeList = new ArrayList<>(); + } + if (keyList == null) { + keyList = new ArrayList<>(); + } + if (valueList == null) { + valueList = new ArrayList<>(); + } + if (entityType != null && column != null && val != null) { + entityTypeList.add(entityType); + keyList.add(column); + valueList.add(val); + } + + whereAppend.append(hql); + } + + /** + * 需要查询属性的数量 + * + * @return + */ + public int getColumnSize() { + return keyList.size(); + } + + /** + * 获取包含hql的最终的ddl + * + * @return + */ + public String getPackedHqlAll() { + sb = new StringBuilder(); + if (hqlAppend != null) { + sb.append(hqlAppend); + } + if (whereAppend != null) { + sb.append(whereAppend); + } + if (orderByStr != null) { + sb.append(orderByStr); + } + return sb.toString(); + } + + /** + * 获取最终的ddl + * + * @return + */ + public String getPackedHql() { + sb = new StringBuilder(); + if (whereAppend != null) { + sb.append(whereAppend); + } + if (orderByStr != null) { + sb.append(orderByStr); + } + return sb.toString(); + } +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java new file mode 100644 index 0000000..95fd969 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java @@ -0,0 +1,74 @@ +package cn.estsh.i3plus.pojo.mdm.bean.base; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 数据中心同步数据 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-06-02 16:14 + * @Modify: + **/ +@Data +@ApiModel("数据中心同步数据") +public class MdmSyncData implements Serializable { + + private static final long serialVersionUID = -1642626000860074060L; + + @ApiModelProperty("同步数据类型") + @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_SYNC_TYPE.class) + private Integer syncType; + + public int getSyncTypeVal(){ + return syncType == null ? MdmEnumUtil.MDM_SYNC_TYPE.INSERT.getValue() : syncType; + } + + @ApiModelProperty("同步模块") + @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class) + private Integer syncSoftType; + + @ApiModelProperty("是否是主数据") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + private Integer isMasterData; + + public int getIsMasterDataVal() { + return isMasterData == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isMasterData; + } + + @ApiModelProperty("同步数据class") + private String syncDataClass; + + public String getSyncDataClassSimpleName(){ + if(syncDataClass == null){ + return null; + } + + return syncDataClass.trim().substring(syncDataClass.trim().lastIndexOf(".") + 1); + } + + @ApiModelProperty("同步数据id") + private List syncDataId; + + @ApiModelProperty("同步数据用户名") + private String syncDateUserName; + + @ApiModelProperty("同步时间") + private String syncDateTime; + + @ApiModelProperty("同步失败键") + private String syncFailKey; + + @ApiModelProperty("同步失败时间") + private String syncFailDateTime; + + @ApiModelProperty("同步失败信息") + private String syncFailMessage; +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java new file mode 100644 index 0000000..4e3f336 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.mdm.bean.busi.core; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiExtdBean; +import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : 主数据齿轮-平台扩展 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-12 18:09 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MDM_GEAR_CORE_EXTD") +@ApiModel("主数据齿轮-平台扩展") +public class MdmGearCoreBusiExtd extends BaseMdmBusiExtdBean { + + private static final long serialVersionUID = -3535174942277452194L; + + @Transient + @ApiModelProperty("主数据Class") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + public static Class mdmMasterClass = MdmGear.class; + + @Transient + @ApiModelProperty("软件模块") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + public static Integer mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue(); + + @Column(name = "CORE_NUM") + @ApiModelProperty("核心数量") + public String coreNum; + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreExtd.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreExtd.java deleted file mode 100644 index bbe8b58..0000000 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreExtd.java +++ /dev/null @@ -1,31 +0,0 @@ -package cn.estsh.i3plus.pojo.mdm.bean.busi.core; - -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmExtdBean; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Description : 主数据齿轮-平台扩展 - * @Reference : - * @Author : yunhao - * @CreateDate : 2020-05-12 18:09 - * @Modify: - **/ -@Data -@ApiModel("主数据齿轮-平台扩展") -public class MdmGearCoreExtd extends BaseMdmExtdBean { - - private static final long serialVersionUID = -3535174942277452194L; - - // 初始化数据 - static { - isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); - mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue(); - } - - @ApiModelProperty("核心数量") - public String coreNum; - -} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java index e20fec9..18dbcb1 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java @@ -4,6 +4,13 @@ import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; /** * @Description : 主数据齿轮 @@ -13,14 +20,21 @@ import lombok.Data; * @Modify: **/ @Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MDM_GEAR") @ApiModel("主数据齿轮") public class MdmGear extends BaseMdmBean { private static final long serialVersionUID = -7580444601811207793L; + @Column(name="NAME") @ApiModelProperty("齿轮名称") private String name; + @Column(name="GEAR_MODEL") @ApiModelProperty("齿轮规格") private String gearModel; diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/model/core/MdmGearCoreModel.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/model/core/MdmGearCoreModel.java deleted file mode 100644 index 46fd862..0000000 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/model/core/MdmGearCoreModel.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.estsh.i3plus.pojo.mdm.bean.model.core; - -import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreExtd; -import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; - -/** - * @Description : 主数据齿轮-平台model - * @Reference : - * @Author : yunhao - * @CreateDate : 2020-05-12 18:09 - * @Modify: - **/ -public class MdmGearCoreModel { - - private MdmGear mdmGear; - - private MdmGearCoreExtd mdmGearCoreExtd; - -} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/dao/MdmBusiModelRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/dao/MdmBusiModelRepository.java new file mode 100644 index 0000000..015bd8b --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/dao/MdmBusiModelRepository.java @@ -0,0 +1,112 @@ +package cn.estsh.i3plus.pojo.mdm.jpa.dao; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiExtdBean; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiModelBean; +import cn.estsh.i3plus.pojo.mdm.bean.base.DdlPackMdmModelBean; + +import java.util.List; + +/** + * @Description : 自定义Repository的方法接口 + * @Reference : 对jpaRepository进行扩展 + * @Author : alwaysfrin + * @CreateDate : 2018-09-13 10:34 + * @Modify: + **/ +public interface MdmBusiModelRepository, M extends BaseMdmBean, B extends BaseMdmBusiExtdBean> { + T getById(long id); + + List list(); + + List list(final String hql); + + List listPager(Pager pager); + + List findByPage(final DdlPackMdmModelBean packBean, final int offset, final int pageSize); + + /** + * @param hql hql入参需要用问号代替 + * @param values 按照入参问号的顺序进行赋值 + * @param offset + * @param pageSize + * @return + */ + List findByPage(final String hql, final Object[] values, final int offset, final int pageSize); + + List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value); + + List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values); + + List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value, String orderByStuff); + + List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff); + + T getByProperty(DdlPackMdmModelBean packBean); + + T getByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value); + + T getByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values); + + int listCount(); + + int findByPropertyCount(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value); + + int findByPropertyCount(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values); + + List findByPropertyPage(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value, String orderByStuff, Pager pager); + + List findByPropertyPage(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff, Pager pager); + + List findByHqlWhere(DdlPackMdmModelBean packBean); + + List findByHqlWhere(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff); + + int findByHqlWhereCount(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values); + + List findByHqlWherePage(String hqlWhere, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff); + + List findByHqlWherePage(DdlPackMdmModelBean packBean, Pager pager); + + int findByHqlWhereCount(DdlPackMdmModelBean packBean); + + int findByHqlCount(String hql); + + int findByHqlCount(String hql, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue); + + List findByHqlPage(DdlPackMdmModelBean packBean, Pager pager); + + List findByHqlPage(String hql, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue); + + double findByHqlDouble(DdlPackMdmModelBean packBean); + + long findByHqlLong(DdlPackMdmModelBean packBean); + + List findByHqlTopWhere(DdlPackMdmModelBean packBean, int topNum); + + /********************** 多表联查，返回Object[]数组根据hql查询翻页信息 开始 ****************************/ + List findByHqlObjects(String hql); + + List findByHqlObjects(String hql, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue); + + List findByHqlPageObjects(String hql, Pager pager); + + List findByHqlPageObjects(String hql, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue); + + List findBySqlObjList(String sql); + + List findBySqlObjListByPager(String sql, Pager pager); + + /****************** 部分业务处理 *******************/ + + boolean isExitByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value); + + boolean isExitByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values); + + boolean isExitByHqlWhere(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values); + + boolean isExitByHql(DdlPackMdmModelBean packBean); + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/daoimpl/MdmBusiModelRepositoryImpl.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/daoimpl/MdmBusiModelRepositoryImpl.java new file mode 100644 index 0000000..76a4cd5 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/daoimpl/MdmBusiModelRepositoryImpl.java @@ -0,0 +1,840 @@ +package cn.estsh.i3plus.pojo.mdm.jpa.daoimpl; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiExtdBean; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiModelBean; +import cn.estsh.i3plus.pojo.mdm.bean.base.DdlPackMdmModelBean; +import cn.estsh.i3plus.pojo.mdm.jpa.dao.MdmBusiModelRepository; +import org.hibernate.NonUniqueResultException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.persistence.EntityManager; +import javax.persistence.NoResultException; +import javax.persistence.Query; +import java.lang.reflect.ParameterizedType; +import java.text.MessageFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.List; + +/** + * @Description : 自定义持久化接口实现 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-21 15:05 + * @Modify: + **/ +public class MdmBusiModelRepositoryImpl, M extends BaseMdmBean, B extends BaseMdmBusiExtdBean> + implements MdmBusiModelRepository { + public static final Logger LOGGER = LoggerFactory.getLogger(MdmBusiModelRepositoryImpl.class); + + /** + * 持久化上下文 + */ + @Autowired + private EntityManager entityManager; + + private final Class modelClass; + private final Class masterClass; + private final Class busiExtdClass; + + private final String selectCount; + private final String selectAll; + private final String formStr; + + public MdmBusiModelRepositoryImpl() { + // 通过反射获取model的真实类型 + ParameterizedType pt = (ParameterizedType) this.getClass().getGenericSuperclass(); + modelClass = (Class) pt.getActualTypeArguments()[0]; + masterClass = (Class) pt.getActualTypeArguments()[1]; + busiExtdClass = (Class) pt.getActualTypeArguments()[2]; + + this.formStr = String.format("from %s as busi left join %s as master on busi.mdmMasterId = master.id ", + busiExtdClass.getName(), masterClass.getName() + ); + + this.selectCount = "select count(distinct busi) " + formStr; + this.selectAll = MessageFormat.format("select new {0}(master,busi) ", modelClass.getName()) + formStr; + } + + private void setParameter(Query query, String[] propName, Object[] propValue) { + String name = null; + Object value = null; + for (int i = 0; i < propName.length; i++) { + name = propName[i]; + value = propValue[i]; + if (value != null) { + if ((value instanceof Object[])) { + query.setParameter(name.replace(".", ""), (Object[]) value); + } else if ((value instanceof Collection)) { + query.setParameter(name.replace(".", ""), (Collection) value); + } else { + query.setParameter(name.replace(".", ""), value); + } + } + } + } + + private void appendQL(StringBuffer sb, String[] propName, Object[] propValue) { + String name = null; + Object value = null; + for (int i = 0; i < propName.length; i++) { + name = propName[i]; + value = propValue[i]; + if (((value instanceof Object[])) || ((value instanceof Collection))) { + Object[] arraySerializable = (Object[]) value; + if ((arraySerializable != null) && (arraySerializable.length > 0)) { + sb.append(" and model." + name + " in (:" + name.replace(".", "") + ")"); + } + } else if (value == null) { + sb.append(" and model." + name + " is null "); + } else { + sb.append(" and model." + name + "=:" + name.replace(".", "")); + } + } + } + + @Override + public T getById(long id) { + try { + List busiModelList = + entityManager.createQuery(selectAll + " where busi.id = :busi_id").setParameter("busi_id", id).getResultList(); + + return busiModelList.isEmpty() ? modelClass.newInstance() : busiModelList.get(0); + } catch (Exception e) { + return null; + } + } + + @Override + public List list() { + List l = entityManager.createQuery(selectAll).getResultList(); + return l; + } + + @Override + public List listPager(Pager pager) { + if (pager.getTotalRows() > 0) { + return entityManager.createQuery(selectAll) + .setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + } else { + return new ArrayList<>(); + } + } + + @Override + public List list(final String hql) { + return entityManager.createQuery(hql).getResultList(); + } + + @Override + public List findByPage(DdlPackMdmModelBean packBean, int offset, int pageSize) { + Query query = null; + String ddl = selectAll + " where 1=1 " + packBean.getPackedHql(); + + if (packBean.isHql()) { + query = entityManager.createQuery(ddl); + } else { + query = entityManager.createNativeQuery(ddl); + } + + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + + return query.setFirstResult(offset) + .setMaxResults(pageSize) + .getResultList(); + } + + @Override + public List findByPage(String hql, Object[] values, int offset, int pageSize) { + Query query = entityManager.createQuery(hql); + for (int i = 0; i < values.length; i++) { + query.setParameter(i, values[i]); + } + return query.setFirstResult(offset).setMaxResults(pageSize).getResultList(); + } + + @Override + public List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) { + String queryString = MessageFormat.format("{0} where {1}.{2}= :{3}_{4}", selectAll, entityType.getAlias(), propertyName, + entityType.getAlias(), propertyName); + return entityManager.createQuery(queryString).setParameter(entityType.getAlias() + "_" + propertyName, value).getResultList(); + } + + @Override + public List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) { + if (entityTypes.length != propertyNames.length || propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!entityTypes:" + entityTypes.length + " propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append(selectAll); + + int size = propertyNames.length; + if (size > 0) { + queryString.append("where 1=1 "); + } + + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + + Query queryObject = entityManager.createQuery(queryString.toString()); + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + } + + return queryObject.getResultList(); + } + + @Override + public List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value, String orderByStuff) { + String queryString = MessageFormat.format("{0} where {1}.{2}= :{3} {4}", selectAll, entityType.getAlias(), propertyName, propertyName, orderByStuff); + return entityManager.createQuery(queryString).setParameter(propertyName, value).getResultList(); + } + + @Override + public List findByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff) { + if (propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append(selectAll); + + int size = propertyNames.length; + if (size > 0) { + queryString.append("where 1=1 "); + } + + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + + queryString.append(" " + orderByStuff); + + Query queryObject = entityManager.createQuery(queryString.toString()); + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + } + + return queryObject.getResultList(); + } + + @Override + public T getByProperty(DdlPackMdmModelBean packBean) { + + try { + List list = findByHqlWhere(packBean); + return list.size() != 0 ? list.get(0) : null; + } catch (NoResultException ne) { + LOGGER.error("数据不存在，DdlPackMdmModelBean：{}", packBean); + return null; + } catch (NonUniqueResultException ex) { + LOGGER.error("查询单条记录，但出现多条。packBean：{}", packBean); + throw new RuntimeException("存在多条记录：" + ex.getMessage()); + } + } + + @Override + public T getByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) { + String queryString = + selectAll + " where " + entityType.getAlias() + "." + propertyName + "= :" + entityType.getAlias() + "_" + propertyName; + try { + List list = entityManager.createQuery(queryString) + .setParameter(entityType.getAlias() + "_" + propertyName, value) + .getResultList(); + return list.size() != 0 ? list.get(0) : null; + } catch (NoResultException ne) { + LOGGER.error("数据不存在，prop：{},value：{}", propertyName, value, ne); + return null; + } catch (NonUniqueResultException ex) { + LOGGER.error("查询单条记录，但出现多条。prop：{},value：{}", propertyName, value, ex); + throw new RuntimeException("存在多条记录：" + ex.getMessage()); + } + } + + @Override + public T getByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) { + if (propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append(selectAll); + + int size = propertyNames.length; + if (size > 0) { + queryString.append("where 1=1 "); + } + + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + + Query queryObject = entityManager.createQuery(queryString.toString()); + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + } + + try { + List list = queryObject.getResultList(); + return list.size() != 0 ? list.get(0) : null; + } catch (NoResultException ne) { + LOGGER.error("数据不存在", ne); + return null; + } catch (NonUniqueResultException ex) { + LOGGER.error("查询单条记录，但出现多条。", ex); + throw new RuntimeException("存在多条记录：" + ex.getMessage()); + } + } + + @Override + public int listCount() { + try { + Long count = entityManager.createQuery(selectCount, Long.class).getSingleResult(); + return count == null ? 0 : count.intValue(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public int findByPropertyCount(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) { + try { + String queryString = selectCount + " where " + entityType.getAlias() + "." + propertyName + + "= :" + entityType.getAlias() + "_" + propertyName; + Long count = entityManager.createQuery(queryString, Long.class) + .setParameter(entityType.getAlias() + "_" + propertyName, value) + .getSingleResult(); + return count == null ? 0 : count.intValue(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public int findByPropertyCount(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) { + if (propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append("select count(distinct model) from " + masterClass.getName() + " as model"); + + int size = propertyNames.length; + if (size > 0) { + queryString.append(" where 1=1 "); + } + + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + + Query queryObject = entityManager.createQuery(queryString.toString(), Long.class); + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryObject.setParameter(propertyNames[i], values[i]); + } + } + + try { + Long count = (Long) queryObject.getSingleResult(); + return count == null ? 0 : count.intValue(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public List findByPropertyPage(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value, String orderByStuff, Pager pager) { + if (pager.getTotalRows() > 0) { + String queryString = selectAll + " where " + entityType.getAlias() + "." + propertyName + "= :" + entityType.getAlias() + "_" + propertyName + " " + orderByStuff; + return entityManager.createQuery(queryString) + .setParameter(entityType.getAlias() + "_" + propertyName, value) + .getResultList(); + } else { + return new ArrayList<>(); + } + } + + @Override + public List findByPropertyPage(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, + String orderByStuff, Pager pager) { + if (pager.getTotalRows() > 0) { + if (propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append(selectAll); + + int size = propertyNames.length; + if (size > 0) { + queryString.append("where 1=1 "); + } + + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + + if (orderByStuff != null && orderByStuff.length() > 0) { + queryString.append(orderByStuff); + } + + Query queryObject = entityManager.createQuery(queryString.toString()); + for (int i = 0; i < size; i++) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + + return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); + } else { + return new ArrayList<>(); + } + } + + @Override + public List findByHqlWhere(DdlPackMdmModelBean packBean) { + Query query = entityManager.createQuery(selectAll + " where 1=1 " + packBean.getPackedHql()); + + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + return query.getResultList(); + } + + @Override + public List findByHqlWhere(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff) { + if (propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append(selectAll + " as where 1=1 "); + + if (hqlWhere != null && hqlWhere.length() > 0) { + queryString.append(hqlWhere); + } + + int size = propertyNames.length; + for (int i = 0; i < size; i++) { + if (propertyNames[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + + queryString.append("" + orderByStuff); + + Query queryObject = entityManager.createQuery(queryString.toString()); + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + } + return queryObject.getResultList(); + } + + @Override + public int findByHqlWhereCount(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) { + if (propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append(selectCount + " where 1=1 "); + + if (hqlWhere != null && hqlWhere.length() > 0) { + queryString.append(hqlWhere); + } + + int size = propertyNames.length; + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + + Query queryObject = entityManager.createQuery(queryString.toString()); + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + } + + try { + Long count = entityManager.createQuery(queryString.toString(), Long.class).getSingleResult(); + return count == null ? 0 : count.intValue(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public List findByHqlWherePage(String hqlWhere, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values, String orderByStuff) { + if (pager.getTotalRows() > 0) { + if (propertyNames.length != values.length) { + throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); + } + StringBuffer queryString = new StringBuffer(); + queryString.append(selectAll + " where 1=1 "); + + if (hqlWhere != null && hqlWhere.length() > 0) { + queryString.append(hqlWhere); + } + + int size = propertyNames.length; + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryString.append( + MessageFormat.format(" and {0}.{1}= :{2}_{3}" + , entityTypes[i].getAlias() + , propertyNames[i] + , entityTypes[i].getAlias() + , propertyNames[i] + ) + ); + } + } + queryString.append(" " + orderByStuff); + + Query queryObject = entityManager.createQuery(queryString.toString()).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()); + for (int i = 0; i < size; i++) { + if (values[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + } + + return queryObject.getResultList(); + } else { + return new ArrayList<>(); + } + } + + @Override + public List findByHqlWherePage(DdlPackMdmModelBean packBean, Pager pager) { + if (pager.getTotalRows() > 0) { + Query query = entityManager.createQuery(selectAll + " where 1=1 " + packBean.getPackedHql()); + + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + + return query.setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + } else { + return new ArrayList<>(); + } + } + + @Override + public int findByHqlWhereCount(DdlPackMdmModelBean packBean) { + StringBuffer queryString = new StringBuffer(); + queryString.append(selectCount + " where 1=1 " + packBean.getWhereAppend()); + + Query query = entityManager.createQuery(queryString.toString(), Long.class); + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + try { + Long count = (Long) query.getSingleResult(); + return count == null ? 0 : count.intValue(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public int findByHqlCount(String hql) { + try { + Long count = entityManager.createQuery(hql, Long.class).getSingleResult(); + return count == null ? 0 : count.intValue(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public int findByHqlCount(String hql, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue) { + Query queryObject = entityManager.createQuery(hql, Integer.class); + for (int i = 0; i < paramName.length; i++) { + if (paramValue[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + paramName[i], paramValue[i]); + } + } + try { + return (int) queryObject.getSingleResult(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public List findByHqlPage(DdlPackMdmModelBean packBean, Pager pager) { + if (pager.getTotalRows() > 0) { + Query query = entityManager.createQuery(selectAll + " where 1=1 " + packBean.getPackedHql()); + + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + + return query.setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + } else { + return new ArrayList<>(); + } + } + + @Override + public List findByHqlPage(String hql, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, Object[] paramValue) { + if (pager.getTotalRows() > 0) { + Query queryObject = entityManager.createQuery(hql); + for (int i = 0; i < paramName.length; i++) { + if (paramValue[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + paramName[i], paramValue[i]); + } + } + + return queryObject.setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + } else { + return new ArrayList<>(); + } + } + + @Override + public double findByHqlDouble(DdlPackMdmModelBean packBean) { + try { + Query query = entityManager.createQuery(packBean.getPackedHqlAll(), Double.class); + + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + + Double result = (Double) query.getSingleResult(); + return result == null ? 0 : result; + } catch (NoResultException e) { + return 0; + } + } + + @Override + public long findByHqlLong(DdlPackMdmModelBean packBean) { + try { + Query query = entityManager.createQuery(selectAll + " where 1=1 " + packBean.getPackedHql(), Long.class); + + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + + return (long) query.getSingleResult(); + } catch (NoResultException e) { + return 0; + } + } + + @Override + public List findByHqlTopWhere(DdlPackMdmModelBean packBean, int topNum) { + Query query = entityManager.createQuery(selectAll + " where 1=1 " + packBean.getPackedHql()); + + for (int i = 0; i < packBean.getKeyList().size(); i++) { + query.setParameter( + packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getValueList().get(i) + ); + } + + return query.setFirstResult(0).setMaxResults(topNum).getResultList(); + } + + @Override + public List findByHqlObjects(String hql) { + return entityManager.createQuery(hql).getResultList(); + } + + @Override + public List findByHqlObjects(String hql, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] paramName, + Object[] paramValue) { + Query queryObject = entityManager.createQuery(hql); + for (int i = 0; i < paramName.length; i++) { + if (paramValue[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + paramName[i], paramValue[i]); + } + } + + return queryObject.getResultList(); + } + + @Override + public List findByHqlPageObjects(String hql, Pager pager) { + if (pager.getTotalRows() > 0) { + return entityManager.createQuery(hql).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); + } else { + return new ArrayList(); + } + } + + @Override + public List findByHqlPageObjects(String hql, Pager pager, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) { + if (pager.getTotalRows() > 0) { + Query queryObject = entityManager.createQuery(hql); + for (int i = 0; i < propertyNames.length; i++) { + if (propertyNames[i] != null) { + queryObject.setParameter(entityTypes[i].getAlias() + "_" + propertyNames[i], values[i]); + } + } + + return queryObject.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); + } else { + return new ArrayList(); + } + } + + @Override + public List findBySqlObjList(String sql) { + return entityManager.createNativeQuery(sql).getResultList(); + } + + @Override + public List findBySqlObjListByPager(String sql, Pager pager) { + if (pager.getTotalRows() > 0) { + return entityManager.createNativeQuery(sql) + .setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); + } else { + return new ArrayList(); + } + } + + /************** 部分业务 *************/ + private String getNowTime(boolean needSecond) { + return needSecond ? getNowTime("yyyy-MM-dd HH:mm:ss") : getNowTime("yyyy-MM-dd HH:mm"); + } + + private String getNowTime(String format) { + String dateTime; + try { + dateTime = (new SimpleDateFormat(format)).format(new Date()); + } catch (Exception e) { + dateTime = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(new Date()); + } + + return dateTime; + } + + @Override + public boolean isExitByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) { + //大于0，存在 + return findByPropertyCount(entityType, propertyName, value) > 0; + } + + @Override + public boolean isExitByProperty(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) { + return findByPropertyCount(entityTypes, propertyNames, values) > 0; + } + + @Override + public boolean isExitByHqlWhere(String hqlWhere, MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, String[] propertyNames, Object[] values) { + return findByHqlWhereCount(hqlWhere, entityTypes, propertyNames, values) > 0; + } + + @Override + public boolean isExitByHql(DdlPackMdmModelBean packBean) { + return findByHqlWhereCount(packBean) > 0; + } + + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/MdmPagerQueryModel.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/MdmPagerQueryModel.java new file mode 100644 index 0000000..51c84a3 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/MdmPagerQueryModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mdm.model; + + +import cn.estsh.i3plus.pojo.base.common.Pager; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-29 10:23 + * @Modify: + **/ +@Data +public class MdmPagerQueryModel { + + /** + * 实体 + */ + private T bean; + + /** + * 分页条件 + */ + private Pager pager; + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/core/MdmGearCoreBusiModel.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/core/MdmGearCoreBusiModel.java new file mode 100644 index 0000000..6768a27 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/model/core/MdmGearCoreBusiModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mdm.model.core; + +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiModelBean; +import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd; +import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @Description : 主数据齿轮-平台model + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-12 18:09 + * @Modify: + **/ +@Data +@ApiModel("齿轮平台业务model") +public class MdmGearCoreBusiModel extends BaseMdmBusiModelBean { + public MdmGearCoreBusiModel(MdmGear mdmMasterBean, MdmGearCoreBusiExtd mdmBusiBean) { + super(mdmMasterBean, mdmBusiBean); + } +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/modelrepository/core/MdmGearCoreRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/modelrepository/core/MdmGearCoreRepository.java new file mode 100644 index 0000000..acede04 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/modelrepository/core/MdmGearCoreRepository.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.mdm.modelrepository.core; + +import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd; +import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; +import cn.estsh.i3plus.pojo.mdm.jpa.dao.MdmBusiModelRepository; +import cn.estsh.i3plus.pojo.mdm.jpa.daoimpl.MdmBusiModelRepositoryImpl; +import cn.estsh.i3plus.pojo.mdm.model.core.MdmGearCoreBusiModel; +import org.springframework.stereotype.Component; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-25 11:42 + * @Modify: + **/ +@Component +public class MdmGearCoreRepository + extends MdmBusiModelRepositoryImpl + implements MdmBusiModelRepository { +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java new file mode 100644 index 0000000..57d3e64 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.mdm.repository; + +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean; +import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; + +import java.util.List; + +/** + * @Description : 主数据中心 HQL 包 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-20 15:23 + * @Modify: + **/ +public class MdmHqlPack { + + public static DdlPackBean getMdmPackBean(BaseMdmBean mdmBean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmBean); + + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", ddlPackBean); + return ddlPackBean; + } + + public static DdlPackBean getMdmPackBean() { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", ddlPackBean); + return ddlPackBean; + } + + + public static DdlPackBean packHqlIdList(List idList) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getInPackList(idList,"id",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlMdmGear(MdmGear mdmGear) { + DdlPackBean ddlPackBean = getMdmPackBean(mdmGear); + + DdlPreparedPack.getNumEqualPack(mdmGear.getId(),"id",ddlPackBean); + DdlPreparedPack.getStringLikerPack(mdmGear.getName(),"name",ddlPackBean); + DdlPreparedPack.timeBuilder(mdmGear.getCreateDatetime(),"createDatetime",ddlPackBean,false,true); + + return ddlPackBean; + } + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/core/MdmGearCoreBusiModelRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/core/MdmGearCoreBusiModelRepository.java new file mode 100644 index 0000000..6a6f3e9 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/core/MdmGearCoreBusiModelRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mdm.repository.busi.core; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-15 16:26 + * @Modify: + **/ +@Repository +public interface MdmGearCoreBusiModelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmGearRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmGearRepository.java new file mode 100644 index 0000000..43b555f --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmGearRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mdm.repository.master; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-15 16:26 + * @Modify: + **/ +@Repository +public interface MdmGearRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java new file mode 100644 index 0000000..b372b7b --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmModelPreparedPack.java @@ -0,0 +1,699 @@ +package cn.estsh.i3plus.pojo.mdm.sqlpack; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import cn.estsh.i3plus.pojo.mdm.bean.base.DdlPackMdmModelBean; +import org.apache.commons.lang3.StringUtils; + +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +/** + * @Description : 数据库脚本封装方法，封装成预加载hql，HqlPack仅限用于一些特定的sql，可能造成性能低下 + * example： name = :name + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2019-03-29 + * @Modify: + **/ +public class DdlMdmModelPreparedPack { + + /** + * 封装日期 + * + * @param startDate 开始日期 + * @param endDate 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） + * @param columnName HQL里对应的时间字段 + * @param packBean 封装的HQL对象 + * @param isShowTime 是否包含时分秒 + */ + public static void timeBuilder(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String startDate, String endDate, String columnName, + DdlPackMdmModelBean packBean, boolean isShowTime) { + if (startDate == null || startDate.trim().length() == 0) { + startDate = "1900-01-01"; + } else { + startDate = startDate.trim(); + } + if (isShowTime && startDate.trim().length() <= 11) { + startDate += " 00:00:00"; + } + if (endDate == null || endDate.trim().length() == 0) { + endDate = "2100-01-01"; + } else { + endDate = endDate.trim(); + } + if (isShowTime && endDate.trim().length() <= 11) { + endDate += " 23:59:59"; + } + + packBean.addColumnQuery(entityType, columnName + , " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName + , startDate); + packBean.addColumnQuery(entityType, "s_" + columnName + , " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName + , endDate); + } + + /** + * 封装日期 + * + * @param startDate 开始日期 + * @param endDate 结束日期 + * @param columnName 列名 + * @param isLeftContain 左闭？ + * @param isRightContain 右闭？ + * @param packBean HQL对象 + */ + public static void timeBuilder(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String startDate, String endDate, String columnName, boolean isLeftContain, boolean isRightContain, DdlPackMdmModelBean packBean) { + if (isLeftContain) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, startDate.trim()); + } else { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, startDate.trim()); + } + if (isRightContain) { + packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, endDate.trim()); + } else { + packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, endDate.trim()); + } + } + + /** + * 封装日期 + * + * @param date 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） + * @param columnName HQL里对应的时间字段 + * @param packBean 封装的HQL + * @param showTaday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有 + * @param isShowTime 是否包含时分秒 + */ + public static void timeBuilder(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String date, String columnName, DdlPackMdmModelBean packBean, Boolean showTaday, boolean isShowTime) { + if (date != null && date.trim().length() > 0) { + String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date()); + if (date.trim().length() > 0 && (date.length() == 1 || ",".equals(date))) { + //只有一个逗号 + date = ""; + } + + String[] time = date.split(","); + if (time.length == 1) { + //只有开始日期，没有结束日期 + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, "%" + time[0] + "%"); + } else if (time.length == 2 && ((time[0] != null && time[0].trim().length() > 0) + || (time[1] != null & time[1].trim().length() > 0))) { + if (time[0] == null || time[0].trim().length() == 0) { + time[0] = "1900-01-01"; + } else { + time[0] = time[0].trim(); + } + if (isShowTime && time[0].trim().length() <= 11) { + time[0] += " 00:00:00"; + } + if (time[1] == null || time[1].trim().length() == 0) { + time[1] = "2100-01-01"; + } else { + time[1] = time[1].trim(); + } + if (isShowTime && time[1].trim().length() <= 11) { + time[1] += " 23:59:59"; + } + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, time[0]); + packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, time[1]); + } else { + if (showTaday) { + if (isShowTime) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, today + " 00:00:00"); + packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, today + " 23:59:59"); + } else { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " " +">= :" + entityType.getAlias() + "_" + columnName,today); + packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, today); + } + } + } + } + } + + + /** + * 封装日期 + * + * @param date 日期，需要和时间字段的值格式相同 + * @param startColumnName HQL里对应的开始时间字段 + * @param endColumnName HQL里对应的结束时间字段 + * @param packBean 封装的HQL + * @param isShowTime 是否包含时分秒 + */ + public static void getTimeBetweenCol(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String date, String startColumnName, String endColumnName, + DdlPackMdmModelBean packBean, boolean isShowTime) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if (date == null || date.trim().length() == 0) { + date = sdf.format(new Date()); + } + if (!isShowTime) { + date = date.substring(0, 10); + packBean.addColumnQuery(entityType, null, " and '" + date + "' between substring(" + entityType.getAlias() + "." + startColumnName + + ",1,10) and substring(" + entityType.getAlias() + "." + endColumnName + ",1,10)", null); + return; + } else if (date.trim().length() <= 11) { + date += " 00:00:00"; + } + packBean.addColumnQuery(entityType, null, " and '" + date + "' between " + entityType.getAlias() + "." + startColumnName + + " and " + entityType.getAlias() + "." + endColumnName, null); + } + + /** + * 封装String对象成order by排序 + * + * @param columnName 列名 + * @param packBean + */ + public static void getOrderByPack(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, Object order[], String[] columnName, + DdlPackMdmModelBean packBean) { + String sqlStr = ""; + String orderByStr = ""; + for (int i = 0; i < order.length; i++) { + if (order[i] != null && order[i].toString().trim().length() > 0) { + if (Integer.parseInt(order[i].toString()) == 1) { + order[i] = "asc"; + } else { + order[i] = "desc"; + } + if (columnName[i].indexOf(" model.") == -1) { + sqlStr += entityTypes[i].getAlias() + "." + columnName[i]; + } else { + sqlStr += columnName[i]; + } + sqlStr += " " + order[i].toString() + ","; + } + } + + if (sqlStr.length() > 0 && sqlStr.lastIndexOf(",") == sqlStr.length() - 1) { + sqlStr = sqlStr.substring(0, sqlStr.length() - 1); + orderByStr = " order by " + sqlStr; + } + + packBean.setOrderByStr(orderByStr); + } + + /** + * 对象默认排序 + */ + public static void getOrderDefault(BaseBean bean) { + if (bean != null && StringUtils.isBlank(bean.getOrderByParam())) { + bean.setOrderByParam("modifyDatetime"); + bean.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); + } + } + + /** + * 封装String对象成like语句 + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, "%" + val + "%"); + } + } + + /** + * 封装String对象成like语句 + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikerPackOr(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " or " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, "%" + val + "%"); + } + } + + /** + * 封装String对象成like语句(右侧模糊) + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringRightLikerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, val + "%"); + } + } + + /** + * 封装String对象成like语句(左侧模糊) + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLeftLikerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, "%" + val); + } + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, val); + } + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikePack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " like :" + entityType.getAlias() + "_" + columnName, val); + } + } + + /** + * 封装String对象成不等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNoEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " <> :" + entityType.getAlias() + "_" + columnName, val); + } + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNotNullPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String columnName, DdlPackMdmModelBean packBean) { + packBean.addColumnQuery(entityType, null, " and " + entityType.getAlias() + "." + columnName + " is not null", null); + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNotBlanklPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String columnName, DdlPackMdmModelBean packBean) { + packBean.addColumnQuery(entityType, null, " and (" + entityType.getAlias() + "." + columnName + " is not null and " + entityType.getAlias() + "." + columnName + " !='')", null); + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringEqualPackOr(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String val, String columnName, DdlPackMdmModelBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(entityType, columnName, " or " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, val); + } + } + + /** + * 封装long或者int的正整数对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Long.parseLong(data.toString()) > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 两个字段不相等 + * + * @param firstColumnName 列名 + * @param packBean + */ + public static void getNotEqueals(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String firstColumnName, String twoColumnName, DdlPackMdmModelBean packBean) { + packBean.addColumnQuery(entityType, null, " and UPPER(" + entityType.getAlias() + "." + firstColumnName + ")!= UPPER(" + entityType.getAlias() + "." + twoColumnName + ")", null); + } + + /** + * 封装long或者int的负整数对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNegativeNumEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPackOr(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Long.parseLong(data.toString()) > 0) { + packBean.addColumnQuery(entityType, columnName, " or " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPackOverZero(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Double.parseDouble(data.toString()) > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumWithZeroEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Double.parseDouble(data.toString()) >= 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " = :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装String对象成大于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringBiggerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装String对象成大于不等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringBiggerNotEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " > :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装String对象成小于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringSmallerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { + packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_s_" + columnName, data); + } + } + + /** + * 封装String对象成小于不等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringSmallerNotEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { + packBean.addColumnQuery(entityType, "s_" + columnName, " and " + entityType.getAlias() + "." + columnName + " < :" + entityType.getAlias() + "_s_" + columnName, data); + } + } + + /** + * 封装double对象成大于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Double.parseDouble(data.toString()) > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " > :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装double对象成大于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerPackContainsZero(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " > :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装double对象成大于等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Double.parseDouble(data.toString()) > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " >= :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装double对象成小于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Double.parseDouble(data.toString()) > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " < :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装double对象成小于等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && Double.parseDouble(data.toString()) > 0) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " <= :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装long或者int的整数对象成equal语句(不等于) + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumNOEqualPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null) { + packBean.addColumnQuery(entityType, columnName, " and " + entityType.getAlias() + "." + columnName + " <> :" + entityType.getAlias() + "_" + columnName, data); + } + } + + /** + * 封装in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null) { + packBean.addColumnQuery(entityType, "in_"+columnName, + " and " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", data); + } + } + + /** + * 两个提交用or拼接 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotOrIsNull(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null) { + packBean.addColumnQuery(entityType, "in_"+columnName, " and (" + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ") " + + "or " + entityType.getAlias() + "." + columnName + " is null)", data); + } + } + + + /** + * 封装in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getOrInPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null) { + packBean.addColumnQuery(entityType, "in_"+columnName," or " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", data); + } + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackArray(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object[] data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && data.length > 0) { + packBean.addColumnQuery(entityType, "in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", Arrays.asList(data)); + } + } + + /** + * 封装not in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackArray(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object[] data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && data.length > 0) { + packBean.addColumnQuery(entityType, "in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " not in (:" + entityType.getAlias() + "_in_" + columnName + ")", Arrays.asList(data)); + } + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackList(MdmEnumUtil.HQL_ENTITY_TYPE entityType, List data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && data.size() > 0) { + packBean.addColumnQuery(entityType, "in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", data); + } + } + + /** + * 封装not in List查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackList(MdmEnumUtil.HQL_ENTITY_TYPE entityType, List data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && data.size() > 0) { + packBean.addColumnQuery(entityType, "in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " not in (:" + entityType.getAlias() + "_in_" + columnName + ")", data); + } + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInOrPackString(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && data.trim().length() > 0) { + //判断最后一位是不是逗号 + if (data.lastIndexOf(",") != (data.length() - 1)) { + data += ","; + } + String[] dataArray = data.substring(0, data.length() - 1).split(","); + data = ""; + for (int i = 0; i < dataArray.length; i++) { + if (i == dataArray.length - 1) { + data += "'" + dataArray[i] + "'"; + } else { + data += "'" + dataArray[i] + "',"; + } + } + packBean.addColumnQuery(entityType, "in_"+columnName, " or " + entityType.getAlias() + "." + columnName + " in (:" + entityType.getAlias() + "_in_" + columnName + ")", data); + } + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackString(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null && data.trim().length() > 0) { + //判断最后一位是不是逗号 + if (data.lastIndexOf(",") != (data.length() - 1)) { + data += ","; + } + String[] dataArray = data.substring(0, data.length() - 1).split(","); + data = ""; + for (int i = 0; i < dataArray.length; i++) { + if (i == dataArray.length - 1) { + data += "'" + dataArray[i] + "'"; + } else { + data += "'" + dataArray[i] + "',"; + } + } + packBean.addColumnQuery(entityType,"in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " not in (:" + entityType.getAlias() + "_in_" + columnName + ")", data); + } + } + + /** + * 封装not in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPack(MdmEnumUtil.HQL_ENTITY_TYPE entityType, Object data, String columnName, DdlPackMdmModelBean packBean) { + if (data != null) { + packBean.addColumnQuery(entityType, "in_"+columnName, " and " + entityType.getAlias() + "." + columnName + " not in (:" + entityType.getAlias() + "_in_" + columnName + ")", data); + } + } + + /** + * 转换排序列 + * + * @param columnName 列名 + * @param basisType 基本类型 + * @return + * @see CommonEnumUtil.BASIS_TYPE + */ + public static String getOrderColConvertType(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String columnName, int basisType) { + String name = " " + entityType.getAlias() + "." + columnName; + + if (basisType == CommonEnumUtil.BASIS_TYPE.INT.getValue()) { + name = " cast(" + name + " as integer)"; + } else if (basisType == CommonEnumUtil.BASIS_TYPE.DOUBLE.getValue()) { + name = " cast(" + name + " as decimal)"; + } else if (basisType == CommonEnumUtil.BASIS_TYPE.LONG.getValue()) { + name = " cast(" + name + " as long)"; + } + return name; + } +} From 2f01b41c1ef92315ca161da2baac1c30180ae166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 8 Jun 2020 13:41:44 +0800 Subject: [PATCH 13/25] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java index b9e2fea..def59a3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java @@ -54,7 +54,7 @@ public class SysLogConsole extends BaseBean { private Integer logPort; @Column(name="LOG_GROUP") - @ApiParam(value ="日志分组(控制台日志,操作日志,系统日志,定任务日志)") + @ApiParam(value ="日志分组(日志记录器名称，getLogger方法的参数值)") private String logGroup; @Column(name="LOG_LEVEL") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 3d7d445..499d89b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -456,7 +456,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysFile(SysFile file) { - DdlPackBean result = DdlPackBean.getDdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(file); // hql拼接 DdlPreparedPack.getStringLikerPack(file.getFileOriginalName(), "fileOriginalName", result); @@ -466,9 +466,6 @@ public class CoreHqlPack { DdlPreparedPack.getStringLikerPack(file.getFileCode(), "fileCode", result); DdlPreparedPack.timeBuilder(file.getCreateDatetime(), "createDatetime", result, false, false); - // 添加默认排序 - DdlPreparedPack.getOrderDefault(file); - return result; } From fb603db58e20a6a772026965805e3b7a53b5dfff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 8 Jun 2020 13:43:52 +0800 Subject: [PATCH 14/25] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=8B=BE=E5=8F=96?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/bean/BfElementConstraintProperty.java | 56 ------------------ .../pojo/form/bean/BfElementPickUpProperty.java | 66 ++++++++++++++++++++++ .../i3plus/pojo/form/bean/BfElementProperty.java | 4 ++ .../BfElementPickUpPropertyRepository.java | 14 +++++ 4 files changed, 84 insertions(+), 56 deletions(-) delete mode 100644 modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraintProperty.java create mode 100644 modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPickUpProperty.java create mode 100644 modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementPickUpPropertyRepository.java diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraintProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraintProperty.java deleted file mode 100644 index 839099e..0000000 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraintProperty.java +++ /dev/null @@ -1,56 +0,0 @@ -//package cn.estsh.i3plus.pojo.form.bean; -// -//import cn.estsh.i3plus.pojo.base.bean.BaseBean; -//import com.fasterxml.jackson.databind.annotation.JsonSerialize; -//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -//import io.swagger.annotations.Api; -//import io.swagger.annotations.ApiParam; -//import lombok.Data; -//import lombok.EqualsAndHashCode; -//import org.hibernate.annotations.DynamicInsert; -//import org.hibernate.annotations.DynamicUpdate; -// -//import javax.persistence.Column; -//import javax.persistence.Entity; -//import javax.persistence.Table; -// -///** -// * @Description : 元素约束属性 -// * @Reference : -// * @Author : yunhao -// * @CreateDate : 2020-03-12 13:36 -// * @Modify: -// **/ -//@Data -//@Entity -//@DynamicInsert -//@DynamicUpdate -//@EqualsAndHashCode(callSuper = true) -//@Table(name = "BF_ELEMENT_CONSTRAINT_PROPERTY") -//@Api(value = "元素约束属性", description = "元素约束属性") -//public class BfElementConstraintProperty extends BaseBean { -// -// @Column(name = "CONSTRAINT_ID") -// @ApiParam(value = "约束ID", example = "-1") -// @JsonSerialize(using = ToStringSerializer.class) -// private Long constraintId; -// -// @Column(name = "ELEMENT_PROPERTY_ID") -// @ApiParam(value = "元素属性ID", example = "-1") -// @JsonSerialize(using = ToStringSerializer.class) -// private Long elementPropertyId; -// -// @Column(name = "DATA_OBJECT_PROPERTY_ID") -// @ApiParam(value = "数据对象属性ID", example = "-1") -// @JsonSerialize(using = ToStringSerializer.class) -// private Long dataObjectPropertyId; -// -// @Column(name="PROPERTY_NAME") -// @ApiParam(value ="元素属性名称") -// private String propertyName; -// -// @Column(name="PROPERTY_CODE_RDD") -// @ApiParam(value ="元素属性代码") -// private String propertyCodeRdd; -// -//} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPickUpProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPickUpProperty.java new file mode 100644 index 0000000..8bf2d5c --- /dev/null +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPickUpProperty.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.form.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 表单拾取属性 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-27 21:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BF_ELEMENT_PICK_UP_PROPERTY") +@Api(value = "表单拾取属性", description = "表单拾取属性") +public class BfElementPickUpProperty extends BaseBean { + + @Column(name = "PICK_UP_PROPERTY_ID") + @ApiParam(value = "拾取属性id", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long pickUpPropertyId; + + @Column(name = "ELEMENT_ID") + @ApiParam(value = "对象元素ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long elementId; + + @Column(name="ELEMENT_PROPERTY_ID") + @ApiParam(value ="元素属性id") + @JsonSerialize(using = ToStringSerializer.class) + private Long elementPropertyId; + + @Column(name="ELEMENT_PROPERTY_NAME") + @ApiParam(value ="元素属性名称") + private String elementPropertyName; + + @Column(name = "PICK_UP_ELEMENT_ID") + @ApiParam(value = "拾取元素ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long pickUpElementId; + + @Column(name="PICK_UP_ELEMENT_PROPERTY_ID") + @ApiParam(value ="拾取元素属性id") + @JsonSerialize(using = ToStringSerializer.class) + private Long pickUpElementPropertyId; + + @Column(name="PICK_UP_ELEMENT_PROPERTY_NAME") + @ApiParam(value ="拾取元素属性名称") + private String pickUpElementPropertyName; + +} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java index 8cc9ca2..a89a117 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description : 数据对象 @@ -149,6 +150,9 @@ public class BfElementProperty extends BaseBean { @ApiParam(value ="是否为唯一约束字段") private transient Integer isUniqueProperty; + @Transient + @ApiParam(value ="拾取关联属性") + private List pickUpPropertyList; // public Object getFormValue() { // return propertyFormValue == null ? propertyDefaultValue : propertyFormValue; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementPickUpPropertyRepository.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementPickUpPropertyRepository.java new file mode 100644 index 0000000..99bbfc8 --- /dev/null +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementPickUpPropertyRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.form.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.form.bean.BfElementPickUpProperty; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-21 15:18 + * @Modify: + **/ +public interface BfElementPickUpPropertyRepository extends BaseRepository { +} From b9a619f4fef701253ba59001bde90a2c4cead4f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 8 Jun 2020 13:44:14 +0800 Subject: [PATCH 15/25] =?UTF-8?q?REST=E8=B0=83=E6=95=B4=E6=B7=BB=E5=8A=A0r?= =?UTF-8?q?equestBody=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java index 5fcea3e..eb8b13c 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java @@ -46,6 +46,12 @@ public class BsSuitCaseREST extends BaseBean { @AnnoOutputColumn(refClass = CommonEnumUtil.HTTP_METHOD_TYPE.class) private Integer requestMethodId; + //CommonEnumUtil.TRUE_OR_FALSE + @Column(name = "IS_REQUEST_BODY") + @ApiParam(value = "是否使用requestBody") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + private Integer isRequestBody; + @Transient @ApiParam(value = "请求头转换") private List requestHeaderList; From 47904278c5fa30e2995a1af83d1b6acdfa9db714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 8 Jun 2020 15:46:42 +0800 Subject: [PATCH 16/25] =?UTF-8?q?2092=20MES202006-=E9=A6=96=E6=A3=80?= =?UTF-8?q?=E3=80=81=E5=B7=A1=E6=A3=80=E6=A3=80=E9=AA=8C=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=94=9F=E6=88=90=E9=80=BB=E8=BE=91=E5=8F=98=E6=9B=B4-20200615?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 2 +- 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java index 8e58dec..74de05a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java @@ -98,4 +98,8 @@ public class IfQcOrder extends BaseBean implements Serializable { @ApiParam("检测类型") private Integer checkType; + @Column(name = "CUST_DELIERY_LOCATION") + @ApiParam("客户发运地") + private String custDelieryLocation; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index 3f0402c..b9c75bf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -88,6 +88,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("是否允许让步") private Integer isConcession = 0; + @Column(name = "NUMBER_FLAG") + @ApiParam("数量标识") + private String numberFlag; + @Transient @ApiParam("检测类型名称") private String checkTypeName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 5dd373d..9e98310 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -100,6 +100,10 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("发运时间") private String deliveryDate; + @Column(name = "CUST_DELIERY_LOCATION") + @ApiParam("客户发运地") + private String custDelieryLocation; + @ApiParam(value = "检测结果") @Transient private String reulstStatus; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index 3f192ac..60fae90 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -82,7 +82,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam(value = "已完成数量") @Transient - private Integer finishQty; + private Integer finishQty = 0; @ApiParam(value = "检测项类型名称") @Transient From 1afa60623c9933dee5a672600a3e99143a0f80cf Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 8 Jun 2020 18:02:24 +0800 Subject: [PATCH 17/25] Finish Task #2090 Cost:16h --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 +- .../pojo/mes/bean/MesScatterPartProdCfg.java | 4 + .../pojo/mes/model/ScatterPartProdCfgModel.java | 89 ++++++++++++++++++++++ 3 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterPartProdCfgModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index abd8d53..66b958a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -2520,7 +2520,8 @@ public class MesPcnEnumUtil { STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"), RUNNING_INFO("runningInfo", "执行信息"), STOP_PCS_CTL("stopPcsCtl", "停止监控"), - RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"); + RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"), + PROCESS_CONTENT("processContent", "过程组件内容"); private String value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java index 4e01a47..1f6001b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java @@ -161,4 +161,8 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable { @Column(name = "IS_END_SEQ") @ApiParam("是否截至顺序号") private Integer isEndSeq; + + @Column(name = "MULTIMEDIA_PLUG_QTY") + @ApiParam("多媒体插头数量") + private Double multimediaPlusQty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterPartProdCfgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterPartProdCfgModel.java new file mode 100644 index 0000000..e1cb609 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterPartProdCfgModel.java @@ -0,0 +1,89 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/6/8 1:22 下午 + * @Modify: + */ +@Data +public class ScatterPartProdCfgModel { + + private Long id; + + private String organizeCode; + + @ApiParam("配置编号") + private String cfgId; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("车型标志值") + private String modelFalgValue; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("等级代码") + private String gradeCode; + + @ApiParam("颜色代码") + private String colorCode; + + @ApiParam("标志位") + private Integer partFlagLocation; + + @ApiParam("标志值") + private String partFlagValue; + + @ApiParam("防错码") + private String pokeYokeFix; + + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @ApiParam("确认扫描次数") + private Integer checkScanCount; + + @ApiParam("组合码发送顺序") + private Integer sendSeq; + + @ApiParam("黄枪规则") + private Integer yellowGunRule; + + @ApiParam("是否截至顺序号") + private Integer isEndSeq; + + @ApiParam("多媒体插头数量") + private Double multimediaPlusQty; + + public ScatterPartProdCfgModel() {} + + public ScatterPartProdCfgModel(Long id, String workCenterCode, String workCellCode, String partNo, String partName + , String gradeCode, String colorCode, String prodCfgTypeCode, String produceCtgyCode, Double multimediaPlusQty) { + this.id = id; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.partNo = partNo; + this.partName = partName; + this.gradeCode = gradeCode; + this.colorCode = colorCode; + this.prodCfgTypeCode = prodCfgTypeCode; + this.produceCtgyCode = produceCtgyCode; + this.multimediaPlusQty = multimediaPlusQty; + } +} From c39c9b6f70cf61559c99d2b164b3919e5c873e41 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 8 Jun 2020 23:04:44 +0800 Subject: [PATCH 18/25] ptl --- .../i3plus/pojo/base/enumutil/PtlEnumUtil.java | 25 ++++ .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 160 --------------------- .../i3plus/pojo/ptl/bean/PtlAreaActorAction.java | 11 +- .../cn/estsh/i3plus/pojo/ptl/bean/PtlMethod.java | 49 +++++++ .../repository/PtlAreaActorActionRepository.java | 15 ++ .../pojo/ptl/repository/PtlMethodRepository.java | 15 ++ 6 files changed, 112 insertions(+), 163 deletions(-) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMethod.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaActorActionRepository.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMethodRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index 128e322..9b2b76a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -11,6 +11,31 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class PtlEnumUtil { /** + * 方法类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PTL_METHOD_TYPE { + INTERFACE(10, "界面方法"), + MONITOR(20, "监听方法"); + + private int value; + private String description; + + PTL_METHOD_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** * 流程状态-触发类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 7889a71..3d1fc0d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -3,8 +3,6 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.util.StringUtils; -import static cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil.MONITOR_PROCESS_MESSAGE_TYPE.*; - /** * @author Wynne.Lu * @date 2020/2/12 17:41 @@ -732,164 +730,6 @@ public class PtlPcnEnumUtil { } /** - * 监听消息类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MONITOR_PROCESS_MESSAGE_TYPE { - CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"), - DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), - EXCEPTION_DISCONNECT_CONTROL_CMD(25, "EXCEPTION_DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), - LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "lightOnService", "亮灯命令"), - LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "lightOffService", "灭灯命令"), - CONTROL_SIGNAL_CMD(50, "CONTROL_SIGNAL_CMD", "controlSignalService", "控制器反馈信号"), - INTERFACE_SIGNAL_CMD(60, "INTERFACE_SIGNAL_CMD", "", "发送给界面actor通过websocket返回"), - REFRESH_CONTROL_CMD(70, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"); - - private int value; - private String code; - private String callClass; - private String description; - - MONITOR_PROCESS_MESSAGE_TYPE(int value, String code, String callClass, String description) { - this.value = value; - this.code = code; - this.callClass = callClass; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getCode() { - return code; - } - - public String getCallClass() { - return callClass; - } - - public String getDescription() { - return description; - } - - public static MONITOR_PROCESS_MESSAGE_TYPE getTypeByValue(String code) { - if (StringUtils.isEmpty(code)) { - return null; - } - for (MONITOR_PROCESS_MESSAGE_TYPE enums : values()) { - if (enums.getCode().equals(code)) { - return enums; - } - } - return null; - } - } - - /** - * 界面消息类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum INTERFACE_SIGNAL_MESSAGE_TYPE { - CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"), - DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), - REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"), - SCAN_CONTROL_CMD(40, "SCAN_CONTROL_CMD", "scanControlService", "扫描"), - INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"); -// UNLOCK_CONTROL_CMD(50, "UNLOCK_CONTROL_CMD", "unlockControlService", "解锁"), -// LABEL_SELF_CHECK_CONTROL_CMD(60, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"), -// LIGHT_DETAIL_CONTROL_CMD(70, "LABEL_SELF_CHECK_CONTROL_CMD", "lightDetailControlService", "亮灯明细"); - - private int value; - private String code; - private String callClass; - private String description; - - INTERFACE_SIGNAL_MESSAGE_TYPE(int value, String code, String callClass, String description) { - this.value = value; - this.code = code; - this.callClass = callClass; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getCallClass() { - return callClass; - } - - public String getCode() { - return code; - } - - public String getDescription() { - return description; - } - - public static INTERFACE_SIGNAL_MESSAGE_TYPE getTypeByValue(String code) { - if (StringUtils.isEmpty(code)) { - return null; - } - for (INTERFACE_SIGNAL_MESSAGE_TYPE enums : INTERFACE_SIGNAL_MESSAGE_TYPE.values()) { - if (enums.getCode().equals(code)) { - return enums; - } - } - return null; - } - } - - /** - * 任务消息类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum GEN_TASK_MESSAGE_TYPE { - GEN_TASK_CMD(10, "GEN_TASK_CMD", "", "生成任务"); - - private int value; - private String code; - private String callClass; - private String description; - - GEN_TASK_MESSAGE_TYPE(int value, String code, String callClass, String description) { - this.value = value; - this.code = code; - this.callClass = callClass; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getCallClass() { - return callClass; - } - - public String getCode() { - return code; - } - - public String getDescription() { - return description; - } - - public static INTERFACE_SIGNAL_MESSAGE_TYPE getTypeByValue(String code) { - if (StringUtils.isEmpty(code)) { - return null; - } - for (INTERFACE_SIGNAL_MESSAGE_TYPE enums : INTERFACE_SIGNAL_MESSAGE_TYPE.values()) { - if (enums.getCode().equals(code)) { - return enums; - } - } - return null; - } - } - - /** * websocket业务类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java index caf5c46..ad66202 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -47,7 +48,11 @@ public class PtlAreaActorAction extends BaseBean implements Serializable { @ApiParam("特定条件") private String otherWhere; - @Column(name = "AMG_ID") - @ApiParam("组件集编号") - private Long amgId; + @Column(name = "METHOD_CODE") + @ApiParam("方法代码") + private String methodCode; + + @Transient + @ApiParam("实现类") + private String callClass; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMethod.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMethod.java new file mode 100644 index 0000000..cd2ba93 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMethod.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/14 11:18 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_METHOD") +@EqualsAndHashCode(callSuper = true) +@Api("方法清单") +public class PtlMethod extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1208980343927922927L; + + @Column(name = "METHOD_CODE") + @ApiParam("方法代码") + private String methodCode; + + @Column(name = "METHOD_NAME") + @ApiParam("方法描述") + private String methodName; + + @Column(name = "CALL_CLASS") + @ApiParam("实现类") + private String callClass; + + @Column(name = "METHOD_TYPE") + @ApiParam("方法类型") + private Integer methodType; + + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaActorActionRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaActorActionRepository.java new file mode 100644 index 0000000..8eba13c --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaActorActionRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaActorAction; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlAreaActorActionRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMethodRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMethodRepository.java new file mode 100644 index 0000000..2737250 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMethodRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlMethod; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlMethodRepository extends BaseRepository { + +} From 3173e432452235e61380020a0734842ce924acbf Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 9 Jun 2020 13:38:51 +0800 Subject: [PATCH 19/25] Fix bug#8742 --- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 25 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 108496e..4525fd2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -150,7 +150,7 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", public String destLocateNo; /** - * 状态:1=创建,10=待处理,20=已处理 + * 状态:10:创建,20:待处理,30:已处理,40:处理出错 */ @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "0") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index bb0066f..ee9d550 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -233,6 +233,31 @@ public class WmsMoveMaster extends BaseBean { this.modifyDatetime = modifyDatetime; } + public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus, + String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode, + String createDatetime, String createUser, String modifyUser, String modifyDatetime) { + this.orderNo = orderNo; + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.itemStatus = itemStatus; + this.unit = unit; + this.srcWhNo = srcWhNo; + this.srcZoneNo = srcZoneNo; + this.destWhNo = destWhNo; + this.destZoneNo = destZoneNo; + this.transQty = transQty; + this.rejectQty = rejectQty; + this.fixId = fixId; + this.busiTypeCode = busiTypeCode; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } + public WmsMoveMaster(Long itemQty , String transTypeCode , Integer orderStatus){ this.itemQty = itemQty; this.transTypeCode = transTypeCode; From 057439d050a6477ddb740b7a7a59f5c5e81321b4 Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 9 Jun 2020 16:48:33 +0800 Subject: [PATCH 20/25] Finish Task #2080 Cost:8h Finish Task #2081 Cost:12h Finish Task #2083 Cost:8h --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 88 +++++ .../estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java | 2 +- .../i3plus/pojo/wms/bean/WmsModeTransport.java | 17 +- .../pojo/wms/bean/WmsTmsShippingExtDetail.java | 358 --------------------- .../i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java | 175 ---------- .../IWmsTmsShippingExtDetailRepository.java | 17 - .../repository/IWmsTmsShippingExtSnRepository.java | 17 - 7 files changed, 101 insertions(+), 573 deletions(-) delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtDetailRepository.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtSnRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 56d90d9..077e388 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -7547,4 +7547,92 @@ public class WmsEnumUtil { return null; } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SCAN_CATEGORY { + ASN(10, "wmsDoMovementMasterRepository", "ASN"), + PO(20, "wmsDoMovementMasterRepository", "PO"), + SO(30, "wmsDoMovementMasterRepository", "SO"), + MOVE(40, "wmsDoMovementMasterRepository", "移库单"), + IN_STOCK(50, "wmsDoMovementMasterRepository", "入库单"), + SHIPPING(60, "wmsDoMovementMasterRepository", "发运单"), + QC(70, "wmsDoMovementMasterRepository", "质检单"), + CS(80, "wmsCSOrderMasterRepository", "盘点单"), + SN(90, "wmsStockSnRepository", "条码"), + PO_SN(100, "wmsPoSnRepository", "收货条码"); + + private int value; + private String code; + private String description; + + SCAN_CATEGORY(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static SCAN_CATEGORY getByDesc(String desc) { + SCAN_CATEGORY tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i]; + } + } + return tmp; + } + + public static SCAN_CATEGORY codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java index 4ceaa41..4933c46 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java @@ -44,7 +44,7 @@ public class WmsCsStrategy extends BaseBean implements Serializable { @Column(name = "part_type") @ApiParam(value = "物料分类") @AnnoOutputColumn(refClass = WmsEnumUtil.PART_ABC.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PART_ABC") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "PART_ABC") private String partType; @Column(name = "STRATEGY_TYPE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java index 4816585..6ef36b6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java @@ -1,10 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -45,8 +43,17 @@ public class WmsModeTransport extends BaseBean { @Column(name = "TRANSPORT_TYPE") @ApiParam(value = "运输方式") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description") - private Integer transportType; + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, dataSrc = "TRANSPORT_TYPE") + private String transportType; + + @Column(name = "SERIAL_NUMBER") + @ApiParam(value = "序号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String serialNumber; + + @Column(name = "remake") + @ApiParam(value = "说明") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String remake; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java deleted file mode 100644 index 1f49ba2..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java +++ /dev/null @@ -1,358 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.bean; - - -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.persistence.Version; - -/** - * @Description : 车辆信息明细 - * @Reference : - * @Author : qianhuasheng - * @CreateDate : 2019-12-06 15:58 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="WMS_TMS_SHIPPING_EXT_DETAIL") -@Api("装车单信息明细") -public class WmsTmsShippingExtDetail extends BaseBean { - private static final long serialVersionUID = -4800308354250386102L; - - @Column(name="MOVE_NO") - @ApiParam("装车单") - public String moveNo; - - @Column(name = "PART_NO") - @ApiParam("物料编码") - public String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - public String partNameRdd; - - @Column(name = "ITEM") - @ApiParam("行号") - public String item; - - @Column(name = "QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "需求数量", example = "0") - public Double qty; - - @Column(name = "UNIT") - @ApiParam("单位") - public String unit; - - @Column(name = "REF_ORDER_NO") - @ApiParam("关联单号") - private String refOrderNo; - - @Column(name = "SRC_WH_NO") - @ApiParam("源仓库代码") - public String srcWhNo; - - @Column(name = "SRC_ZONE_NO") - @ApiParam("源存储区代码") - public String srcZoneNo; - - @Column(name = "SRC_LOCATE_NO") - @ApiParam("源库位代码") - public String srcLocateNo; - - @Column(name = "DEST_WH_NO") - @ApiParam("目标仓库代码") - public String destWhNo; - - @Column(name = "DEST_ZONE_NO") - @ApiParam("目标存储区代码") - public String destZoneNo; - - @Column(name = "DEST_LOCATE_NO") - @ApiParam("目标库位代码") - public String destLocateNo; - - @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "条码打印数量", example = "1") - private Double printQty; - - @Column(name = "PLAN_DATE") - @ApiParam(value = "计划日期") - private String planDate; - - @Column(name = "PLAN_TIME") - @ApiParam(value = "计划时间") - private String planTime; - - @Column(name = "SRC_NO") - @ApiParam(value = "源单号") - private String srcNo; - /** - * 状态:N=正常,C=行取消 - */ - @Column(name = "ITEM_STATUS") - @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") - private Integer itemStatus; - - /** - * 是否免费:0=计费,1=免费 - */ - @Column(name = "IS_FREE") - @ApiParam(value = "是否免费", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") - public Integer isFree; - - @Column(name = "REMARK") - @ApiParam(value = "操作原因") - private String remark; - - @Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "已拣货数量", example = "1") - private Double pickQty; - - @Column(name = "OUT_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "已出库数量", example = "1") - private Double outQty; - - @Column(name = "REC_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "已收货数量", example = "1") - private Double recQty; - - @Column(name = "MOVE_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "已移库数量", example = "1") - private Double moveQty; - - @Column(name = "TASK_GENERATE_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "任务生成数量", example = "1") - private Double taskGenerateQty; - - @Column(name = "SRC_AREA_NO") - @ApiParam("源库存地代码") - public String srcAreaNo; - - @Column(name = "DEST_AREA_NO") - @ApiParam("目的库存地代码") - public String destAreaNo; - - @Column(name = "LOT_NO") - @ApiParam("批次") - public String lotNo; - - @Column(name="SRC_ITEM", columnDefinition="varchar(50) default ''",nullable=false) - @ApiParam("源单行号") - public String srcItem; - - @Column(name = "CUST_ORDER_NO") - @ApiParam("客户订单号") - public String custOrderNo; - - @Column(name = "ASSIGN_DATE_CODE") - @ApiParam(value = "指定生产日期") - private String assignDateCode; - - @Transient - @ApiParam("实际批次") - private String actualLot; - - @Transient - @ApiParam("实际数量") - private Double actualQty; - - @Transient - @ApiParam("推荐批次") - private String recommondLot; - - @Transient - @ApiParam("推荐库位") - private String recommondLocateNo; - - @Transient - @ApiParam("前端表格编辑使用") - private Boolean isSet = false; - - @Transient - @ApiParam("生产日期") - public String dateCode; - - @ApiParam(value = "散件移库输入移库数量") - @Transient - public Double inputMoveQty; - - @Transient - @ApiParam(value = "标准包装", example = "1") - private Double snp; - - @Transient - @ApiParam(value = "条码总数量", example = "1") - private Double detailsSnCount; - - @Transient - @ApiParam(value = "余数", example = "1") - private Double restQty; - - @Transient - @ApiParam("任务状态") - @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") - private Integer isTask; - - @Transient - @ApiParam("主表单据状态") - @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") - private Integer orderMasterStatus; - - @Transient - @ApiParam("打印状态") - @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description") - private Integer printStatus; - - @Transient - @ApiParam("优先级") - private Integer priority; - - @Transient - @ApiParam(value = "汇总需求数量", example = "0") - public Double sumQty; - - @Transient - @ApiParam(value = "汇总拣货数量", example = "0") - public Double sumPickQty; - - @Transient - @ApiParam("执行状态") - @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description") - private Integer executeStatus; - - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; - - @Transient - @ApiParam("移动类型") - public Integer moveType; - - @Transient - @ApiParam("业务类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") - public Integer busiType; - - @Column(name = "IS_SN") - @ApiParam(value = "条码生成状态", example = "20") - public Integer isSn; - - - public WmsTmsShippingExtDetail () { - - } - - - public String getRecommondLot() { - return recommondLot == null ? "无" : this.recommondLot; - } - - public Double getQty() { - return qty == null ? 0D : this.qty.doubleValue(); - } - - public Double getOutQty() { - return outQty == null ? 0D : this.outQty.doubleValue(); - } - - public Double getPickQty() { - return pickQty == null ? 0D : this.pickQty.doubleValue(); - } - - public Double getActualQty() { - return actualQty == null ? 0D : this.actualQty.doubleValue(); - } - - public Double getRecQty() { - return recQty == null ? 0D : this.recQty.doubleValue(); - } - - public Integer getIsTaskVal() { - return isTask == null ? 0 : this.isTask.intValue(); - } - - public Integer getOrderMasterStatus() { - return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue(); - } - - public WmsTmsShippingExtDetail(WmsDocMovementDetails docMovementDetails,String moveNo) { - this.moveNo = moveNo; - this.partNo = docMovementDetails.getPartNo(); - this.partNameRdd = docMovementDetails.getPartNameRdd(); - this.item = docMovementDetails.getItem(); - this.qty =docMovementDetails.getQty(); - this.unit = docMovementDetails.getUnit(); - this.srcWhNo = docMovementDetails.getSrcWhNo(); - this.srcZoneNo = docMovementDetails.getSrcZoneNo(); - this.srcLocateNo = docMovementDetails.getSrcLocateNo(); - this.destWhNo = docMovementDetails.getDestWhNo(); - this.destZoneNo = docMovementDetails.getDestZoneNo(); - this.destLocateNo = docMovementDetails.getDestLocateNo(); - this.printQty = docMovementDetails.getPrintQty(); - this.planDate = docMovementDetails.getPlanDate(); - this.planTime = docMovementDetails.getPlanTime(); - this.srcNo = docMovementDetails.getSrcNo(); - this.itemStatus = docMovementDetails.getItemStatus(); - this.isFree = docMovementDetails.getIsFree(); - this.remark = docMovementDetails.getRemark(); - this.pickQty = docMovementDetails.getPickQty(); - this.outQty = docMovementDetails.getOutQty(); - this.recQty = docMovementDetails.getRecQty(); - this.moveQty = docMovementDetails.getMoveQty(); - this.taskGenerateQty = docMovementDetails.getTaskGenerateQty(); - this.srcAreaNo = docMovementDetails.getSrcAreaNo(); - this.destAreaNo = docMovementDetails.getDestAreaNo(); - this.lotNo = docMovementDetails.getLotNo(); - this.srcItem = docMovementDetails.getSrcItem(); - this.refOrderNo = docMovementDetails.getOrderNo(); - this.custOrderNo = docMovementDetails.getCustOrderNo(); - this.assignDateCode = docMovementDetails.getAssignDateCode(); - this.actualLot = docMovementDetails.getActualLot(); - this.actualQty = docMovementDetails.getActualQty(); - this.recommondLot = docMovementDetails.getRecommondLot(); - this.recommondLocateNo = docMovementDetails.getRecommondLocateNo(); - this.isSet = docMovementDetails.getIsSet(); - this.dateCode = docMovementDetails.getDateCode(); - this.inputMoveQty = docMovementDetails.getInputMoveQty(); - this.snp = docMovementDetails.getSnp(); - this.detailsSnCount = docMovementDetails.getDetailsSnCount(); - this.restQty = docMovementDetails.getRestQty(); - this.isTask = docMovementDetails.getIsTask(); - this.orderMasterStatus = docMovementDetails.getOrderMasterStatus(); - this.printStatus = docMovementDetails.getPrintStatus(); - this.priority = docMovementDetails.getPriority(); - this.sumQty = docMovementDetails.getSumQty(); - this.sumPickQty = docMovementDetails.getSumPickQty(); - this.executeStatus = docMovementDetails.getExecuteStatus(); - this.lockVersion = docMovementDetails.getLockVersion(); - this.moveType = docMovementDetails.getMoveType(); - this.busiType = docMovementDetails.getBusiType(); - this.isSn = docMovementDetails.getIsSn(); - } -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java deleted file mode 100644 index 5c40810..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java +++ /dev/null @@ -1,175 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.bean; - - -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; - -/** - * @Description : 车辆信息明细 - * @Reference : - * @Author : qianhuasheng - * @CreateDate : 2019-12-06 15:58 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="WMS_TMS_SHIPPING_EXT_SN") -@Api("装车单条码明细") -public class WmsTmsShippingExtSn extends BaseBean { - - private static final long serialVersionUID = 5704546384179442907L; - - @Column(name="MOVE_NO") - @ApiParam("装车单") - public String moveNo; - - @Column(name="ORDER_NO") - @ApiParam("订单号") - public String orderNo; - - @Column(name="ITEM") - @ApiParam("行号") - public String item; - - @Column(name="PART_NO") - @ApiParam("物料编码") - public String partNo; - - @Column(name="PART_NAME_RDD") - @ApiParam("物料名称") - public String partNameRdd; - - @Column(name="QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "数量", example = "0") - public Double qty; - - - @Column(name="UNIT") - @ApiParam("单位") - public String unit; - - /** - * 状态：操作状态 itemStatus - */ - @Column(name="SN_STATUS") - @ApiParam(value = "操作状态", example = "10") - @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_SN_STATUS.class,refForeignKey = "value",value = "description") - public Integer snStatus; - - @Column(name="SN") - @ApiParam("条码") - public String sn; - - @Column(name = "VENDOR_NO") - @ApiParam(value = "供应商编码") - public String vendorNo; - - @Column(name = "SN_TYPE") - @ApiParam(value = "条码类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description") - private Integer snType; - - @Transient - @ApiParam("前端表格编辑使用") - private Boolean isSet = false; - - @Transient - @ApiParam("目标库位代码") - public String destLocateNo; - - @Transient - @ApiParam("源库位代码") - public String srcLocateNo; - - @Transient - @ApiParam("生产日期") - public String dateCode; - - @ApiParam(value = "散件移库输入移库数量") - @Transient - public Double inputMoveQty; - - @Transient - @ApiParam("计划交货日期") - private String planDate; - - @Transient - @ApiParam("计划交货时间") - private String planTime; - - @Transient - @ApiParam("ERP库存地") - private String erpWhNo; - - @Transient - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") - public Integer itemStatus; - - @Transient - @ApiParam("客户零件号") - private String customerPartNo; - - @Transient - @ApiParam("父层级packcode对应的可回用零件号") - private String parentReturnPart; - - - @Transient - @ApiParam("打印模板") - private String templateNo; - - @Transient - @ApiParam("剩余箱数量") - private Long countBox; - - public WmsTmsShippingExtSn(){} - - public WmsTmsShippingExtSn(Long countBox,String partNo) { - this.countBox = countBox; - this.partNo = partNo; - } - - public WmsTmsShippingExtSn(String moveNo,WmsDocMovementSn docMovementSn) { - this.moveNo = moveNo; - this.orderNo = docMovementSn.getOrderNo(); - this.item = docMovementSn.getItem(); - this.partNo = docMovementSn.getPartNo(); - this.partNameRdd = docMovementSn.getPartNameRdd(); - this.qty = docMovementSn.getQty(); - this.unit = docMovementSn.getUnit(); - this.snStatus = docMovementSn.getSnStatus(); - this.sn = docMovementSn.getSn(); - this.vendorNo = docMovementSn.getVendorNo(); - this.snType = docMovementSn.getSnType(); - this.isSet = docMovementSn.getIsSet(); - this.destLocateNo = docMovementSn.getDestLocateNo(); - this.srcLocateNo = docMovementSn.getSrcLocateNo(); - this.dateCode = docMovementSn.getDateCode(); - this.inputMoveQty = docMovementSn.getInputMoveQty(); - this.planDate = docMovementSn.getPlanDate(); - this.planTime = docMovementSn.getPlanTime(); - this.erpWhNo = docMovementSn.getErpWhNo(); - this.itemStatus = docMovementSn.getItemStatus(); - this.customerPartNo = docMovementSn.getCustomerPartNo(); - this.parentReturnPart = docMovementSn.getParentReturnPart(); - this.templateNo = docMovementSn.getTemplateNo(); - this.countBox = docMovementSn.getCountBox(); - } -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtDetailRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtDetailRepository.java deleted file mode 100644 index 4e8030b..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtDetailRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExtDetail; -import org.springframework.stereotype.Repository; - -/** -* @Description : 装车单明细 -* @Reference : -* @author: qianhuasheng -* @date: 2019/9/19 14:22 -* @Modify: -*/ - -@Repository -public interface IWmsTmsShippingExtDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtSnRepository.java deleted file mode 100644 index 0a0065b..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtSnRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExtSn; -import org.springframework.stereotype.Repository; - -/** -* @Description : 装车单条码明细 -* @Reference : -* @author: qianhuasheng -* @date: 2019/9/19 14:22 -* @Modify: -*/ - -@Repository -public interface IWmsTmsShippingExtSnRepository extends BaseRepository { -} From 2f8b0ba5dbb566d805ba132acfe1313de6c94a14 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 9 Jun 2020 17:42:37 +0800 Subject: [PATCH 21/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 11691be..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 8ef99a3..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 577686d..807bef5 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index f714b7d..b948580 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index b7991cc..e12eaee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 0648e9f..c338f71 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index f10cf39..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 3b9e57a..7637865 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index b1911ec..d98b7d8 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 56d54cb..bf96e57 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 830caa5..a758a6a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index fb51da0..efacfd2 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 78bbdef..dba12cc 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index fb44d00..81670b2 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index dc4ea86..26a7311 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 8571a5f..eaf2544 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index e36258d..0f615b6 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 9915420..9e5f745 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 61027b2..0fea52b 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index c2104bf..cc8fce6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 0a5f45840aea129d56fed6c1596e3fc1bee878fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 9 Jun 2020 18:16:56 +0800 Subject: [PATCH 22/25] Fix Bug #8778 --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 35 ++++++++++++++++++++++ .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 34 --------------------- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index fb7b204..2d14825 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -6196,4 +6196,39 @@ public class MesEnumUtil { return tmp; } } + + /** + * 扭矩采集 黄枪规则(10-继续采集扭矩，20-发送下一个组合码) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum YELLOW_GUN_RULE { + COLLECT_TORQUE(10, "继续采集扭矩"), + SEND_NEXT_GROUP_CODE(20, "发送下一个组合码"); + + private int value; + private String description; + + YELLOW_GUN_RULE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index abd8d53..2420721 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -3770,40 +3770,6 @@ public class MesPcnEnumUtil { } /** - * 扭矩采集 黄枪规则(10-继续采集扭矩，20-发送下一个组合码) - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum YELLOW_GUN_RULE { - COLLECT_TORQUE(10, "继续采集扭矩"), - SEND_NEXT_GROUP_CODE(20, "发送下一个组合码"); - - private int value; - private String description; - - YELLOW_GUN_RULE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - } - /** * 界面类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From 457fa08b9f7ec40fddb1beb1b74cee7af4e70b87 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 9 Jun 2020 18:31:42 +0800 Subject: [PATCH 23/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 55e4e84..932bdd9 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 42f43c58f5994054de69f58bfc24ec2122c76f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 9 Jun 2020 19:01:21 +0800 Subject: [PATCH 24/25] Fix Bug #8778 --- .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 91597a2..632df5d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -116,16 +116,16 @@ public class MesPcnHqlPack { * 获取原材料扫描信息的对应工序BOM * * @param stationBom - * @param rawPartNo + * @param rawPartSn * @return */ - public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, String rawPartNo) { + public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) { DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean); DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean); DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean); - DdlPreparedPack.getStringEqualPack(rawPartNo, "itemPartNo", packBean); + DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean); return packBean; } From da454b39218f2a0190af51f6952918039ef3c6d7 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 9 Jun 2020 20:58:30 +0800 Subject: [PATCH 25/25] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BAerp=E5=8D=95=E5=8F=B7=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index dc56c0d..e004dde 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -121,6 +121,11 @@ public class WmsDocMovementDetails extends BaseBean { @Transient @ApiParam(value = "状态中文") private String itemStatusStr; + + @Transient + @ApiParam(value = "ERP单号") + private String erpSrcNo; + /** * 是否免费:0=计费,1=免费 */