From 72cb6ab30ecdd540c6c652d182ccd33763a2d9e7 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Fri, 7 Dec 2018 18:27:41 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E6=89=93=E5=8C=85=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/pom.xml b/pom.xml index bcf0ef5..eec32b8 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,6 @@ i3plus-pojo pom 1.0-SNAPSHOT - modules/i3plus-pojo-base modules/i3plus-pojo-platform @@ -154,27 +153,4 @@ http://mvn.estsh.com/repository/maven-snapshots/ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 31d63db7d50687fecf8cf72b47a7aabfcb281cf7 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 13 Dec 2018 18:30:59 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-base/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-wms/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 888e1bd..85a76cc 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 62ebe64..82fdbe8 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 485fdd6..e0f7b38 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index e310bfd..ec9e100 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 7409467..fa05f2a 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index ead6373..5773499 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base From 47105866be1033b3219c8503f8765ea68add2ba0 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 13 Dec 2018 20:08:52 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-base/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-wms/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 888e1bd..85a76cc 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 62ebe64..82fdbe8 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 485fdd6..e0f7b38 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index e310bfd..ec9e100 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 7409467..fa05f2a 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index ead6373..5773499 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base From 8ba027cff5e9c141c6ab471e4a088c8c76d4538f Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 19 Dec 2018 19:56:30 +0800 Subject: [PATCH 04/13] DEV to TEST --- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index f58676d..9e3e964 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0ba3645..23e5bee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6706323..c1e2cb9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 37211b4..fce0318 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 848da05..c0d750c 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 93f9732..1171f4e 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 From 8fa14247f59a449f18327dd235624d68da0e2b2b Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 26 Dec 2018 10:54:39 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 8706443..836225f 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 @@ -263,7 +263,6 @@ public class CoreHqlPack { HqlPack.getStringLikerPack(message.getMessageSenderNameRdd(),"messageSenderNameRdd",result); HqlPack.getStringLikerPack(message.getMessageReceiversNameRdd(),"messageReceiversNameRdd",result); HqlPack.timeBuilder(message.getMessageSendTime(),"messageSendTime", result, false,false); - HqlPack.getNumEqualPack(message.getMessageSenderId(),"messageSenderId",result); return result.toString(); } @@ -277,7 +276,7 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); // hql拼接 - HqlPack.getStringLikerPack(file.getFileOriginalName(),"fileOriginalName",result); + HqlPack.getStringLikerPack(file.getName(),"name",result); HqlPack.getNumEqualPack(file.getFileTypeId(),"fileTypeId",result); HqlPack.getStringLikerPack(file.getCreateUser(),"createUser",result); HqlPack.timeBuilder(file.getCreateDatetime(),"createDatetime",result,false,false); @@ -363,7 +362,6 @@ public class CoreHqlPack { // and HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result); - HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); // not HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result); @@ -480,12 +478,12 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getNumEqualPack(sysRefUserMessage.getMessageTypeRdd(),"messageTypeRdd",result); + HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(),"receiverId",result); HqlPack.getStringLikerPack(sysRefUserMessage.getMessageTitleRdd(),"messageTitleRdd",result); HqlPack.getStringLikerPack(sysRefUserMessage.getMessageSenderNameRdd(),"messageSenderNameRdd",result); HqlPack.getNumEqualPack(sysRefUserMessage.getMessageStatus(),"messageStatus",result); HqlPack.getStringLikerPack(sysRefUserMessage.getReceiverTime(),"receiverTime",result); - HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(),"receiverId",result); return result.toString(); } -} \ No newline at end of file +} From 017143946409054a18077fbb2aae1de1d9010340 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 26 Mar 2019 22:47:58 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83=2020?= =?UTF-8?q?19=E5=B9=B43=E6=9C=8826=E6=97=A522:47:53?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-form/i3plus-pojo-form.iml | 90 ---------------------- .../i3plus-pojo-hardswitch.iml | 74 ------------------ .../i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml | 74 ------------------ .../i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml | 90 ---------------------- modules/i3plus-pojo-model/i3plus-pojo-model.iml | 1 + modules/i3plus-pojo-report/i3plus-pojo-report.iml | 90 ---------------------- .../i3plus-pojo-softswitch.iml | 90 ---------------------- modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml | 90 ---------------------- .../i3plus-pojo-workflow/i3plus-pojo-workflow.iml | 74 ------------------ 9 files changed, 1 insertion(+), 672 deletions(-) delete mode 100644 modules/i3plus-pojo-form/i3plus-pojo-form.iml delete mode 100644 modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml delete mode 100644 modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml delete mode 100644 modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml delete mode 100644 modules/i3plus-pojo-report/i3plus-pojo-report.iml delete mode 100644 modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml delete mode 100644 modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml delete mode 100644 modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml diff --git a/modules/i3plus-pojo-form/i3plus-pojo-form.iml b/modules/i3plus-pojo-form/i3plus-pojo-form.iml deleted file mode 100644 index b36beb9..0000000 --- a/modules/i3plus-pojo-form/i3plus-pojo-form.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml b/modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml deleted file mode 100644 index d75c4ad..0000000 --- a/modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml b/modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml deleted file mode 100644 index d75c4ad..0000000 --- a/modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml b/modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml deleted file mode 100644 index b36beb9..0000000 --- a/modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-model/i3plus-pojo-model.iml b/modules/i3plus-pojo-model/i3plus-pojo-model.iml index 97807fd..7fe2a62 100644 --- a/modules/i3plus-pojo-model/i3plus-pojo-model.iml +++ b/modules/i3plus-pojo-model/i3plus-pojo-model.iml @@ -16,6 +16,7 @@ + diff --git a/modules/i3plus-pojo-report/i3plus-pojo-report.iml b/modules/i3plus-pojo-report/i3plus-pojo-report.iml deleted file mode 100644 index b36beb9..0000000 --- a/modules/i3plus-pojo-report/i3plus-pojo-report.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml b/modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml deleted file mode 100644 index b36beb9..0000000 --- a/modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml b/modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml deleted file mode 100644 index b36beb9..0000000 --- a/modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml b/modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml deleted file mode 100644 index d75c4ad..0000000 --- a/modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 76c5330a1604a456d67094a282fa0d7427bf2740 Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 12 Apr 2019 11:58:50 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/platform/platbean/WmsActionLog.java | 165 +++++++++++++++++++++ .../pojo/platform/platbean/WmsActionLogData.java | 76 ++++++++++ .../platform/platbean/WmsActionLogDetails.java | 122 +++++++++++++++ 3 files changed, 363 insertions(+) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java new file mode 100644 index 0000000..b498c26 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java @@ -0,0 +1,165 @@ +package cn.estsh.i3plus.pojo.platform.platbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : 作业记录表 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-23 11:10 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ACTION_LOG") +@Api(value="作业记录表",description = "作业记录表") +public class WmsActionLog extends BaseBean { + + @Column(name="TASK_ID") + @ApiParam(value = "作业任务编号", example = "1") + @JsonSerialize(using = ToStringSerializer.class) + public Long taskId; + + //get单独处理 + public Long getTaskId() { + if(taskId != null) { + return taskId.longValue(); + }else{ + return taskId; + } + } + + @Column(name="TRANS_TYPE_CODE") + @ApiParam(value = "交易类型编号") + public String transTypeCode; + + @Transient + @ApiParam(value = "交易类型名称") + public String transTypeName; + + @Column(name="AG_ID") + @ApiParam(value = "作业流程编号", example = "1") + @JsonSerialize(using = ToStringSerializer.class) + public Long agId; + + //get单独处理 + public Long getAgId() { + if(agId != null) { + return agId.longValue(); + }else{ + return agId; + } + } + + @Column(name="AG_NAME_C") + @ApiParam(value = "作业流程名称") + public String agNameC; + + @Column(name="ACTION_USER_NAME") + @ApiParam(value = "作业人员") + public String actionUserName; + + @Column(name="FIX_ID") + @ApiParam(value = "设备编号") + public String fixId; + + @Column(name="ORDER_NO") + @ApiParam(value = "单据编号") + public String orderNo; + + @Column(name="START_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "开始作业时间") + public String startTime; + + @Column(name="END_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "结束作业时间") + public String endTime; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="开始作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00") + public String startTimeStart; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="开始作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59") + public String startTimeEnd; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="结束作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00") + public String endTimeStart; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="结束作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59") + public String endTimeEnd; + + // 状态:1=创建,10=处理中,20=已完成 + @Column(name="ACTION_STATUS") + @ApiParam(value = "作业状态", example = "1") + public Integer actionStatus; + + @Column(name="TOTAL_STEP") + @ApiParam(value = "总步数", example = "1") + public Integer totalStep; + + @Column(name="CURRENT_STEP") + @ApiParam(value = "当前步骤", example = "1") + public Integer currentStep; + + @Column(name="INIT_AM_ID") + @ApiParam(value = "初始化组件编号", example = "0") + private Long initAmId; + + @Column(name="DETAILS_AM_ID") + @ApiParam(value = "明细处理组件编号", example = "0") + private Long detailsAmId; + + @Column(name="END_AM_ID") + @ApiParam(value = "结束组件编号", example = "0") + private Long endAmId; + + public Long getInitAmId() { + if (initAmId != null) { + return initAmId.longValue(); + } else { + return initAmId; + } + } + + public Long getDetailsAmId() { + if (detailsAmId != null) { + return detailsAmId.longValue(); + } else { + return detailsAmId; + } + } + + public Long getEndAmId() { + if (endAmId != null) { + return endAmId.longValue(); + } else { + return endAmId; + } + } +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java new file mode 100644 index 0000000..d162959 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java @@ -0,0 +1,76 @@ +package cn.estsh.i3plus.pojo.platform.platbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; +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 : jessica.chen + * @CreateDate : 2018-11-23 13:14 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_ACTION_LOG_DATA") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="作业记录参数表",description = "作业记录参数表") +public class WmsActionLogData extends BaseBean { + + @Column(name = "ALD_ID") + @ApiParam(value = "记录明细编号") + @JsonSerialize(using = ToStringSerializer.class) + private Long aldId; + + @Column(name = "ALD_SEQ") + @ApiParam(value = "步骤序号") + private Integer aldSeq; + + @Column(name = "CALL_CLASS") + @ApiParam(value = "实现类") + private String callClass; + + @Column(name = "CALL_FUN") + @ApiParam(value = "调用方法") + private String callFun; + + @Column(name = "EXECUTE_STATUS") + @ApiParam(value = "执行状态") + private Integer executeStatus; + + @Column(name = "START_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="开始执行时间",example = "2000-01-01 01:00:00") + private String startTime; + + @Column(name = "END_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="结束执行时间",example = "2000-01-01 01:00:00") + private String endTime; + + @Column(name = "IN_PARAMS", columnDefinition = "TEXT") + @ApiParam(value = "输入参数") + private String inParams; + + @Column(name = "OUT_PARAMS", columnDefinition = "TEXT") + @ApiParam(value = "输出参数") + private String outParams; + + @Column(name = "OUT_RESULT", columnDefinition = "TEXT") + @ApiParam(value = "执行结果") + private String outResult; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java new file mode 100644 index 0000000..f99297c --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java @@ -0,0 +1,122 @@ +package cn.estsh.i3plus.pojo.platform.platbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description :作业记录明细表 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-23 13:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_ACTION_LOG_DETAILS") +@Api(value = "作业记录明细表", description = "作业记录表") +public class WmsActionLogDetails extends BaseBean { + + @Column(name = "AL_ID") + @ApiParam(value = "作业流程ID", example = "1") + @JsonSerialize(using = ToStringSerializer.class) + public Long alId; + + @Transient + @ApiParam(value = "流程名称") + public String agNameC; + + @Column(name = "SEQ") + @ApiParam(value = "序号", example = "1") + public Integer seq; + + @Column(name = "OK_SEQ") + @ApiParam(value = "成功跳转步骤", example = "1") + public Integer okSeq; + + @Column(name = "NG_SEQ") + @ApiParam(value = "失败跳转步骤", example = "1") + public Integer ngSeq; + + /** + * 10=只输入一次,20=输入多次, + * 30=输入多次不允许重复,40=本流程结束 + */ + @Column(name = "VALUE_TYPE") + @ApiParam(value = "动作类型", example = "1") + public Integer valueType; + + /** + * 1=是,2=否 + */ + @Column(name = "TO_UPPER") + @ApiParam(value = "是否转为大写", example = "1") + public Integer toUpper; + + @Column(name = "LEN_CHECK") + @ApiParam(value = "长度检查", example = "1") + public Integer lenCheck; + + @Column(name = "AS_ID") + @ApiParam(value = "作业步骤", example = "1") + @JsonSerialize(using = ToStringSerializer.class) + public Long asId; + + @Column(name = "ALD_STATUS") + @ApiParam(value = "执行状态", example = "1") + public Integer aldStatus; + + @Column(name = "START_TIME") + @ApiParam(value = "开始执行时间") + public String startTime; + + @Column(name = "END_TIME") + @ApiParam(value = "结束执行时间") + public String endTime; + + @Column(name = "GOTO_BTN_CODE") + @ApiParam(value = "跳转按钮代码") + private String goToBtnCode; + + @Column(name = "GOTO_BTN_NAME") + @ApiParam(value = "跳转按钮名称") + private String goToBtnName; + + @Column(name = "PRE_SHOW") + @ApiParam(value = "是否预显示", example = "1") + private Integer preShow; + + @Column(name = "SHOW_AM_ID") + @ApiParam(value = "回显组件方法ID", example = "1") + private Long showAmId; + + public Long getAsId() { + if (asId != null) { + return asId.longValue(); + } else { + return asId; + } + } + + public Long getAlId() { + if (alId != null) { + return alId.longValue(); + } else { + return alId; + } + } +} From f39a9d14daa326d702c575843a337fa3303eb458 Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 12 Apr 2019 13:14:19 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E5=90=88=E5=B9=B6dev=E5=88=86=E6=94=AF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsActionLog.java | 165 --------------------- .../i3plus/pojo/wms/bean/WmsActionLogData.java | 76 ---------- .../i3plus/pojo/wms/bean/WmsActionLogDetails.java | 122 --------------- .../wms/repository/WmsActionLogDataRepository.java | 17 --- .../repository/WmsActionLogDetailsRepository.java | 16 -- .../wms/repository/WmsActionLogRepository.java | 16 -- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 73 --------- 7 files changed, 485 deletions(-) delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java deleted file mode 100644 index 6776ce7..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java +++ /dev/null @@ -1,165 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; - -/** - * @Description : 作业记录表 - * @Reference : - * @Author : hansen.ke - * @CreateDate : 2018-11-23 11:10 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="WMS_ACTION_LOG") -@Api(value="作业记录表",description = "作业记录表") -public class WmsActionLog extends BaseBean { - - @Column(name="TASK_ID") - @ApiParam(value = "作业任务编号", example = "1") - @JsonSerialize(using = ToStringSerializer.class) - public Long taskId; - - //get单独处理 - public Long getTaskId() { - if(taskId != null) { - return taskId.longValue(); - }else{ - return taskId; - } - } - - @Column(name="TRANS_TYPE_CODE") - @ApiParam(value = "交易类型编号") - public String transTypeCode; - - @Transient - @ApiParam(value = "交易类型名称") - public String transTypeName; - - @Column(name="AG_ID") - @ApiParam(value = "作业流程编号", example = "1") - @JsonSerialize(using = ToStringSerializer.class) - public Long agId; - - //get单独处理 - public Long getAgId() { - if(agId != null) { - return agId.longValue(); - }else{ - return agId; - } - } - - @Column(name="AG_NAME_C") - @ApiParam(value = "作业流程名称") - public String agNameC; - - @Column(name="ACTION_USER_NAME") - @ApiParam(value = "作业人员") - public String actionUserName; - - @Column(name="FIX_ID") - @ApiParam(value = "设备编号") - public String fixId; - - @Column(name="ORDER_NO") - @ApiParam(value = "单据编号") - public String orderNo; - - @Column(name="START_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "开始作业时间") - public String startTime; - - @Column(name="END_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "结束作业时间") - public String endTime; - - @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="开始作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00") - public String startTimeStart; - - @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="开始作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59") - public String startTimeEnd; - - @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="结束作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00") - public String endTimeStart; - - @Transient - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="结束作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59") - public String endTimeEnd; - - // 状态:1=创建,10=处理中,20=已完成 - @Column(name="ACTION_STATUS") - @ApiParam(value = "作业状态", example = "1") - public Integer actionStatus; - - @Column(name="TOTAL_STEP") - @ApiParam(value = "总步数", example = "1") - public Integer totalStep; - - @Column(name="CURRENT_STEP") - @ApiParam(value = "当前步骤", example = "1") - public Integer currentStep; - - @Column(name="INIT_AM_ID") - @ApiParam(value = "初始化组件编号", example = "0") - private Long initAmId; - - @Column(name="DETAILS_AM_ID") - @ApiParam(value = "明细处理组件编号", example = "0") - private Long detailsAmId; - - @Column(name="END_AM_ID") - @ApiParam(value = "结束组件编号", example = "0") - private Long endAmId; - - public Long getInitAmId() { - if (initAmId != null) { - return initAmId.longValue(); - } else { - return initAmId; - } - } - - public Long getDetailsAmId() { - if (detailsAmId != null) { - return detailsAmId.longValue(); - } else { - return detailsAmId; - } - } - - public Long getEndAmId() { - if (endAmId != null) { - return endAmId.longValue(); - } else { - return endAmId; - } - } -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java deleted file mode 100644 index d67742d..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java +++ /dev/null @@ -1,76 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.annotation.JsonFormat; -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 : jessica.chen - * @CreateDate : 2018-11-23 13:14 - * @Modify: - **/ -@Data -@Entity -@Table(name="WMS_ACTION_LOG_DATA") -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Api(value="作业记录参数表",description = "作业记录参数表") -public class WmsActionLogData extends BaseBean { - - @Column(name = "ALD_ID") - @ApiParam(value = "记录明细编号") - @JsonSerialize(using = ToStringSerializer.class) - private Long aldId; - - @Column(name = "ALD_SEQ") - @ApiParam(value = "步骤序号") - private Integer aldSeq; - - @Column(name = "CALL_CLASS") - @ApiParam(value = "实现类") - private String callClass; - - @Column(name = "CALL_FUN") - @ApiParam(value = "调用方法") - private String callFun; - - @Column(name = "EXECUTE_STATUS") - @ApiParam(value = "执行状态") - private Integer executeStatus; - - @Column(name = "START_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="开始执行时间",example = "2000-01-01 01:00:00") - private String startTime; - - @Column(name = "END_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="结束执行时间",example = "2000-01-01 01:00:00") - private String endTime; - - @Column(name = "IN_PARAMS", columnDefinition = "TEXT") - @ApiParam(value = "输入参数") - private String inParams; - - @Column(name = "OUT_PARAMS", columnDefinition = "TEXT") - @ApiParam(value = "输出参数") - private String outParams; - - @Column(name = "OUT_RESULT", columnDefinition = "TEXT") - @ApiParam(value = "执行结果") - private String outResult; -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java deleted file mode 100644 index 001acec..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java +++ /dev/null @@ -1,122 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; - -/** - * @Description :作业记录明细表 - * @Reference : - * @Author : hansen.ke - * @CreateDate : 2018-11-23 13:34 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_ACTION_LOG_DETAILS") -@Api(value = "作业记录明细表", description = "作业记录表") -public class WmsActionLogDetails extends BaseBean { - - @Column(name = "AL_ID") - @ApiParam(value = "作业流程ID", example = "1") - @JsonSerialize(using = ToStringSerializer.class) - public Long alId; - - @Transient - @ApiParam(value = "流程名称") - public String agNameC; - - @Column(name = "SEQ") - @ApiParam(value = "序号", example = "1") - public Integer seq; - - @Column(name = "OK_SEQ") - @ApiParam(value = "成功跳转步骤", example = "1") - public Integer okSeq; - - @Column(name = "NG_SEQ") - @ApiParam(value = "失败跳转步骤", example = "1") - public Integer ngSeq; - - /** - * 10=只输入一次,20=输入多次, - * 30=输入多次不允许重复,40=本流程结束 - */ - @Column(name = "VALUE_TYPE") - @ApiParam(value = "动作类型", example = "1") - public Integer valueType; - - /** - * 1=是,2=否 - */ - @Column(name = "TO_UPPER") - @ApiParam(value = "是否转为大写", example = "1") - public Integer toUpper; - - @Column(name = "LEN_CHECK") - @ApiParam(value = "长度检查", example = "1") - public Integer lenCheck; - - @Column(name = "AS_ID") - @ApiParam(value = "作业步骤", example = "1") - @JsonSerialize(using = ToStringSerializer.class) - public Long asId; - - @Column(name = "ALD_STATUS") - @ApiParam(value = "执行状态", example = "1") - public Integer aldStatus; - - @Column(name = "START_TIME") - @ApiParam(value = "开始执行时间") - public String startTime; - - @Column(name = "END_TIME") - @ApiParam(value = "结束执行时间") - public String endTime; - - @Column(name = "GOTO_BTN_CODE") - @ApiParam(value = "跳转按钮代码") - private String goToBtnCode; - - @Column(name = "GOTO_BTN_NAME") - @ApiParam(value = "跳转按钮名称") - private String goToBtnName; - - @Column(name = "PRE_SHOW") - @ApiParam(value = "是否预显示", example = "1") - private Integer preShow; - - @Column(name = "SHOW_AM_ID") - @ApiParam(value = "回显组件方法ID", example = "1") - private Long showAmId; - - public Long getAsId() { - if (asId != null) { - return asId.longValue(); - } else { - return asId; - } - } - - public Long getAlId() { - if (alId != null) { - return alId.longValue(); - } else { - return alId; - } - } -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java deleted file mode 100644 index 8875b03..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.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.BasVendor; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : amy - * @CreateDate : 2018-11-07 14:49 - * @Modify: - **/ -@Repository -public interface WmsActionLogDataRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java deleted file mode 100644 index 280d727..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java +++ /dev/null @@ -1,16 +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.WmsActionLogDetails; -import org.springframework.stereotype.Repository; - -/** - * @Description : 作业记录明细 - * @Reference : - * @Author : hansen.ke - * @CreateDate : 2018-11-23 14:03 - * @Modify: - **/ -@Repository -public interface WmsActionLogDetailsRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java deleted file mode 100644 index 2c2da0b..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java +++ /dev/null @@ -1,16 +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.WmsActionLog; -import org.springframework.stereotype.Repository; - -/** - * @Description : 作业记录表 - * @Reference : - * @Author : hansen.ke - * @CreateDate : 2018-11-23 14:02 - * @Modify: - **/ -@Repository -public interface WmsActionLogRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 839fb10..082673d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -6,12 +6,10 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import java.util.List; @@ -1307,21 +1305,6 @@ public class WmsHqlPack { } /** - * 作业记录参数信息 查询条件封装 - * - * @param wmsActionLogData - * @return - */ - public static DdlPackBean packHqlWmsActionLogData(WmsActionLogData wmsActionLogData) { - DdlPackBean result = new DdlPackBean(); - - DdlPreparedPack.getNumEqualPack(wmsActionLogData.getAldId(), "aldId", result); - getStringBuilderPack(wmsActionLogData, result); - - return result; - } - - /** * 作业步骤调用参数信息 查询条件封装 * * @param wmsActionStepCallParam @@ -1339,62 +1322,6 @@ public class WmsHqlPack { } /** - * 作业记录 查询条件封装 - * @param wmsActionLog - * @return - */ - public static DdlPackBean packHqlWmsActionLog(WmsActionLog wmsActionLog) { - DdlPackBean result = new DdlPackBean(); - - if (wmsActionLog.getStartTimeStart() != null || wmsActionLog.getStartTimeEnd() != null) { - DdlPreparedPack.timeBuilder(wmsActionLog.getStartTimeStart(), wmsActionLog.getStartTimeEnd(), - "startTime", result, true); - } else if (wmsActionLog.getEndTimeStart() != null || wmsActionLog.getEndTimeEnd() != null) { - DdlPreparedPack.timeBuilder(wmsActionLog.getEndTimeStart(), wmsActionLog.getEndTimeEnd(), - "endTime", result, true); - } - - // 作业流程编号 - DdlPreparedPack.getNumEqualPack(wmsActionLog.getAgId(), "agId", result); - // 作业流程名称 - DdlPreparedPack.getStringLikerPack(wmsActionLog.getAgNameC(), "agNameC", result); - // 单据编号 - DdlPreparedPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result); - // 设备编号 - DdlPreparedPack.getStringEqualPack(wmsActionLog.getFixId(), "fixId", result); - // 交易类型代码 - DdlPreparedPack.getStringEqualPack(wmsActionLog.getTransTypeCode(), "transTypeCode", result); - // 流程状态 - DdlPreparedPack.getNumEqualPack(wmsActionLog.getActionStatus(), "actionStatus", result); - - getStringBuilderPack(wmsActionLog, result); - - return result; - } - - /** - * 作业记录明细 查询条件封装 - * @param wmsActionLogDetails - * @return - */ - public static DdlPackBean packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails) { - DdlPackBean result = new DdlPackBean(); - - //作业流程id（对应作业记录明细里自增的id） - DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getAlId(), "alId", result); - DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getSeq(), "seq", result); - DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getOkSeq(), "okSeq", result); - DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getNgSeq(), "ngSeq", result); - DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getValueType(), "valueType", result); - - getStringBuilderPack(wmsActionLogDetails, result); - - DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); - - return result; - } - - /** * PO订单条码表 分页查询 * * @param wmsPoSn From 7e73059944a4824055a2b898524a213dc7616c25 Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 15 Apr 2019 17:58:59 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E5=90=88=E5=B9=B6dev=E5=88=86=E6=94=AF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index d30fbf5..ca13748 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1583,8 +1583,8 @@ public class WmsHqlPack { */ public static String packHqlWmsDocMovementSn(WmsDocMovementSn wmsDocMovementSn) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); - HqlPack.getStringLikerPack(wmsDocMovementSn.getPartNo(), "partNo", result); + HqlPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result); getStringBuilderPack(wmsDocMovementSn, result); From ef4acdbb005fdea3f077663d62bd180ff79014d1 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Mon, 6 May 2019 11:50:53 +0800 Subject: [PATCH 10/13] =?UTF-8?q?sweb=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9pojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-sweb/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1f622d9..2c24e41 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 From 8e2bf96a1406db664d8d87f1bbbe68992187c870 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 7 May 2019 14:17:06 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E6=89=BE=E5=9B=9E=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 94 +++++++++++++++++++++- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 4 + 2 files changed, 97 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 5cccafd..639e7e9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -832,7 +832,7 @@ public class BlockFormEnumUtil { PASSWORD(230, "PASSWORD", "密码"), DATE(300, "DATE", "日期(yyyy-MM-dd)"), DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"), -// ELEMENT(700, "DICT_SELECT", "元素"), + // ELEMENT(700, "DICT_SELECT", "元素"), DICTIONARY(800, "DICT_SELECT", "字典"), CASCADE(900, "CASCADE", "级联"); //FILE(400, "file", "文件"), @@ -1056,7 +1056,99 @@ public class BlockFormEnumUtil { return tmp; } + public Object getPropertyVirtual(Object ... objs){ + if(this.getValue() == STRING_SPLICE.getValue()){ + return getPropertyVirtualString(objs); + }else if(this.getValue() == NUM_ADD.getValue()){ + return getPropertyVirtualDoubleAdd(objs); + }else if(this.getValue() == NUM_LESS.getValue()){ + return getPropertyVirtualDoubleLess(objs); + }else if(this.getValue() == NUM_MAKE.getValue()){ + return getPropertyVirtualDoubleMake(objs); + }else if(this.getValue() == NUM_DIVISION.getValue()){ + return getPropertyVirtualDoubleDivision(objs); + } + return objs; + } + + private String getPropertyVirtualString(Object ... objs){ + if(objs != null && objs.length > 0){ + StringBuffer result = new StringBuffer(); + for (Object o : objs) { + result.append(o == null ? "" : o.toString()); + } + return result.toString(); + } + return null; + } + + private Double getPropertyVirtualDoubleAdd(Object ... objs){ + if(objs != null && objs.length > 0){ + Double result = new Double(0); + for (Object o : objs) { + try { + if(o != null){ + result += Double.parseDouble(o.toString()); + } + }catch (Exception e){ + e.printStackTrace(); + } + } + return result; + } + return null; + } + + private Double getPropertyVirtualDoubleLess(Object ... objs){ + if(objs != null && objs.length > 0){ + Double result = new Double(0); + for (Object o : objs) { + try { + if(o != null){ + result -= Double.parseDouble(o.toString()); + } + }catch (Exception e){ + e.printStackTrace(); + } + } + return result; + } + return null; + } + private Double getPropertyVirtualDoubleMake(Object ... objs){ + if(objs != null && objs.length > 0){ + Double result = new Double(0); + for (Object o : objs) { + try { + if(o != null){ + result *= Double.parseDouble(o.toString()); + } + }catch (Exception e){ + e.printStackTrace(); + } + } + return result; + } + return null; + } + + private Double getPropertyVirtualDoubleDivision(Object ... objs){ + if(objs != null && objs.length > 0){ + Double result = new Double(0); + for (Object o : objs) { + try { + if(o != null){ + result /= Double.parseDouble(o.toString()); + } + }catch (Exception e){ + e.printStackTrace(); + } + } + return result; + } + return null; + } } /** 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 104f18e..6c19f95 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 @@ -521,6 +521,10 @@ public class CommonEnumUtil { return value; } + public String getValueStr() { + return value + ""; + } + public String getDescription() { return description; } From 521f4747531d524a8b99ea437ee925dca087ec1f Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 8 May 2019 21:08:44 +0800 Subject: [PATCH 12/13] Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-block into test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # modules/i3plus-block-form/src/main/resources/application-test.properties # modules/i3plus-block-report/src/main/resources/application-test.properties 合并代码 发版修改配置 - Pw 2019-5-8 20:53:28 --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index c31090b..4390b84 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 3681eb6..86d7736 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e388a1d..09f2c4a 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 From 58247fe3f1539491b6c9c27e99b8061b00c6b247 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 9 May 2019 14:04:37 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E6=B8=85=E9=99=A4iml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i3plus-pojo.iml | 66 --------------- modules/i3plus-pojo-base/i3plus-pojo-base.iml | 89 -------------------- modules/i3plus-pojo-mes/i3plus-pojo-mes.iml | 90 --------------------- modules/i3plus-pojo-model/i3plus-pojo-model.iml | 94 ---------------------- .../i3plus-pojo-platform/i3plus-pojo-platform.iml | 90 --------------------- modules/i3plus-pojo-wms/i3plus-pojo-wms.iml | 90 --------------------- 6 files changed, 519 deletions(-) delete mode 100644 i3plus-pojo.iml delete mode 100644 modules/i3plus-pojo-base/i3plus-pojo-base.iml delete mode 100644 modules/i3plus-pojo-mes/i3plus-pojo-mes.iml delete mode 100644 modules/i3plus-pojo-model/i3plus-pojo-model.iml delete mode 100644 modules/i3plus-pojo-platform/i3plus-pojo-platform.iml delete mode 100644 modules/i3plus-pojo-wms/i3plus-pojo-wms.iml diff --git a/i3plus-pojo.iml b/i3plus-pojo.iml deleted file mode 100644 index ec94526..0000000 --- a/i3plus-pojo.iml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-base/i3plus-pojo-base.iml b/modules/i3plus-pojo-base/i3plus-pojo-base.iml deleted file mode 100644 index 5dd064c..0000000 --- a/modules/i3plus-pojo-base/i3plus-pojo-base.iml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/i3plus-pojo-mes.iml b/modules/i3plus-pojo-mes/i3plus-pojo-mes.iml deleted file mode 100644 index c1a72f3..0000000 --- a/modules/i3plus-pojo-mes/i3plus-pojo-mes.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-model/i3plus-pojo-model.iml b/modules/i3plus-pojo-model/i3plus-pojo-model.iml deleted file mode 100644 index 97faa2e..0000000 --- a/modules/i3plus-pojo-model/i3plus-pojo-model.iml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-platform/i3plus-pojo-platform.iml b/modules/i3plus-pojo-platform/i3plus-pojo-platform.iml deleted file mode 100644 index c1a72f3..0000000 --- a/modules/i3plus-pojo-platform/i3plus-pojo-platform.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/i3plus-pojo-wms.iml b/modules/i3plus-pojo-wms/i3plus-pojo-wms.iml deleted file mode 100644 index c1a72f3..0000000 --- a/modules/i3plus-pojo-wms/i3plus-pojo-wms.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file