From 8892c78692a1d2c7dc3a830d9c230357f2a406c5 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 28 Nov 2019 10:05:11 +0800 Subject: [PATCH 01/31] =?UTF-8?q?=E3=80=90EU=E6=88=90=E5=93=81=E5=8F=91?= =?UTF-8?q?=E8=BF=90-=E5=AE=A2=E6=88=B7=E7=BC=96=E5=8F=B7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index d94d784..403991f 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 @@ -602,6 +602,8 @@ public class WmsHqlPack { //供应商编号 DdlPreparedPack.getStringEqualPack(wmsShippingFlag.getFlagNo(), "flagNo", result); + //客户编号 + DdlPreparedPack.getStringEqualPack(wmsShippingFlag.getCustNo(), "custNo", result); //供应商简称 DdlPreparedPack.getStringLikerPack(wmsShippingFlag.getFlagName(), "flagName", result); //供应商全称 From e580dcbd2d28f7a2fe11a348ddcc610887b4692e Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 2 Dec 2019 12:42:11 +0800 Subject: [PATCH 02/31] =?UTF-8?q?=E3=80=90=E6=89=AB=E6=8F=8F=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9F=A5=E8=AF=A2=E4=B8=80=E4=B8=AA=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E8=A6=81=E5=88=86=E8=A1=8C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E8=AF=A5=E6=9D=A1=E5=90=97=E7=9A=84=EF=BC=9A=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=9C=B0=EF=BC=8C=E5=BA=93=E4=BD=8D=EF=BC=8C=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E7=8A=B6=E6=80=81=EF=BC=8C=E6=95=B0=E9=87=8F?= =?UTF-8?q?=EF=BC=8C=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E6=89=B9=E6=AC=A1=EF=BC=8C=E8=BF=87=E6=9C=9F=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=EF=BC=8C=E6=94=B6=E8=8E=B7=E6=89=B9=E6=AC=A1=EF=BC=8C?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=88=86=E8=A1=8C=E6=98=BE=E7=A4=BA=E3=80=91?= =?UTF-8?q?bug6663?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index 651b336..d5e6146 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -23,13 +23,13 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_TRANS_QUAN"/*, indexes = { +@Table(name = "WMS_TRANS_QUAN", indexes = { @Index(columnList = "WH_NO"), @Index(columnList = "ZONE_NO"), @Index(columnList = "LOCATE_NO"), @Index(columnList = "REF_SRC"), @Index(columnList = "ORGANIZE_CODE") -}*/) +}) @Api("库存交易信息") public class WmsTransQuan extends BaseBean { From b9906cee55ecf6d1c829d6e529c70fa2da85fabd Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 2 Dec 2019 13:09:20 +0800 Subject: [PATCH 03/31] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 45 +++++++++++++++++++++- .../i3plus/pojo/mes/pcn/bean/MesObjectCfg.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesObjectCfg.java | 2 +- 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 3673841..cf2bec1 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 @@ -428,6 +428,16 @@ public class MesEnumUtil { } return tmp; } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } } @@ -714,6 +724,16 @@ public class MesEnumUtil { } return tmp; } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -1308,7 +1328,10 @@ public class MesEnumUtil { MES_SHIFT(180, "班次"), MES_SHIFT_GROUP(190, "班组"), MES_WORK_CELL_PARAM_CFG(200, "工作单元参数配置"), - MES_STATION_BOM(210, "工位BOM表"); + MES_STATION_BOM(210, "工位BOM表"), + MES_DATA_OBJECT(220, "数据对象"), + MES_OBJECT_CFG(230, "对象结构"), + MES_WC_CHECK(240, "开线检查"); private int value; private String description; @@ -3479,6 +3502,16 @@ public class MesEnumUtil { } return tmp; } + + public static String descriptionOfValue(String description) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -3525,6 +3558,16 @@ public class MesEnumUtil { } return tmp; } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java index ca13bc4..fc8ee12 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java @@ -45,7 +45,7 @@ public class MesObjectCfg extends BaseBean { @Column(name = "FIELD_LENGTH") @ApiParam("列长度") - private String fieldLength; + private Integer fieldLength; @Column(name = "POJO_ATTR") @ApiParam("对应的pojo属性") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index b38c717..a5ccc00 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -45,7 +45,7 @@ public class MesObjectCfg extends BaseBean { @Column(name = "FIELD_LENGTH") @ApiParam("列长度") - private String fieldLength; + private Integer fieldLength; @Column(name = "POJO_ATTR") @ApiParam("对应的pojo属性") From cfa54aa2b6cc6978906a3ba9062b2128a5a09046 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 2 Dec 2019 13:17:50 +0800 Subject: [PATCH 04/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index f8fa98e..ebd53c3 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index b0a3f82..c052a9d 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d790ef1..e97c0bb 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index c6141da..90e744d 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 23e5bee..0ba3645 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index c1e2cb9..6706323 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 856da5f..ffcac19 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 09f2c4a..e388a1d 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 82fdbe8..62ebe64 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index b7b2dfc..39d9423 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index ec9e100..e310bfd 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index bd09726..e36fcf7 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 4c96781..81fb02b 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 2c24e41..1f622d9 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 18c811c..bc41914 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 1171f4e..93f9732 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 5345a36..9caeb95 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform modules/i3plus-pojo-model From a3115601a7f127fb19d3bfa857f59860c51fb418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:55:06 +0800 Subject: [PATCH 05/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9caeb95..5345a36 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 modules/i3plus-pojo-model From d62aec1c626aa8fd781e7f729c54ed1756b3b4e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:55:20 +0800 Subject: [PATCH 06/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-andon/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index ebd53c3..f8fa98e 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 From e43d593db6524804151d59037e46f060d8f1d648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:55:38 +0800 Subject: [PATCH 07/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-aps/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-aps/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index c052a9d..b0a3f82 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 From 5d57bc44d86eca1679ef5594546cc41850e46471 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:55:51 +0800 Subject: [PATCH 08/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-base/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-base/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index e97c0bb..d790ef1 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 From f8356637aee112688d761d1d44679bd3589c6992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:56:07 +0800 Subject: [PATCH 09/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-form/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-form/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 90e744d..c6141da 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 From fda76e06c830f4bd867ab58adcf88bb4826a28f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:56:21 +0800 Subject: [PATCH 10/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-hardswitch/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 071c218a2e51b7851ae8323f10928d8b86dad290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:56:42 +0800 Subject: [PATCH 11/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-jobflow/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-jobflow/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From e09345984da27c450c20029d117a2d69a08a8e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:56:56 +0800 Subject: [PATCH 12/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-lac/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-lac/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index ffcac19..856da5f 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 From b703c9394cca809a5598277f6013edd6d4d03f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:57:09 +0800 Subject: [PATCH 13/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-mes/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-mes/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 5b672e7d68e7086761ce9cab73f4fd703bf4675e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:57:31 +0800 Subject: [PATCH 14/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-mes-pcn/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4911d184e0c9b0e58320a698d9afd1da6ce90a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:58:36 +0800 Subject: [PATCH 15/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-model/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-model/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 39d9423..b7b2dfc 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 From 711116d04126347c28c891478eea68025700cef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:58:50 +0800 Subject: [PATCH 16/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-platform/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-platform/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From b2210e74258c8e974883694ff197c2a9deb97256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:59:03 +0800 Subject: [PATCH 17/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-report/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-report/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index e36fcf7..bd09726 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 From be04366551bbc8dda0e99af3ba20898850b66038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:59:14 +0800 Subject: [PATCH 18/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-softswitch/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-softswitch/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 81fb02b..4c96781 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 From ea8f5273099bf11955adc4bb850ecc07b9959925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:59:26 +0800 Subject: [PATCH 19/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-sweb/pom.xml'?= 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 a2548413854cd58f2dcd74b764a814b289c618d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:59:38 +0800 Subject: [PATCH 20/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-wms/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-wms/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index bc41914..18c811c 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 From 3df5888a699a8ea705230448b84d2fb0445f82d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= Date: Mon, 2 Dec 2019 15:59:48 +0800 Subject: [PATCH 21/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-workflow/pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-workflow/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 935ca2f4d7b74ef4506e3cf0a15c07be62456d53 Mon Sep 17 00:00:00 2001 From: jokelone Date: Mon, 2 Dec 2019 16:25:24 +0800 Subject: [PATCH 22/31] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1211?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesQcCheckData.java | 25 ---------------------- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 +++ 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java index 586e215..a315dc6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java @@ -93,29 +93,4 @@ public class MesQcCheckData extends BaseBean { @Column(name = "CUST_CODE") @ApiParam("客户代码") private String custCode; - - @Transient - @ApiParam("班次") - private String shiftCode; - - @Transient - @ApiParam("班组") - private String shiftGroup; - - @Transient - @ApiParam("班长") - private String squadLeader; - - @Transient - @ApiParam("工作单元名称") - private String workCellName; - - @Transient - @ApiParam("物料名称") - private String partNoName; - - public MesQcCheckData(String createDatetime, String createUser) { - super.createDatetime = createDatetime; - super.createUser = createUser; - } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index ae7e52e..6810a1d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -1999,6 +1999,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesQcCheckData.getSn())) { DdlPreparedPack.getStringLikerPack(mesQcCheckData.getSn(), "sn", packBean); } + if (!StringUtils.isEmpty(mesQcCheckData.getCheckType())) { + DdlPreparedPack.getNumEqualPack(mesQcCheckData.getCheckType(), "checkType", packBean); + } if (!StringUtils.isEmpty(mesQcCheckData.getWorkCenterCode())) { DdlPreparedPack.getStringLikerPack(mesQcCheckData.getWorkCenterCode(), "workCenterCode", packBean); } From 1c9f605c565b4533d7683153b35293e2458a2e93 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 2 Dec 2019 20:17:06 +0800 Subject: [PATCH 23/31] =?UTF-8?q?=E3=80=90VDA=E6=88=90=E5=93=81=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E9=85=8D=E6=96=99-=E5=AE=A2=E6=88=B7=E5=8F=91?= =?UTF-8?q?=E5=BE=80=E5=9C=B0=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 3a5133e..0fe51eb 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 @@ -3815,7 +3815,8 @@ public class WmsEnumUtil { AUTO_OPT(20, "AUTO_OPT", "自动操作"), MENU_OPT(30, "MENU_OPT", "手工操作"), AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易"), - CREATE_DOCMOVE(50, "CREATE_DOCMOVE", "生成移库单"); + CREATE_DOCMOVE(50, "CREATE_DOCMOVE", "生成移库单"), + UPDATE_TASK(60, "UPDATE_TASK", "复用任务"); private int value; private String code; private String description; From 686cd3dbfaabb40945de96eea14ff9ac9d306b76 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Tue, 3 Dec 2019 09:31:07 +0800 Subject: [PATCH 24/31] =?UTF-8?q?=E3=80=90#1240=20KT-=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E3=80=91=E5=89=8D=E7=AB=AF=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsFinalShipmentModel.java | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFinalShipmentModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFinalShipmentModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFinalShipmentModel.java new file mode 100644 index 0000000..c434dd5 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFinalShipmentModel.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +/** + * @author ealvis + * @date 2019/12/2 14:45 + * 昆泰成品发运看板model + */ +@Data +public class WmsFinalShipmentModel { + /*订单号*/ + private String orderNo; + /*车牌号*/ + private String carNo; + /*物料号*/ + private String partNo; + /*计划数量*/ + private Double qty; + /*已发运数量*/ + private Double pickQty; + /*计划发货时间*/ + private String planTime; + /*实际发运时间*/ + private String finishTime; + /*状态*/ + private Integer orderStatus; + + public WmsFinalShipmentModel(){ + + } + + public WmsFinalShipmentModel(String orderNo, String carNo, String partNo, Double qty, Double pickQty, String planTime, String finishTime, Integer orderStatus) { + this.orderNo = orderNo; + this.carNo = carNo; + this.partNo = partNo; + this.qty = qty; + this.pickQty = pickQty; + this.planTime = planTime; + this.finishTime = finishTime; + this.orderStatus = orderStatus; + } +} From 5e8e05ddb4830efcfca712d0393b3828ad0fd910 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 3 Dec 2019 14:05:17 +0800 Subject: [PATCH 25/31] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E8=BE=BE?= =?UTF-8?q?=E5=BC=8F=E5=BD=95=E5=85=A5=E7=95=8C=E9=9D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 2 +- .../i3plus/pojo/aps/bean/ExpressionRecord.java | 49 ++++++++++++++++++++++ .../i3plus/pojo/aps/bean/FurnaceCapacity.java | 2 +- .../cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java | 2 +- .../cn/estsh/i3plus/pojo/aps/bean/Inventory.java | 4 +- .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 18 ++++---- .../cn/estsh/i3plus/pojo/aps/bean/OperInput.java | 6 +-- .../cn/estsh/i3plus/pojo/aps/bean/OperOutput.java | 6 +-- .../cn/estsh/i3plus/pojo/aps/bean/Operation.java | 8 ++-- .../cn/estsh/i3plus/pojo/aps/bean/ParentWork.java | 2 +- .../estsh/i3plus/pojo/aps/bean/ProductOrder.java | 6 +-- .../estsh/i3plus/pojo/aps/bean/PurchaseOrder.java | 4 +- .../cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java | 4 +- .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 4 +- .../estsh/i3plus/pojo/aps/bean/StandOperation.java | 2 +- .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 6 +-- .../cn/estsh/i3plus/pojo/aps/bean/WorkInput.java | 4 +- .../cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java | 4 +- .../estsh/i3plus/pojo/aps/bean/WorkRelation.java | 2 +- .../estsh/i3plus/pojo/aps/model/FunctionModel.java | 10 +++++ .../aps/repository/ExpressionRecordRepository.java | 9 ++++ .../src/main/resources/relations/ExportProject.xml | 8 ++-- .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 3 +- 23 files changed, 117 insertions(+), 48 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/FunctionModel.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExpressionRecordRepository.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index d569b69..e032535 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -38,7 +38,7 @@ public class BaseOrder extends BaseCode { @FieldAnnotation(relation = "Material", notEmpty = true) private Long materialId; - @Column(name="COUNT") + @Column(name="COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="数量") @FieldAnnotation(notEmpty = true) @Min(0) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java new file mode 100644 index 0000000..272f6d3 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 保存的表达式录入记录 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-12-03 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_EXPRESSION_RECORD") +@Api("表达式记录") +public class ExpressionRecord extends BaseAPS { + @Column(name="BEAN_NAME") + @ApiParam(value ="表名") + @FieldAnnotation(property = false) + private String beanName; + + @Column(name="FIELD_NAME") + @ApiParam(value ="字段名") + @FieldAnnotation(property = false) + private String fieldName; + + @Column(name="NAME") + @ApiParam(value ="名称") + @FieldAnnotation(notEmpty = true) + private String name; + + @Column(name="EXPRESSION") + @ApiParam(value ="表达式") + private String expression; + + @Column(name="REMARK") + @ApiParam(value ="备注") + private String remark; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java index ea84c13..0d5f15e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java @@ -46,7 +46,7 @@ public class FurnaceCapacity extends BaseAPS { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Material") private String materialCode; - @Column(name="CAPACITY") + @Column(name="CAPACITY", columnDefinition = "decimal(18,8)") @ApiParam(value ="容量限制") @Min(0) private Double capacity; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java index ae52fcc..9d8340d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java @@ -32,7 +32,7 @@ import java.util.List; @Api("炉资源计划") public class FurnacePlan extends BaseAPS { - @Column(name="CAPACITY") + @Column(name="CAPACITY", columnDefinition = "decimal(18,8)") @ApiParam(value ="已占用的能力") private Double capacity; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java index ad08ede..741324f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java @@ -34,12 +34,12 @@ public class Inventory extends BaseOrder { @ApiParam(value ="指定上层订单") private String specifyUpOrder; - @Column(name="ASSIGN_COUNT") + @Column(name="ASSIGN_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="已分配量") @FieldAnnotation(modify = false) private Double assignCount; - @Column(name="EXCESS_COUNT") + @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="多余量") @FieldAnnotation(modify = false) private Double excessCount; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index b6842e5..cb15093 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -80,40 +80,40 @@ public class Material extends BaseCode { @FieldAnnotation(defaultValue = "1") private Boolean autoFixPegging; - @Column(name="MAX_PRODUCT_BATCH") + @Column(name="MAX_PRODUCT_BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="最大制造批量") private Double maxProductBatch; - @Column(name="MIN_PRODUCT_BATCH") + @Column(name="MIN_PRODUCT_BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="最小制造批量") @FieldAnnotation(defaultValue = "0.0") private Double minProductBatch; - @Column(name="UNIT_PRODUCT_BATCH") + @Column(name="UNIT_PRODUCT_BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="制造批量单位") private Double UnitProductBatch; - @Column(name="MAX_PUR_BATCH") + @Column(name="MAX_PUR_BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="最大采购批量") private Double maxPurBatch; - @Column(name="MIN_PUR_BATCH") + @Column(name="MIN_PUR_BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="最小采购批量") private Double minPurBatch; - @Column(name="UNIT_PUR_BATCH") + @Column(name="UNIT_PUR_BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="采购批量单位") private Double unitPurBatch; - @Column(name="MIN_STOCK_COUNT") + @Column(name="MIN_STOCK_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="最小库存数量") private Double minStockCount; - @Column(name="SAFE_STOCK_COUNT") + @Column(name="SAFE_STOCK_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="安全库存数量") private Double safeStockCount; - @Column(name="MAX_STOCK_COUNT") + @Column(name="MAX_STOCK_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="最大库存数量") private Double maxStockCount; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index 86c482c..53389da 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -39,15 +39,15 @@ public class OperInput extends BaseAPS { @FieldAnnotation(relation = "Material", notEmpty = true) private Long materialId; - @Column(name="INPUT_COUNT") + @Column(name="INPUT_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="单位输入量") private Double inputCount; - @Column(name="YIELD") + @Column(name="YIELD", columnDefinition = "decimal(18,8)") @ApiParam(value ="成品率") private Double yield; - @Column(name="FIX_SCRAP_COUNT") + @Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="固定报废数") private Double fixScrapCount; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java index 9160586..86c4996 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java @@ -38,15 +38,15 @@ public class OperOutput extends BaseAPS { @FieldAnnotation(relation = "Material", notEmpty = true) private Long materialId; - @Column(name="OUTPUT_COUNT") + @Column(name="OUTPUT_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="单位输出量") private Double outputCount; - @Column(name="YIELD") + @Column(name="YIELD", columnDefinition = "decimal(18,8)") @ApiParam(value ="成品率") private Double yield; - @Column(name="FIX_SCRAP_COUNT") + @Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="固定报废数") private Double fixScrapCount; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index 135ab21..d115131 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -44,17 +44,17 @@ public class Operation extends BaseAPS { @FieldAnnotation(relation = "StandOperation", notEmpty = true) private Long standOperationId; - @Column(name="PREV_COUNT_RATE") + @Column(name="PREV_COUNT_RATE", columnDefinition = "decimal(18,8)") @ApiParam(value ="前工序数量比") @FieldAnnotation(notEmpty = true, defaultValue = "1.0") private Double prevCountRate; - @Column(name="YIELD") + @Column(name="YIELD", columnDefinition = "decimal(18,8)") @ApiParam(value ="成品率") @FieldAnnotation(notEmpty = true, defaultValue = "1.0") private Double yield; - @Column(name="FIX_SCRAP_COUNT") + @Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="固定报废数") private Double fixScrapCount; @@ -66,7 +66,7 @@ public class Operation extends BaseAPS { @ApiParam(value ="分割的工作个数") private Integer count; - @Column(name="BATCH") + @Column(name="BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="分割批量") private Double batch; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java index ed4827d..9756426 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java @@ -32,7 +32,7 @@ import java.util.List; @Api("父工作") @ExcludeImportExport public class ParentWork extends BaseAPS { - @Column(name="count") + @Column(name="count", columnDefinition = "decimal(18,8)") @ApiParam(value ="数量") private Double count; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index 8655079..e9471e8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -71,7 +71,7 @@ public class ProductOrder extends BaseOrder { @ApiParam(value ="指定上层订单") private String specifyUpOrder; - @Column(name="ASSIGN_COUNT") + @Column(name="ASSIGN_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="已分配数量") private Double assignCount; @@ -84,12 +84,12 @@ public class ProductOrder extends BaseOrder { @FieldAnnotation(modify = false) private String calcLeadTime; - @Column(name="EXCESS_COUNT") + @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="多余量") @FieldAnnotation(modify = false) private Double excessCount; - @Column(name="LACK_COUNT") + @Column(name="LACK_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="缺少量") @FieldAnnotation(modify = false) private Double lackCount; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java index 8d11194..bbf7a04 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java @@ -34,7 +34,7 @@ public class PurchaseOrder extends BaseOrder { @ApiParam(value ="指定上层订单") private String specifyUpOrder; - @Column(name="ASSIGN_COUNT") + @Column(name="ASSIGN_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="已分配数量") private Double assignCount; @@ -47,7 +47,7 @@ public class PurchaseOrder extends BaseOrder { @FieldAnnotation(modify = false) private String calcLeadTime; - @Column(name="EXCESS_COUNT") + @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="多余量") @FieldAnnotation(modify = false) private Double excessCount; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java index e16db49..96de9d2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java @@ -30,7 +30,7 @@ import java.util.List; @Api("日历") public class ResCalendar extends BaseAPS { @Column(name="RES_CODES") - @ApiParam(value ="资源代码") + @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) private String resCodes; @@ -44,7 +44,7 @@ public class ResCalendar extends BaseAPS { private String dates; @Column(name="SHIFT_CODES") - @ApiParam(value ="班次代码") + @ApiParam(value ="班次编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "DayShift", notEmpty = true) private String shiftCodes; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index 39657b0..c9dc2e7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -39,7 +39,7 @@ public class Resource extends BaseCode { @FieldAnnotation(defaultValue = "SINGLE") private ApsEnumUtil.RESOURCE_CLASS resClass; - @Column(name="EFFICIENCY") + @Column(name="EFFICIENCY", columnDefinition = "decimal(18,8)") @ApiParam(value ="生产效率") @FieldAnnotation(defaultValue = "1.0", notEmpty = true) private Double efficiency; @@ -52,7 +52,7 @@ public class Resource extends BaseCode { @ApiParam(value ="后缓冲时间") private String postBuffer; - @Column(name="MAX_PRODUCE_BATCH") + @Column(name="MAX_PRODUCE_BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="最大生产批量") private Double maxProduceBatch; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index b5f79e1..90b158f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -39,7 +39,7 @@ public class StandOperation extends BaseCode { @ApiParam(value ="分割的工作个数") private Integer count; - @Column(name="BATCH") + @Column(name="BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="分割批量") private Double batch; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 3c5303c..3a8d8c4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -46,7 +46,7 @@ public class Work extends BaseAPS { @FieldAnnotation(property = false) private ApsEnumUtil.WORK_TYPE workType; - @Column(name="count") + @Column(name="count", columnDefinition = "decimal(18,8)") @ApiParam(value ="数量") @FieldAnnotation(modify = false) private Double count; @@ -70,7 +70,7 @@ public class Work extends BaseAPS { @FieldAnnotation(modify = false) private String planResource; - @Column(name="SPECIFY_COUNT") + @Column(name="SPECIFY_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="指定数量") private Double specifyCount; @@ -120,7 +120,7 @@ public class Work extends BaseAPS { @ApiParam(value ="已分割的工作是否固定") private Boolean fixSplit; - @Column(name="NEED_PREV_COUNT") + @Column(name="NEED_PREV_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="需要的前工作数量") @FieldAnnotation(display = false, modify = false) private Double needPrevCount; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index e84ac02..94e1a71 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java @@ -39,12 +39,12 @@ public class WorkInput extends BaseAPS { @FieldAnnotation(relation = "Material") private Long materialId; - @Column(name="INPUT_COUNT") + @Column(name="INPUT_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="输入数量") @FieldAnnotation(modify = false) private Double inputCount; - @Column(name="SHORT_COUNT") + @Column(name="SHORT_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="短缺数量") @FieldAnnotation(modify = false) private Double shortCount; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java index b3c4aaa..ef453ce 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java @@ -41,12 +41,12 @@ public class WorkOutput extends BaseAPS { @FieldAnnotation(relation = "Material") private Long materialId; - @Column(name="OUTPUT_COUNT") + @Column(name="OUTPUT_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="输出数量") @FieldAnnotation(modify = false) private Double outputCount; - @Column(name="REMAIN_COUNT") + @Column(name="REMAIN_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="多余数量") @FieldAnnotation(modify = false) private Double remainCount; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index 9343d9e..4a5e01f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -53,7 +53,7 @@ public class WorkRelation extends BaseAPS { @FieldAnnotation(relation = "PostWork") private Long postWorkId; - @Column(name="COUNT") + @Column(name="COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="关联数量") @FieldAnnotation(modify = false) private Double count; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/FunctionModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/FunctionModel.java new file mode 100644 index 0000000..b810c25 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/FunctionModel.java @@ -0,0 +1,10 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +@Data +public class FunctionModel { + private String code; + private String name; + private String params; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExpressionRecordRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExpressionRecordRepository.java new file mode 100644 index 0000000..07a2034 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExpressionRecordRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.ExpressionRecord; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ExpressionRecordRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml index 778bd55..09852b2 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml @@ -1,7 +1,7 @@ - - - - + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 3217940..de9a06f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -60,6 +60,7 @@ public class ApsEnumUtil { PRODUCT("PRODUCT", "成品"), HALF_PRODUCT("HALF_PRODUCT", "半成品"), RAW_MATERIAL("RAW_MATERIAL", "原材料"), + INNER_PRODUCT("INNER_PRODUCT", "中间品"), VIRTUAL("VIRTUAL", "虚拟件"); private String value; @@ -978,7 +979,7 @@ public class ApsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_LINK_TYPE { - CSV("CSV", "csv文件"), + EXCEL("EXCEL", "EXCEL文件"), MYSQL("MYSQL", "MySql"), ORACLE("ORACLE", "Oracle"), SQLSERVER("SQLSERVER", "SqlServer"); From a5793589686613ffe0430668596f844eae607e50 Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 3 Dec 2019 16:50:13 +0800 Subject: [PATCH 26/31] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1257?= =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E6=97=B6=E9=97=B4=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 8 ++++++++ .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 5bfb46b..cef7003 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -179,7 +179,7 @@ public class MesPcnEnumUtil { } /** - * pcn 是否是关键件 + * MesProdBindRecord 是否是关键件 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_IS_BIND_KEY { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 9a81548..02de63d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -129,6 +129,14 @@ public class MesProduceSn extends BaseBean { @ApiParam("返回信息") private String resultMsg; + @Transient + @ApiParam("下线开始时间") + private String outWorkCenterStartTime; + + @Transient + @ApiParam("下线结束时间") + private String outWorkCenterEndTime; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 6810a1d..9f115b3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -1876,6 +1876,10 @@ public class MesHqlPack { mesProduceSn.getCreateDateTimeStart(), mesProduceSn.getCreateDateTimeEnd(), "createDatetime", packBean, true); + DdlPreparedPack.timeBuilder( + mesProduceSn.getOutWorkCenterStartTime(), + mesProduceSn.getOutWorkCenterEndTime(), + "outWorkCenterTime", packBean, true); return packBean; } From d835ef1bb57372de5b21c0c773a06e35254a6f9e Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 3 Dec 2019 17:40:58 +0800 Subject: [PATCH 27/31] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1273?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E6=B5=8B=E6=A0=87=E5=87=86=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=A3=80=E6=B5=8B=E9=A1=B9=E7=B1=BB=E5=9E=8B=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 cf2bec1..994cf63 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 @@ -161,7 +161,8 @@ public class MesEnumUtil { DEFECT("DEFECT", "缺陷"), DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), REPAIR("REPAIR", "处理措施"), - SCRAP("SCRAP", "报废原因"); + SCRAP("SCRAP", "报废原因"), + QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"); private String value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index 2ef1cb0..60bea0a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -60,4 +60,8 @@ public class MesQcCheckStandard extends BaseBean { @ApiParam("频率") private String checkFrequency; + @Column(name = "CHECK_ITEM_TYPE") + @ApiParam("检测项类型") + private String checkItemType; + } From 4025a0963b1d28724785b8f72e160af9c8344fdd Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 3 Dec 2019 17:51:13 +0800 Subject: [PATCH 28/31] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1273?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E6=B5=8B=E5=A2=9E=E5=8A=A0=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E9=A1=B9=E7=B1=BB=E5=9E=8B1=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java index 48a1c26..5bc5ca1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java @@ -73,10 +73,14 @@ public class MesQcCheckStandard extends BaseBean { @ApiParam("检测值") private String checkValue; + @Column(name = "CHECK_ITEM_TYPE") + @ApiParam("检测项类型") + private String checkItemType; + public MesQcCheckStandard() { } - public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName) { + public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) { this.partNo = partNo; this.workCenterCode = workCenterCode; this.workCellCode = workCellCode; @@ -86,5 +90,6 @@ public class MesQcCheckStandard extends BaseBean { this.checkGuide = checkGuide; this.checkFrequency = checkFrequency; this.partName = partName; + this.checkItemType = checkItemType; } } From 5b7f268b916115ed5dbfc65a786d0f4d831a3437 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 3 Dec 2019 18:17:44 +0800 Subject: [PATCH 29/31] =?UTF-8?q?1274=20=E4=BF=AE=E6=94=B9=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=99=AE=E9=81=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/mes/StationRequestBean.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java index 0cfa2c7..2c1d0f7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java @@ -76,4 +76,26 @@ public class StationRequestBean implements Serializable { @ApiParam("工步列表") private List stepList; + @Override + public String toString() { + return "StationRequestBean{" + + "scanInfo='" + scanInfo + '\'' + + ", serialNumber='" + serialNumber + '\'' + + ", partNo='" + partNo + '\'' + + ", organizeCode='" + organizeCode + '\'' + + ", organizeName='" + organizeName + '\'' + + ", workCenterCode='" + workCenterCode + '\'' + + ", workCellCode='" + workCellCode + '\'' + + ", routeCode='" + routeCode + '\'' + + ", processCode='" + processCode + '\'' + + ", clientInfo='" + clientInfo + '\'' + + ", userInfo='" + userInfo + '\'' + + ", buttonCode='" + buttonCode + '\'' + + ", stepCode='" + stepCode + '\'' + + ", busiType='" + busiType + '\'' + + ", workOrderNo='" + workOrderNo + '\'' + + ", tray='" + tray + '\'' + + ", finishCount=" + finishCount + + '}'; + } } From 91730dd195dcffe1b9cc7871c429926d5648a39f Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 3 Dec 2019 18:28:57 +0800 Subject: [PATCH 30/31] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1277?= =?UTF-8?q?=EF=BC=8C=E5=85=B3=E9=97=AD=EF=BC=8C=E6=9A=82=E5=81=9C=EF=BC=8C?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=B7=A5=E5=8D=95=20=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=81=9C=E7=BA=BF=EF=BC=8C=E5=81=9A=E5=88=B0=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=8F=AF=E9=85=8D=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 7 +-- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 41 ++++++++++++++++- .../estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java | 50 ++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesEventAction.java | 52 +++++++++++++++++++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java | 53 ++++++++++++++++++++++ .../pojo/mes/pcn/model/ActionRequestBean.java | 38 ++++++++++++++++ .../i3plus/pojo/mes/pcn/model/RequestModel.java | 6 +++ .../mes/pcn/repository/MesEventRepository.java | 17 +++++++ .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 7 +++ 9 files changed, 266 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.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 994cf63..18c9e29 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 @@ -1332,7 +1332,8 @@ public class MesEnumUtil { MES_STATION_BOM(210, "工位BOM表"), MES_DATA_OBJECT(220, "数据对象"), MES_OBJECT_CFG(230, "对象结构"), - MES_WC_CHECK(240, "开线检查"); + MES_WC_CHECK(240, "开线检查"), + MES_QC_CHECK_STANDARD(250, "质量检测标准"); private int value; private String description; @@ -1490,8 +1491,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_STATION_BOM_IS_REPEAT { - REPEATABLE(1, "可重复"), - NOT_REPEAT(2, "不可重复"); + REPEATABLE(1, "是"), + NOT_REPEAT(2, "否"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index cef7003..2669422 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -12,6 +12,43 @@ import org.apache.commons.lang3.StringUtils; **/ public class MesPcnEnumUtil { + /** + * MesMethod实体对应的methodType值 + * 10. + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum METHOD_TYPE { + + EXEC(10, "执行方法"), + COMPLETE(20, "完成方法"); + + private int value; + private String description; + + METHOD_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + /** * mes 工位Bom 是否可重复 @@ -19,8 +56,8 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_STATION_BOM_IS_REPEAT { - REPEATABLE(1, "可重复"), - NOT_REPEAT(2, "不可重复"); + REPEATABLE(1, "是"), + NOT_REPEAT(2, "否"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java new file mode 100644 index 0000000..951539b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :mes系统业务事件 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EVENT") +@Api("系统业务事件") +public class MesEvent extends BaseBean { + @Column(name = "EVENT_CODE") + @ApiParam("事件代码") + private String eventCode; + + @Column(name = "EVENT_NAME") + @ApiParam("事件名称") + private String eventName; + + @Column(name = "EVENT_TYPE") + @ApiParam("事件类型") + private Integer eventType; + + @Column(name = "BUTTON_CODE") + @ApiParam("按钮代码") + private String buttonCode; + + public int getEventTypeVal() { + return this.eventType == null ? 0 : this.eventType; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java new file mode 100644 index 0000000..fe29e51 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :mes系统业务事件动作 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EVENT_ACTION") +@Api("系统业务事件动作") +public class MesEventAction extends BaseBean { + @Column(name = "EVENT_CODE") + @ApiParam("事件代码") + private String eventCode; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "SEQ") + @ApiParam("序号") + private Integer seq; + + public int getSeqVal() { + return this.seq == null ? 0 : this.seq; + } + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java new file mode 100644 index 0000000..0316985 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :mes系统业务方法 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_METHOD") +@Api("系统业务方法") +public class MesMethod extends BaseBean { + @Column(name = "METHOD_CODE") + @ApiParam("方法代码") + private String methodCode; + + @Column(name = "METHOD_NAME") + @ApiParam("方法名称") + private String methodName; + + @Column(name = "CALL_CLASS") + @ApiParam("具体实现类") + private String callClass; + + /** + * 10-执行方法（不需要返回值），20-完成方法（返回ResultBean） + */ + @Column(name = "METHOD_TYPE") + @ApiParam("方法类型") + private Integer methodType; + + public int getMethodTypeVal() { + return this.methodType == null ? 0 : this.methodType; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java new file mode 100644 index 0000000..3306bbf --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description : 动作请求参数 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +public class ActionRequestBean implements Serializable { + + @ApiParam("事件代码") + @Deprecated + public String eventCode; + + @ApiParam("按钮代码") + public String buttonCode; + + @ApiParam("单个结果") + public Obj resultObject; + + @ApiParam("List请求集") + public List resultList; + + @ApiParam("Map请求集") + public Map resultMap; + + @ApiParam("目的状态") + private Integer destStatus; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java index 45bf859..231b12c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java @@ -35,6 +35,8 @@ public class RequestModel { private List orderNoList;//工单编号 + private ActionRequestBean actionRequestBean;//工单状态 + public RequestModel(List queueOrderList, Double currentSeq, Double nextSeq) { this.queueOrderList = queueOrderList; this.currentSeq = currentSeq; @@ -111,6 +113,10 @@ public class RequestModel { return orderNoList; } + public void setActionRequestBean(ActionRequestBean actionRequestBean) { this.actionRequestBean = actionRequestBean; } + + public ActionRequestBean getActionRequestBean() { return actionRequestBean; } + public Double getCurrentSeq() { return currentSeq == null ? 0.0d : currentSeq; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java new file mode 100644 index 0000000..cfa330f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEvent; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEventRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index 64e9d61..55f69b2 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -371,4 +371,11 @@ public class MesHqlPack { } return packBean; } + + public static DdlPackBean getMesEventByButtonCode(String buttonCode, String org) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(buttonCode, "buttonCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + return packBean; + } } From a4d38de535725a63698c35c72274d38b7d852438 Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 4 Dec 2019 09:19:56 +0800 Subject: [PATCH 31/31] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1272?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/bean/MesProduceCtgyPicture.java | 12 +++ .../i3plus/pojo/mes/model/ProdBindRecordModel.java | 106 +++++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdBindRecordModel.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java index db5ccea..b582621 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java @@ -55,4 +55,16 @@ public class MesProduceCtgyPicture extends BaseBean { @Column(name = "FILE_TYPE_NAME") @ApiParam("FILE_TYPE_NAME") private String fileTypeName; + + @Column(name = "SOP_NAME") + @ApiParam("SOP名称") + private String sopName; + + @Column(name = "GROUP_NAME") + @ApiParam("GROUP_NAME") + private String groupName; + + @Column(name = "SYNC_TAG") + @ApiParam("SYNC_TAG") + private Integer syncTag = 0; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdBindRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdBindRecordModel.java new file mode 100644 index 0000000..cc2e482 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdBindRecordModel.java @@ -0,0 +1,106 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\12\3 18:59 + * @Modify: + **/ +@Data +public class ProdBindRecordModel implements Serializable { + + private Long id; + private String createUser; + private String createDatetime; + private String modifyUser; + private String modifyDatetime; + + @ApiParam(value = "产品条码") + private String serialNumber; + + @ApiParam("产品条码零件号") + private String partNo; + + @ApiParam("产品条码零件名称") + private String partName; + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam(value = "工作中心") + private String workCenterCode; + + @ApiParam(value = "工作单元") + private String workCellCode; + + @ApiParam(value = "工步代码") + private String stepCode; + + @ApiParam("原材料零件号") + private String itemPartNo; + + @ApiParam("原材料零件名称") + private String itemPartName; + + @ApiParam("原材料条码") + private String kpSn; + + @ApiParam(value = "原材料数量", example = "0") + private Double kpQty; + + @ApiParam("供应商") + private String supplierCode; + + @ApiParam + private String lotNo; + + @ApiParam + private Integer isFeed; + + @ApiParam("版本") + private String version; + + @ApiParam(value = "结果") + private String result; + + @ApiParam(value = "是否绑定关键件") + private Integer isBindKey; + + @ApiParam(value = "动作类型") + private String actionType; + + public ProdBindRecordModel() { + + } + + public ProdBindRecordModel(Long id, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber, String partNo, String partName, String workOrderNo, String workCenterCode, String workCellCode, String stepCode, String itemPartNo, String itemPartName, String kpSn, Double kpQty, String supplierCode, String lotNo, Integer isFeed, String version, String result, Integer isBindKey, String actionType) { + this.id = id; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partName = partName; + this.workOrderNo = workOrderNo; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.stepCode = stepCode; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.kpSn = kpSn; + this.kpQty = kpQty; + this.supplierCode = supplierCode; + this.lotNo = lotNo; + this.isFeed = isFeed; + this.version = version; + this.result = result; + this.isBindKey = isBindKey; + this.actionType = actionType; + } +}