From 288fb4a16ba0552977a14ff65ddc0ec14e395091 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 8 Apr 2020 19:59:06 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9POM=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 19 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-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-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 409b79a..c7bebed 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT 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 ba34538..c2f1247 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 932bdd9..3428e74 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-PROD-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From efe083a9da6aabef1c20357bfd67954dba575498 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 16 Apr 2020 16:10:58 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 4 ++-- 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-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 20 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 9302dfc..3d6cbc0 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index a933723..96472ad 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 712a842..3937425 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index a44418c..e12eaee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 375d0fd..5bfdd66 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-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 d1ea30d..8b15a31 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 50ab2c2..7637865 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index d800ecf..bf96e57 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 8664dd2..409b79a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index d65e031..efacfd2 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 0080b0c..23f68bd 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 24de8cf..28cf55f 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 0fbfb69..26a7311 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 76739f9..eaf2544 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 590b56c..910d630 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index ac9e7dd..e5b4e5c 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index f153994..0ecf190 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 1bef72c..fbbe86f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform 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 b25ff3cbba0c19611b38fc9b4c05ff091616ee6d Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 16 Apr 2020 20:06:18 +0800 Subject: [PATCH 03/14] bug:8137 --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java index d091e87..697f6dd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java @@ -55,4 +55,12 @@ public class MesPpTemplate extends BaseBean { @ApiParam(value = "工单数量") @AnnoOutputColumn private Double qty; + + @ApiParam(value = "序号") + @AnnoOutputColumn + private Integer seq; + + @ApiParam(value = "零件组号") + @AnnoOutputColumn + public String partGroupNo; } From e417e761c7e307bd187ad47277b003afc53aeb72 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 20 Apr 2020 16:50:53 +0800 Subject: [PATCH 04/14] =?UTF-8?q?bug8124=E3=80=908124=20=E7=89=A9=E6=96=99?= =?UTF-8?q?=E6=8B=86=E5=88=86-=E8=BE=93=E5=85=A5=E6=95=B0=E9=87=8F-?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=BC=82=E5=B8=B8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 10 ++++++++++ 1 file changed, 10 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 0b173cb..deffbf0 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; @@ -174,6 +175,15 @@ public class WmsDocMovementDetails extends BaseBean { private String soOrderNo; @Transient + @ApiParam(value = "替代物料编码") + private String subPartNo; + + + @Transient + @ApiParam(value = "替代物料名称") + private String subPartName; + + @Transient @ApiParam("实际批次") private String actualLot; From fb60d75eeab53847115e25d0e706986ece876615 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 21 Apr 2020 11:35:35 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E8=BF=98=E5=8E=9Ftest=20pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store | Bin 0 -> 8196 bytes modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 7746b1e..f9957c9 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-mes-pcn jar - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..cc05df3a1b6d4ff9f06fe9c784d439d6dd3e4565 GIT binary patch literal 8196 zcmeHMU2GIZ9G~A&V3)3Riy#HNaB?6;0c(r47{KcXRcJ{o*V6J~kG+k5V>F^hiEje>DEMI12bCrYi4W=n>VrO@i6qAOpPjwZT96lGPa`8_viTYgYm`y~?7%BIhlDao_Sn_j)ZO*w<}38*Q^_I-OpJ9+=)vZrtsDF;95B5#5~tW2({YaCgb z9Byc+rF#8?BO|gTEm+>RwZCxq=d4&U{HmM~aWRSUkk)udQf z(QKuNexF4{az_>NsoC=vFRfWs*RU?VajZhEoO8P}PuW3GJAt*wGQI7(pEn)Da`yHN z@weAow0tXPo868+V9J$PDUVfDEm(MGwWbM!YYrvTzCzC0U$BCMYD$vAF_PL6WtTyZ zvc)y{D2Ak-rZ_bEGHr>rlWST$lS(6USfSmkbo=zglBx^C)k>|>{UlLAR(;V^uRNgj z*m};iWz`VlG%62iy+whxthS5J^~yZ0FYgWv&=h@H^fhTMT0bAQL-&KuLDS)n^daeJ zYHdq2Z9CUB83unK;?~K}Lq4R^HG&tZ5b~BF+vm@*nJH_5% zXV_VGo_)f;U|+M#>?ig!U55S2t|9>mbFdI8EW_Pcj#{k82Bgu1&De%s^g+iS?1hCV z;Nt)eVii?$w=UN&&JGDacitWIlgsY8Z_U~b z&ErJ))7ziO!H{@@Ss~*}j0#`&BpQ!}D?wSbxJ3PHi$N@o9wMxHK;r90ohhuVQ%fb{ znkq%jnibSMttP^zQoU-mOq^GzMWO5JC1STaU1*htMw$4pmPOii>q*>KtYyTY!r-!TK_sKQ-XfqJaP!y#Q;(S}ZR;W1>;gMMVO8#x#l zfCCr%iM)p}f~PTx!y$Q(5P4s~ah$-5c!@~-Cf>rSaT33WbNHAjd=Zx-YL+P5F`2UX zb|Phq8PBm@XD{`Y>?fPYt(ze*O&C=1tzzSi@BeQWCf3IY#0dP05kOgMrnQ+SaHEZs zpS6>ecT?tx+l>ktx==CcB7oZCe;86dNv7N<9m!E4sfW@(ei2|A@%R6)e!9lr|B#pe G_2Lh!2}*ka literal 0 HcmV?d00001 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index e8e879b..846c302 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-model jar - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 1ddad26..1b72275 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -12,7 +12,7 @@ i3plus-pojo-softswitch jar - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT From c57ca73a4a805a1effd59462e88260f4f0a43f27 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 21 Apr 2020 15:35:14 +0800 Subject: [PATCH 06/14] bug:8169;8176;8177 --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index d12bf90..f42f238 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 @@ -6101,7 +6101,7 @@ public class WmsEnumUtil { THURSDAY(40, "星期四"), FRIDAY(50, "星期五"), SATURDAY(60, "星期六"), - SUNDAY(70, "星期七"); + SUNDAY(70, "星期日"); private int value; private String description; From 509240126a5c08e102a133740fc4d1daa3e72898 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 21 Apr 2020 15:16:42 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E3=80=901604=20=E5=BE=85=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 71 ++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 9c83839..917f0a0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -328,6 +328,18 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "是否需要报工") private Integer isReportPartNo; + @Transient + @ApiParam(value = "库存地代码") + private String areaNo; + + @Transient + @ApiParam(value = "物料规格") + private String partSpec; + + @Transient + @ApiParam(value = "箱数") + private Long boxQtys; + public WmsStockSn() { } @@ -421,4 +433,63 @@ public class WmsStockSn extends BaseBean { this.createDatetime=createDatetime; this.modifyDatetime = modifyDatetime; } + + public WmsStockSn(Long id,String organizeCode,String sn, String partNo, String partNameRdd, String unit, Integer snStatus, + String areaNo,String partSpec,Integer qcStatus, Double qty, Long boxQtys, + String locateNo, String zoneNo, String whNo, String lotNo,String refSrc, + String dateCode, String packageNo, String createDatetime, String createUser, + String modifyDatetime, String modifyUser) { + this.id = id; + this.organizeCode = organizeCode; + this.sn = sn; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.snStatus = snStatus; + this.areaNo = areaNo; + this.partSpec = partSpec; + this.qcStatus = qcStatus; + this.qty = qty; + this.boxQtys = boxQtys; + this.locateNo = locateNo; + this.zoneNo = zoneNo; + this.whNo = whNo; + this.lotNo = lotNo; + this.refSrc = refSrc; + this.dateCode = dateCode; + this.packageNo = packageNo; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + } + + public WmsStockSn(Long id,String organizeCode,String sn, String partNo, String partNameRdd, String unit, Integer snStatus, + String areaNo,Integer qcStatus, Double qty, + String locateNo, String zoneNo, String whNo, String lotNo,String refSrc, + String dateCode, String packageNo, String createDatetime, String createUser, + String modifyDatetime, String modifyUser) { + this.id = id; + this.organizeCode = organizeCode; + this.sn = sn; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.snStatus = snStatus; + this.areaNo = areaNo; + this.qcStatus = qcStatus; + this.qty = qty; + this.locateNo = locateNo; + this.zoneNo = zoneNo; + this.whNo = whNo; + this.lotNo = lotNo; + this.refSrc = refSrc; + this.dateCode = dateCode; + this.packageNo = packageNo; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + } + } From 7789883f9bede2eb12459a145012d8e78f4f03d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 21 Apr 2020 11:36:52 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 111 +++++++++++++++++++++ .../pojo/wms/modelbean/BasBeanFieldModel.java | 3 + 2 files changed, 114 insertions(+) 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 3e46ce9..0ddebce 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 @@ -6252,4 +6252,115 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * 数据导入类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TEMPLATE_IMPORT_TYPE { + SINGLE_TABLE(10, "SINGLE_TABLE", "单表"), + MULTI_TABLE(20, "MULTI_TABLE", "多表"); + + private int value; + private String code; + private String description; + + TEMPLATE_IMPORT_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public 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 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 String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 数据更新类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TEMPLATE_UPDATE_TYPE { + FULL_COVERAGE(10, "FULL_COVERAGE", "全覆盖"), + DIFF_UPDATE(20, "DIFF_UPDATE", "差异更新"), + REPEATE_NO_IMPORT(30, "REPEATE_NO_IMPORT", "重复不导入"); + + private int value; + private String code; + private String description; + + TEMPLATE_UPDATE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public 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 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 String valueOfDescription(int val) { + return valueOf(val); + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java index 7b2421c..ed03f5e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java @@ -34,4 +34,7 @@ public class BasBeanFieldModel { @ApiParam("实例字段名称") public String propertyName; + + @ApiParam("实例类全名") + public String entityClassName; } From e6f3dd5c32ac5b71f64e83bb7dc82d111775e3c5 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 21 Apr 2020 15:09:16 +0800 Subject: [PATCH 09/14] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1683-?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E7=AE=A1=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java | 10 ++++------ .../estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java | 2 +- .../pojo/mes/repository/MesBoardEquDetailRepository.java | 15 +++++++++++++++ .../pojo/mes/repository/MesBoardEquStatusRepository.java | 15 +++++++++++++++ .../mes/repository/MesBoardMonitorObjectRepository.java | 15 +++++++++++++++ .../pojo/mes/repository/MesBoardPictureRepository.java | 15 +++++++++++++++ .../mes/repository/MesBoardPlanCapacityRepository.java | 15 +++++++++++++++ .../pojo/mes/repository/MesBoardShiftRepository.java | 15 +++++++++++++++ .../MesBoardShiftSectionCapacityRepository.java | 15 +++++++++++++++ .../mes/repository/MesBoardShiftSectionRepository.java | 15 +++++++++++++++ .../mes/repository/MesBoardTypeBaseCfgRepository.java | 15 +++++++++++++++ .../pojo/mes/repository/MesBoardTypeRepository.java | 15 +++++++++++++++ 13 files changed, 157 insertions(+), 8 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquStatusRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMonitorObjectRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPictureRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPlanCapacityRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapacityRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeBaseCfgRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeRepository.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 578c559..6a9bff3 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 @@ -643,7 +643,8 @@ public class MesEnumUtil { REPAIR("REPAIR", "处理措施"), SCRAP("SCRAP", "报废原因"), QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"), - WC_CHECK("WC_CHECK", "开线检查项"); + WC_CHECK("WC_CHECK", "开线检查项"), + BOARD("BOARD", "看板类型"); private String value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java index 8359735..154eada 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java @@ -42,11 +42,9 @@ public class MesBoardEquDetail extends BaseBean implements Serializable { @ApiParam("设备名称") private String equName; - @Column(name = "X") - @ApiParam("横坐标") - private Double x; + @ApiParam(value = "横坐标") + private Float horizontalAxis = 0f; - @Column(name = "Y") - @ApiParam("纵坐标") - private Double y; + @ApiParam(value = "纵坐标") + private Float verticalAxis = 0f; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java index 5b21418..6922121 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java @@ -25,7 +25,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_BOARD_PLAN_CAPACITY") -@Api("MES_看板时段计划产量") +@Api("MES_看板计划产能") public class MesBoardPlanCapacity extends BaseBean implements Serializable { private static final long serialVersionUID = 7355311263972875850L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquDetailRepository.java new file mode 100644 index 0000000..41b78cb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquDetailRepository.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.MesBoardEquDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 10:49 上午 + * @Modify: + */ +@Repository +public interface MesBoardEquDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquStatusRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquStatusRepository.java new file mode 100644 index 0000000..e3d77fa --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquStatusRepository.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.MesBoardEquStatus; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 10:50 上午 + * @Modify: + */ +@Repository +public interface MesBoardEquStatusRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMonitorObjectRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMonitorObjectRepository.java new file mode 100644 index 0000000..5e85eb7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMonitorObjectRepository.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.MesBoardMonitorObject; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 10:51 上午 + * @Modify: + */ +@Repository +public interface MesBoardMonitorObjectRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPictureRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPictureRepository.java new file mode 100644 index 0000000..1241b79 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPictureRepository.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.MesBoardPicture; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 10:52 上午 + * @Modify: + */ +@Repository +public interface MesBoardPictureRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPlanCapacityRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPlanCapacityRepository.java new file mode 100644 index 0000000..01bd1f8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPlanCapacityRepository.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.MesBoardPlanCapacity; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 10:53 上午 + * @Modify: + */ +@Repository +public interface MesBoardPlanCapacityRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftRepository.java new file mode 100644 index 0000000..854cf62 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftRepository.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.MesBoardShift; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 10:59 上午 + * @Modify: + */ +@Repository +public interface MesBoardShiftRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapacityRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapacityRepository.java new file mode 100644 index 0000000..209e270 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapacityRepository.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.MesBoardShiftSectionCapacity; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 11:07 上午 + * @Modify: + */ +@Repository +public interface MesBoardShiftSectionCapacityRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionRepository.java new file mode 100644 index 0000000..ab6817b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionRepository.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.MesBoardShiftSection; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 11:00 上午 + * @Modify: + */ +@Repository +public interface MesBoardShiftSectionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeBaseCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeBaseCfgRepository.java new file mode 100644 index 0000000..573f19b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeBaseCfgRepository.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.MesBoardTypeBaseCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 9:55 下午 + * @Modify: + */ +@Repository +public interface MesBoardTypeBaseCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeRepository.java new file mode 100644 index 0000000..2217998 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeRepository.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.MesBoardType; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 11:11 上午 + * @Modify: + */ +@Repository +public interface MesBoardTypeRepository extends BaseRepository { +} From fee90baf6474fb429f13adc0c26c83b69a8cdf12 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 13 Apr 2020 18:37:56 +0800 Subject: [PATCH 10/14] =?UTF-8?q?1.=20=E5=85=B3=E9=97=ADregister=20,=20gat?= =?UTF-8?q?eway=20,=20console=20=E6=97=A5=E5=BF=97=E6=8C=81=E4=B9=85?= =?UTF-8?q?=E5=8C=96=E6=8A=80=E6=9C=AF=202.=20Sonar=20Bug=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=203.=20=E8=87=AA=E5=AE=9A=E4=B9=89=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=8C=81=E4=B9=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 5 +- .../pojo/platform/platbean/SysLogConsole.java | 127 +++++++++++++++++++++ 2 files changed, 130 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.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 7dfb083..b380bd4 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 @@ -43,7 +43,8 @@ public class CommonEnumUtil { SURFACE(98, 0, 0, "i3surface", "对外服务"), CLOUD(97, 0, 0, "i3cloud", "微服务"), GATEWAY(96, 9000, 3, "impp-gateway", "服务网关"), - CONSOLE(95, 8010, 2, "impp-console", "服务监控台"); + CONSOLE(95, 8010, 2, "impp-console", "服务监控台"), + DEV(9999, 0000, 0, "Development", "系统调试"); /** * 产品ID @@ -1231,7 +1232,7 @@ public class CommonEnumUtil { * 日志记录方式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum LOG_DETAIL_SHOW_TYPE { + public enum LOG_DETAIL_SHOW_TYPE { DEBUG(1, "DEBUG"), OVER_TIME(2, "记录超时服务"), ALL_METHOD(3, "所有服务"), 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 new file mode 100644 index 0000000..8bebcfa --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java @@ -0,0 +1,127 @@ +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; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-9 下午8:41 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_LOG_CONSOLE") +@Api(value="系统异常表",description = "记录系统出现的异常") +public class SysLogConsole extends BaseBean { + + /******** 服务器信息 ********/ + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品名称") + private String softType; + + @Column(name="LOG_HOST") + @ApiParam(value ="服务器IP") + private String logHost; + + @Column(name="LOG_PID") + @ApiParam(value ="应用PID") + private Long logPid; + + @Column(name="LOG_PORT") + @ApiParam(value ="应用端口") + private Integer logPort; + + @Column(name="LOG_GORP") + @ApiParam(value ="日志分组(控制台日志,操作日志,系统日志,定任务日志)") + private String logGorp; + + @Column(name="LOG_LEVEL") + @ApiParam(value ="日志等级(OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL)") + private String logLevel; + + @Column(name="LOG_TYPE") + @ApiParam(value ="操作类型(post,put,get)") + private String logType; + + /******** 用户信息 ********/ + + @Column(name="USER_HOST") + @ApiParam(value ="用户登录IP") + private String userHost; + + @Column(name="USER_BROWSER") + @ApiParam(value ="用户登录浏览器") + private String userBrowser; + + @Column(name="USER_OS") + @ApiParam(value ="用户登录操作系统") + private String userOs; + + @Column(name="USER_ID") + @ApiParam(value ="账号ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; + + @Column(name="USER_LOGIN_NAME") + @ApiParam(value ="用户登录名称") + private String userLoginName; + + /******** 日志信息 ********/ + + @Column(name="EXECUTE_THREAD_ID") + @ApiParam(value ="执行线程") + private String executeThreadId; + + @Column(name="EXECUTE_CLASS_NAME") + @ApiParam(value ="执行Class") + private String executeClassName; + + @Column(name="EXECUTE_METHOD") + @ApiParam(value ="执行方法") + private String executeMethod; + + @Column(name="EXECUTE_LINE_NUMBER") + @ApiParam(value ="报错行数") + private Integer executeLineNumber; + + @Column(name="EXECUTE_TITLE") + @ApiParam(value ="方法标题") + private String executeTitle; + + @Column(name="EXECUTE_ARGS") + @ApiParam(value ="执行参数") + private String executeArgs; + + @Column(name="EXECUTE_TIME") + @ApiParam(value ="执行耗时") + private Integer executeTime; + + @Column(name="EXECUTE_STATUS") + @ApiParam(value ="执行状态") + private String executeStatus; + + @Column(name="EXECUTE_MESSAGE") + @ApiParam(value ="执行日志信息") + private String executeMessage; + + @Column(name="ERROR_STACK_TRACE",length = 5000) + @ApiParam(value ="执行异常堆栈信息") + private String errorStackTrace; + +} From 9d3a4db040ae1e9780efbe7bd46d7c083b297613 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 15 Apr 2020 23:00:07 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2Bug?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java | 9 +++++++++ .../cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java | 1 + .../cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index f0f7fb2..b372f78 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -35,6 +36,14 @@ public class SysConfig extends BaseBean { @ApiParam(value ="名称") private String name; + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品类型") + private Integer softType; + + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } + @Column(name="CONFIG_TYPE") @ApiParam(value ="参数类型ID（枚举：1.系统配置...）" , example ="-1") private Integer configType; 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 8bebcfa..d5d8333 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 @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="系统异常表",description = "记录系统出现的异常") public class SysLogConsole extends BaseBean { + /******** 服务器信息 ********/ @Column(name="SOFT_TYPE") @ApiParam(value ="产品名称") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index 5268d83..fedc271 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -43,7 +43,7 @@ public class SysLogTaskTime extends BaseBean { @Column(name="SCHEDULER_SERVER_PORT") @ApiParam(value ="调度服务器端口") - private String schedulerServerPort; + private Integer schedulerServerPort; @Column(name="TASK_THREAD_ID") @ApiParam(value ="任务线程id") From c8197f3290dcbbf5211f7be5947ee4cb4dc8a6b0 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Sat, 18 Apr 2020 15:47:19 +0800 Subject: [PATCH 12/14] =?UTF-8?q?1.=20=E6=8E=88=E6=9D=83=E5=B0=81=E8=A3=85?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4=202.=20=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=9F=A5=E8=AF=A2=E5=B0=81=E8=A3=85?= =?UTF-8?q?=203.=20=E6=B7=BB=E5=8A=A0=E8=BD=AF=E9=80=82=E9=85=8D=20?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8=204.=20p?= =?UTF-8?q?om.xml=20=E5=BC=95=E7=94=A8=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/license/ImppLicense.java | 107 +++++++++++++++++++++ .../pojo/model/license/ImppLicenseSenseshield.java | 55 +++++++++++ .../pojo/model/softswitch/BsSuitCaseModel.java | 8 ++ .../pojo/model/softswitch/SuitImppCloudModel.java | 35 +++++++ .../pojo/platform/platbean/SysLogConsole.java | 1 + .../i3plus/pojo/softswitch/bean/BsSuitCase.java | 7 ++ 6 files changed, 213 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java new file mode 100644 index 0000000..b7395fd --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java @@ -0,0 +1,107 @@ +package cn.estsh.i3plus.pojo.model.license; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.Objects; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-2-10 下午5:10 + * @Modify: + **/ +@Data +public class ImppLicense implements Serializable { + + private static final long serialVersionUID = 2365830603839063328L; + /** + * + * 授权人名称 + * 授权开始时间 + * 授权结束时间 + * + * 授权工厂 + * 仓库 + * 产线 + * 用户 + * 授权描述 + * 同时最大在线数量 + * + */ + + /* 基础信息 */ + @ApiParam(value ="授权ID") + private Long Id; // ID + @ApiParam(value ="授权应用ID") + private Long appId; // APP_ID + @ApiParam(value ="授权读取授权数据ID") + private Integer licenseSourceId; // 授权数据来源 + public String getLicenseSourceTxt() { + return licenseSourceId == null ? null : CommonEnumUtil.LICENSE_SOURCE.valueOf(licenseSourceId); + } + + /* 授权信息 */ + @ApiParam(value ="授权开始时间") + private Date licenseStartDateTime; // 授权开始时间 + @ApiParam(value ="授权结束时间") + private Date licenseEndDateTime; // 授权结束时间 + @ApiParam(value ="授权组织数量") + private Integer licenseMaxOrganize; // 授权组织数量 + @ApiParam(value ="授权仓库数量") + private Integer licenseMaxWarehouse; // 授权仓库数量 + @ApiParam(value ="授权产线数量") + private Integer licenseMaxProductionLine; // 授权产线数量 + @ApiParam(value ="授权用户数量") + private Integer licenseMaxUser; // 授权用户数量 + @ApiParam(value ="授权同时在线数量") + private Integer licenseMaxUserSession; // 授权在线用户数量 + @ApiParam(value ="授权描述信息") + private String licenseDescription; // 授权描述信息 + @ApiParam(value ="深思授权信息") + private ImppLicenseSenseshield senseshield; + + /* 业务人员信息 */ + @ApiParam(value ="授权创建时间") + private Date licenseCreateDateTime; // 授权时间 + @ApiParam(value ="授权创建人员ID") + private Long licenseCreateUserId; // 授权用户ID + @ApiParam(value ="授权创建人员名称") + private String licenseCreateUserName; // 授权人名称 + @ApiParam(value ="授权更新人员ID") + private Long licenseUpdateUserId; // 授权更新人员ID + @ApiParam(value ="授权更新人员名称") + private String licenseUpdateUserName; // 授权人名称 + @ApiParam(value ="授权更新人员时间") + private Date licenseUpdateDateTime; // 授权更新时间 + + /* 授权锁信息(软锁,usb锁) */ + @ApiParam(value ="授权使用开始时间") + private Date lockStartTime; + @ApiParam(value ="授权使用结束时间") + private Date lockEndTime; + @ApiParam(value ="锁类型") + private String lockType; + + /* 基础业务逻辑 */ + @ApiParam(value ="到期时间") + private Date maturityDateTime; + + public void setSenseshield(ImppLicenseSenseshield senseshield) { + if(Objects.nonNull(senseshield)){ + try { + this.lockStartTime = new Date(senseshield.getLast_update_timestamp() * 1000L); + this.lockEndTime = new Date((senseshield.getLast_update_timestamp() + senseshield.getSpan_time()) * 1000L); + this.lockType = senseshield.getType(); + this.maturityDateTime = lockEndTime.getTime() > licenseEndDateTime.getTime() ? licenseEndDateTime: lockEndTime; + }catch (Exception e){ + } + } + this.senseshield = senseshield; + } + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java new file mode 100644 index 0000000..4606b0e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.model.license; + +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-16 下午7:54 + * @Modify: + **/ +@Data +public class ImppLicenseSenseshield { + + + /** + * license_id : 170817 + * enable : true + * guid : 6cece6946234ed4292617306ccd1191a + * first_use_time : 1587029768 + * span_time : 315360000 + * concurrent_type : win_user_session + * concurrent : 1000 + * version : 0 + * module : 0000000000000000 + * last_update_timestamp : 1587029200 + * last_update_timesn : 0 + * rom_size : 1184 + * raw_size : 1184 + * pub_size : 0 + * developer_id : 0800000000001005 + * type : local + * sn : 9733c801000702075ed2000200270021 + */ + + private int license_id; + private boolean enable; + private String guid; + private int first_use_time; + private int span_time; + private String concurrent_type; + private int concurrent; + private int version; + private String module; + private int last_update_timestamp; + private int last_update_timesn; + private int rom_size; + private int raw_size; + private int pub_size; + private String developer_id; + private String type; + private String sn; + + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index 0bb8f7c..4c5ea4f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -1,12 +1,14 @@ package cn.estsh.i3plus.pojo.model.softswitch; import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.*; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.Objects; /** * @Description : 适配器model @@ -23,6 +25,9 @@ public class BsSuitCaseModel implements Serializable { @ApiParam(value = "适配器") private BsSuitCase bsSuitCase; + @ApiParam(value = "适配器同步处理Cloud微服务标识") + private Integer resultSoftType; + @ApiParam(value = "数据源适配套件") private BsSuitCaseDataSource bsSuitCaseDataSource; @@ -49,5 +54,8 @@ public class BsSuitCaseModel implements Serializable { public BsSuitCaseModel(BsSuitCase bsSuitCase) { this.bsSuitCase = bsSuitCase; + if(Objects.nonNull(bsSuitCase.getResultSoftType())){ + this.resultSoftType = bsSuitCase.getResultSoftType(); + } } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java new file mode 100644 index 0000000..83ac2e0 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-18 上午10:26 + * @Modify: + **/ +@Data +public class SuitImppCloudModel { + + @ApiParam(value = "适配器信息") + private BsSuitCaseModel model; + + @ApiParam(value = "请求参数信息") + private Object param; + + public SuitImppCloudModel() { + } + + public SuitImppCloudModel(SuitServerModel serverModel) { + this.model = serverModel.getBsSuitCaseModel(); + this.param = serverModel.getObj(); + this.param = serverModel.getObj(); + } + + public SuitImppCloudModel(BsSuitCaseModel model, Object param) { + this.model = model; + this.param = param; + } +} 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 d5d8333..fd31e35 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.platform.platbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index b757ba7..deb2151 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -108,6 +108,13 @@ public class BsSuitCase extends BaseBean { @ApiParam(value = "是否推送MQ") private Integer isPushMQ; + @Column(name = "RESULT_SOFT_TYPE") + @ApiParam(value = "同步调用微服务") + private Integer resultSoftType; + public String getResultSoftTypeTxt() { + return resultSoftType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(resultSoftType); + } + @Column(name = "SSL_KEY_ID") @ApiParam(value = "证书id") @JsonSerialize(using = ToStringSerializer.class) From 3aa1afb0ce89fb9b5a03cc798f88296a427cdee3 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 21 Apr 2020 15:02:58 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=20Pojo=20=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 44 ++++++++++++ .../i3plus/pojo/model/common/ClassFieldModel.java | 1 + .../estsh/i3plus/pojo/model/common/ClassModel.java | 1 + .../i3plus/pojo/model/license/ImppLicense.java | 29 +++++--- .../i3plus/pojo/platform/bean/SysPojoVersion.java | 82 ++++++++++++++++++++++ .../pojo/platform/bean/SysPojoVersionDetail.java | 56 +++++++++++++++ .../pojo/platform/bean/SysPojoVersionPlan.java | 56 +++++++++++++++ .../repository/SysPojoVersionDetailRepository.java | 14 ++++ .../repository/SysPojoVersionPlanRepository.java | 14 ++++ .../repository/SysPojoVersionRepository.java | 14 ++++ 10 files changed, 303 insertions(+), 8 deletions(-) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionPlan.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionDetailRepository.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionPlanRepository.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionRepository.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 b380bd4..00f6f1b 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 @@ -1964,6 +1964,50 @@ public class CommonEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DAO_OPERATE_TYPE { + INSERT(1, "新增"), + DELETE(2, "删除"), + UPDATE(3, "修改"), + SELECT(4, "查询"); + + private int value; + private String description; + + private DAO_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 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 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; + } + } + /** * actuator env */ diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java index 907b15a..e375044 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java @@ -18,6 +18,7 @@ import java.io.Serializable; @Data public class ClassFieldModel implements Serializable { + private static final long serialVersionUID = -8873901724079105728L; @ApiParam(value ="包名") private String packageName; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java index e601f37..976368d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java @@ -21,6 +21,7 @@ import java.util.List; @Data public class ClassModel implements Serializable { + private static final long serialVersionUID = -8024274383480419754L; @ApiParam(value ="服务ID") private int serverId; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java index b7395fd..77c3e53 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java @@ -3,8 +3,11 @@ package cn.estsh.i3plus.pojo.model.license; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import java.io.Serializable; +import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.Objects; @@ -19,6 +22,8 @@ import java.util.Objects; public class ImppLicense implements Serializable { private static final long serialVersionUID = 2365830603839063328L; + + private static final String TIME_FORMAT = "yyyy-MM-dd HH:mm:ss"; /** * * 授权人名称 @@ -47,9 +52,9 @@ public class ImppLicense implements Serializable { /* 授权信息 */ @ApiParam(value ="授权开始时间") - private Date licenseStartDateTime; // 授权开始时间 + private String licenseStartDateTime; // 授权开始时间 @ApiParam(value ="授权结束时间") - private Date licenseEndDateTime; // 授权结束时间 + private String licenseEndDateTime; // 授权结束时间 @ApiParam(value ="授权组织数量") private Integer licenseMaxOrganize; // 授权组织数量 @ApiParam(value ="授权仓库数量") @@ -81,23 +86,31 @@ public class ImppLicense implements Serializable { /* 授权锁信息(软锁,usb锁) */ @ApiParam(value ="授权使用开始时间") - private Date lockStartTime; + private String lockStartTime; @ApiParam(value ="授权使用结束时间") - private Date lockEndTime; + private String lockEndTime; @ApiParam(value ="锁类型") private String lockType; /* 基础业务逻辑 */ @ApiParam(value ="到期时间") - private Date maturityDateTime; + private String maturityDateTime; + + public String getMaturityDateTime() { + if(StringUtils.isBlank(maturityDateTime)){ + return StringUtils.isNotBlank(lockEndTime) ? lockEndTime : licenseEndDateTime; + } + return maturityDateTime; + } public void setSenseshield(ImppLicenseSenseshield senseshield) { if(Objects.nonNull(senseshield)){ try { - this.lockStartTime = new Date(senseshield.getLast_update_timestamp() * 1000L); - this.lockEndTime = new Date((senseshield.getLast_update_timestamp() + senseshield.getSpan_time()) * 1000L); + Date lockEndTime = new Date((senseshield.getLast_update_timestamp() + senseshield.getSpan_time()) * 1000L); + Date licenseEndDateTime = new Date(this.licenseEndDateTime); + this.lockType = senseshield.getType(); - this.maturityDateTime = lockEndTime.getTime() > licenseEndDateTime.getTime() ? licenseEndDateTime: lockEndTime; + this.maturityDateTime = DateFormatUtils.format(lockEndTime.getTime() > licenseEndDateTime.getTime() ? licenseEndDateTime: lockEndTime,TIME_FORMAT); }catch (Exception e){ } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java new file mode 100644 index 0000000..3fe7559 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java @@ -0,0 +1,82 @@ +package cn.estsh.i3plus.pojo.platform.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-20 上午9:46 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_POJO_VERSION") +@Api(value="对象历史") +public class SysPojoVersion extends BaseBean { + + + private static final long serialVersionUID = -2456588444446248239L; + + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品类型") + private Integer softType; + + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } + + @Column(name="REF_ID") + @ApiParam(value ="对象id" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long refId; + + @Column(name="REF_CLASS") + @ApiParam(value ="记录对象") + private String refClass; + + @Column(name="VERSION_NO") + @ApiParam(value ="记录对象版本号") + private Integer versionNo = 0; + + @Column(name="operateType") + @ApiParam(value ="操作类型") + private Integer operateType; + public String getOperateTypeTxt() { + return operateType == null ? null : CommonEnumUtil.DAO_OPERATE_TYPE.valueOf(operateType); + } + + @Column(name="VERSION_METHOD_NAME") + @ApiParam(value ="操作方法名称") + private String versionMethodName; + + @Column(name="POJO_DETAIL_ID") + @ApiParam(value ="对象明细id" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long pojoDetailId; + + @Lob + @Column(name="POJO_COMPARE") + @ApiParam(value ="记录对象对比差异") + private String pojoCompare; + + @Transient + @ApiParam(value ="用户部门信息") + private SysPojoVersionDetail versionDetail; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java new file mode 100644 index 0000000..19f9d82 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.platform.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.Lob; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-20 上午9:46 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_POJO_VERSION_DETAIL") +@Api(value="对象历史") +public class SysPojoVersionDetail extends BaseBean { + + + private static final long serialVersionUID = -2456588444446248239L; + @Column(name="POJO_VERSION_ID") + @ApiParam(value ="对象id" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long pojoVersionId; + + @Lob + @Column(name="POJO_BEFORE",length = 5000) + @ApiParam(value ="原始对象信息") + private String pojoBefore; + + @Lob + @Column(name="POJO_AFTER",length = 5000) + @ApiParam(value ="修改之后对象信息") + private String pojoAfter; + + @Lob + @Column(name="POJO_COMPARE",length = 5000) + @ApiParam(value ="记录对象对比差异") + private String pojoCompare; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionPlan.java new file mode 100644 index 0000000..407d667 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionPlan.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-20 上午9:46 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_POJO_VERSION_PLAN") +@Api(value="对象历史") +public class SysPojoVersionPlan extends BaseBean { + + private static final long serialVersionUID = -1120504360281638917L; + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品类型") + private Integer softType; + + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } + + @Column(name="REF_CLASS") + @ApiParam(value ="记录对象") + private String refClass; + + @Column(name="REF_CLASS_TITLE") + @ApiParam(value ="记录对象名称") + private String refClassTitle; + + @Column(name="PLAN_STATUS") + @ApiParam(value ="记录对象状态") + private Integer planStatus; + + @Column(name="PLAN_DESCRIPTION") + @ApiParam(value ="记录对象描述") + private String planDescription; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionDetailRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionDetailRepository.java new file mode 100644 index 0000000..33af517 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionDetail; + +/** + * @Description : 对象记录明细 + * @Reference : + * @Author : wei.peng + * @Date : 2020-04-21 14:19:34 + * @Modify : + **/ +public interface SysPojoVersionDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionPlanRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionPlanRepository.java new file mode 100644 index 0000000..feaa6da --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionPlanRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionPlan; + +/** + * @Description : 对象记录拦截 + * @Reference : + * @Author : wei.peng + * @Date : 2020-04-21 14:19:34 + * @Modify : + **/ +public interface SysPojoVersionPlanRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionRepository.java new file mode 100644 index 0000000..78fbb6f --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersion; + +/** + * @Description : 对象记录 + * @Reference : + * @Author : wei.peng + * @Date : 2020-04-21 14:19:34 + * @Modify : + **/ +public interface SysPojoVersionRepository extends BaseRepository { +} From 7c7691f5839ebae9b619c614eb035ec958e34137 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 21 Apr 2020 17:43:04 +0800 Subject: [PATCH 14/14] =?UTF-8?q?bug8190=E3=80=908190=20=E4=B8=AD=E8=88=AA?= =?UTF-8?q?-=E6=88=90=E5=93=81=E6=9D=A1=E7=A0=81=E7=BB=B4=E6=8A=A4-?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E4=BB=A3?= =?UTF-8?q?=E7=A0=81-=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index ead19c3..3fe234b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -11,7 +11,11 @@ import lombok.ToString; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -115,6 +119,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "客户单号") private String custOrderNo; + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + @Transient private List movementDetailsList;