From b5bbf7aefb1870303faec6207353d5b986731f1e Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 12 May 2021 09:31:45 +0800 Subject: [PATCH 01/45] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AD=89=E5=BE=85?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=AF=84=E4=BC=B0=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 1 + 2 files changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java index 6a96b97..294ec49 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java @@ -49,6 +49,10 @@ public class HeuristicRule extends BaseRule { @FieldAnnotation(defaultValue = "true") private Boolean insertIdle; + @Column(name="WAITING_TIME") + @ApiParam(value ="最大等待时间") + private String waitingTime; + @Column(name="BATCH_PERIOD") @ApiParam(value ="组炉区间") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) 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 0d7160b..f8a71a0 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 @@ -444,6 +444,7 @@ public class ApsEnumUtil { PRODUCE_TIME("PRODUCE_TIME", "生产时间"), POST_SET_TIME("POST_SET_TIME", "后设置时间"), WORK_WAIT_TIME("WORK_WAIT_TIME", "工作等待时间"), + WAIT_TIME_LIMIT("WAIT_TIME_LIMIT", "等待时间限制"), RES_BALANCE("RES_BALANCE", "资源均衡度"), SAME_MATERIAL("SAME_MATERIAL", "相同物料"), SAME_ORDER("SAME_ORDER", "相同订单"), From a001dae57549789eae2d6134b7570b8cc9bb1ad5 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 14 May 2021 16:14:25 +0800 Subject: [PATCH 02/45] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 3 ++- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-screen/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 5 ++++- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 19 files changed, 23 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 0272934..77a43d2 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.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b948580..096b9c8 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.0.1 ../../pom.xml 4.0.0 @@ -13,6 +13,7 @@ i3plus-pojo-form jar + diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index cf1a42a..80590a1 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.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index c338f71..11ad913 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 7637865..e3f1dc9 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.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d98b7d8..46db302 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../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..07a7f33 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.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index a758a6a..28577a8 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.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 4988104..3199116 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.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index dba12cc..7535ff6 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.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 81670b2..1d2c5be 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.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26a7311..699688c 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.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-screen/pom.xml b/modules/i3plus-pojo-screen/pom.xml index 071fe58..4b20d00 100644 --- a/modules/i3plus-pojo-screen/pom.xml +++ b/modules/i3plus-pojo-screen/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index eaf2544..616952a 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.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 0f615b6..7e5e95d 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.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 183a03c..d96d6ec 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.0.1 ../../pom.xml 4.0.0 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 73b4351..c7c1253 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 @@ -54,7 +54,6 @@ import java.util.List; @Inheritance(strategy = InheritanceType.JOINED) @Api(value = "库存条码信息", description = "库存条码信息") public class WmsStockSn extends BaseBean { - private static final long serialVersionUID = 4869307400585363697L; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") @@ -960,6 +959,10 @@ public class WmsStockSn extends BaseBean { this.zoneNo = zoneNo; this.vendorNo = vendorNo; } + + + + public WmsStockSn(String partNo, Double qty) { this.partNo = partNo; this.qty = qty; diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 0fea52b..8f94fc0 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.0.1 ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f8d2d25..a38361a 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0.0.1 modules/i3plus-pojo-base From 1696ba05e30f75b15cd5272c7ca155195ccb9dd5 Mon Sep 17 00:00:00 2001 From: Xiao-yin0517 Date: Fri, 21 May 2021 15:30:40 +0800 Subject: [PATCH 03/45] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java | 3 +-- .../java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java index b549407..a76974a 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java @@ -34,9 +34,8 @@ public abstract class BaseMdmBean extends BaseBean { public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); @Column(name = "MDM_VERSION") - @ApiParam("mdm数据版本") + @ApiParam("当前版本") @JsonSerialize(using = ToStringSerializer.class) - @AnnoOutputColumn(hidden = true) private Long mdmVersion; public long getMdmVersionVal() { diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java index a35e1f0..2b968fb 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java @@ -24,7 +24,7 @@ import javax.persistence.Transient; @ApiModel("MDM业务基础bean") public class BaseMdmBusiExtdBean extends BaseMdmBean { - private static final long serialVersionUID = 4267453020130810967L; + private static final long serialVersionUID = 4267453020130811234L; @Transient @ApiParam("是否主数据") diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java index 874d299..91cad4f 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java @@ -21,7 +21,7 @@ public class MdmHqlPack { public static DdlPackBean getMdmPackBean(BaseMdmBean mdmBean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", ddlPackBean); + DdlPreparedPack.getNumEqualPack(mdmBean.getIsMdmPublished(), "isMdmPublished", ddlPackBean); DdlPreparedPack.getNumEqualPack(mdmBean.isValid, "isValid", ddlPackBean); return ddlPackBean; } From 7a39ef9a355f5025a71a9db8d9f9caa3d854b593 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 24 May 2021 17:26:49 +0800 Subject: [PATCH 04/45] sonar --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 37d8ae0..a232d36 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -7,7 +7,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0.0.1 # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 0453e33e8f70b178d0122a569bc871097790dec6 Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Tue, 25 May 2021 16:07:47 +0800 Subject: [PATCH 05/45] =?UTF-8?q?=E5=92=8C=E5=A4=96=E9=83=A8=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java index 0fe465f..b5c872f 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java @@ -19,7 +19,7 @@ import java.util.List; **/ @Data @ApiModel("数据中心同步数据") -public class MdmSyncData implements Serializable { +public class MdmSyncData implements Serializable { private static final long serialVersionUID = -1642626000860074060L; @@ -93,4 +93,8 @@ public class MdmSyncData implements Serializable { @ApiParam("同步失败信息") private String syncFailMessage; + + @ApiParam("同步数据值") + private List syncData; + } From 2d2faaaa4c955e66051159060fe5586670595d9c Mon Sep 17 00:00:00 2001 From: Xiao-yin0517 Date: Tue, 25 May 2021 16:17:20 +0800 Subject: [PATCH 06/45] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java index a76974a..c24359e 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java @@ -36,7 +36,7 @@ public abstract class BaseMdmBean extends BaseBean { @Column(name = "MDM_VERSION") @ApiParam("当前版本") @JsonSerialize(using = ToStringSerializer.class) - private Long mdmVersion; + public Long mdmVersion; public long getMdmVersionVal() { return mdmVersion == null ? 0 : mdmVersion; From 3a3bdc664acc209b8c51b4e4ec25e0131be1dff7 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 26 May 2021 11:12:18 +0800 Subject: [PATCH 07/45] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=B7=A6=E8=BE=B9=E7=95=8C=E8=AE=A1=E7=AE=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 c7693dd..dcc126a 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 @@ -18,6 +18,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.util.Date; import java.util.List; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java index 6c4e2ba..f7736e5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java @@ -2,6 +2,6 @@ package cn.estsh.i3plus.pojo.aps.tool; public class APSDoubleTool { public static boolean isZero(Double value) { - return (value == null) || (value > -0.000001 && value < 0.000001); + return (value == null) || (value > -0.0000001 && value < 0.0000001); } } From 3d66e54ceafbf96682c754ec08bb84a68668fd4f Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 26 May 2021 16:03:11 +0800 Subject: [PATCH 08/45] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E4=B8=AD=E9=97=B4=E8=AE=A1=E7=AE=97=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java | 1 + .../src/main/resources/relations/InterMediateResult.xml | 2 -- modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml | 2 ++ 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java index 8368fd4..87d59be 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java @@ -33,7 +33,7 @@ public class InterMediateResult extends BaseAPS { private static final long serialVersionUID = -1869359887027950540L; @Column(name="WORK_ID") - @ApiParam(value ="工作") + @ApiParam(value ="工作编码") @FieldAnnotation(relation = "Work") private Long workId; @@ -63,5 +63,5 @@ public class InterMediateResult extends BaseAPS { } @JsonBackReference - public List getDetails() { return BeanRelation.get(this, EInterMediateResult.Details); } + public List getDetails() { return BeanRelation.list(this, EInterMediateResult.Details); } } 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 dcc126a..a5618c5 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 @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWork; +import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan; import cn.estsh.i3plus.pojo.aps.tool.APSDoubleTool; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; @@ -265,4 +266,7 @@ public class Work extends BaseAPS { this.originWorkId = work != null ? work.getId() : 0; BeanRelation.set(this, EWork.OriginWork, work); } + + @JsonBackReference + public List getEvaluateResult() { return BeanRelation.list(this, EWork.EvaluateResult); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index decabfa..006a0e1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -19,6 +19,7 @@ import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; import java.util.Date; +import java.util.List; /** * @Description :工作计划 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java index 70d265e..25c90c3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java @@ -15,4 +15,5 @@ public enum EWork { SpecifyResource, // 指定资源 DynSplitWorks, // 动态拆分后的工作 OriginWork, // 动态拆分前的工作 + EvaluateResult, // 资源评估结果 } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml index 6b7a99d..87c0210 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml @@ -1,7 +1,5 @@ - - diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index da892ce..5663143 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -22,4 +22,6 @@ + + \ No newline at end of file From 4890eb87a3bb2c8d17109c829aa1e769f5d3f9cc Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Wed, 26 May 2021 20:53:57 +0800 Subject: [PATCH 09/45] =?UTF-8?q?Mdm=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mdm/bean/base/MdmField.java | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java new file mode 100644 index 0000000..95b3c94 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mdm.bean.base; + +import io.swagger.annotations.ApiModel; +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 : pantianhu + * @CreateDate : 2021-05-26 17:04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MDM_FIELD") +@ApiModel("表字段") +public class MdmField extends BaseMdmBean { + + @Column(name="TABLE_NAME") + @ApiParam(value ="表名") + private String tableName; + + @Column(name="FIELD_NAME") + @ApiParam(value ="字段名称") + private String fieldName; + + @Column(name="FIELD_DESCRIPTION") + @ApiParam(value ="字段描述") + private String fieldDescription; + + @Column(name="IS_SELECT") + @ApiParam(value ="是否选中") + private Integer isSelect; +} From 46debfb7fbeff257c42e1616adc0b0c3575005f0 Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Wed, 26 May 2021 21:01:31 +0800 Subject: [PATCH 10/45] =?UTF-8?q?Mdm=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java | 7 +++++++ .../java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java index b5c872f..0deccf1 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java @@ -3,10 +3,17 @@ package cn.estsh.i3plus.pojo.mdm.bean.base; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; +import org.hibernate.annotations.GenericGenerator; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; import java.io.Serializable; import java.util.List; diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java index 8a05c07..0d20273 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java @@ -46,4 +46,8 @@ public class MdmExternalApp extends BaseBean { @ApiParam("回调地址") private String callbackUrl; + @Column(name = "OPERATE_TYPE") + @ApiParam("操作类型") + private String operateType; + } From c4660251cde90266bb611b65db16cd4e42140de5 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 27 May 2021 13:36:46 +0800 Subject: [PATCH 11/45] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E4=B8=AD=E9=97=B4=E8=AE=A1=E7=AE=97=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java | 5 +++++ .../i3plus/pojo/aps/model/RuleDetailModel.java | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java index 28e424e..eb2a239 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java @@ -1,9 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.ERuleGroup; +import cn.estsh.i3plus.pojo.aps.model.RuleDetailModel; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -44,6 +46,9 @@ public class RuleGroup extends BaseAPS { @ApiParam(value ="当前执行的规则名称") private transient String curDetailName; + @FieldAnnotation(property = false) + private transient RuleDetailModel model; + @JsonBackReference public List getDetails() { return BeanRelation.list(this, ERuleGroup.Details); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java new file mode 100644 index 0000000..0846ded --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class RuleDetailModel { + @ApiParam(value ="当前执行进度") + private Integer curProcess = 0; + + @ApiParam(value ="总行数") + private Integer totalSize = 0; + + @ApiParam(value ="进度消息") + private String processMsg = ""; + + private Boolean finish = false; + + @ApiParam(value ="异常消息") + private String exception = ""; +} From 8abe9cb030b39d37fc6e0447271b087b9e7e8867 Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Thu, 27 May 2021 17:47:54 +0800 Subject: [PATCH 12/45] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mdm/repository/master/MdmfieldRepository.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmfieldRepository.java diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmfieldRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmfieldRepository.java new file mode 100644 index 0000000..3ed4cc5 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmfieldRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mdm.repository.master; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mdm.bean.base.MdmField; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : pantianhu + * @CreateDate : 2021-05-26 20:33 + * @Modify: + **/ +@Repository +public interface MdmfieldRepository extends BaseRepository { +} From c4b82c48916022f50ff25762a796687f09f9487d Mon Sep 17 00:00:00 2001 From: Xiao-yin0517 Date: Thu, 27 May 2021 18:02:25 +0800 Subject: [PATCH 13/45] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mdm/bean/base/MdmSyncData.java | 5 +- .../pojo/mdm/bean/master/MdmSyncDataThrough.java | 112 +++++++++++++++++++++ .../master/MdmSyncDataThroughRepository.java | 17 ++++ 3 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmSyncDataThrough.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmSyncDataThroughRepository.java diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java index 0fe465f..39d545c 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java @@ -19,7 +19,7 @@ import java.util.List; **/ @Data @ApiModel("数据中心同步数据") -public class MdmSyncData implements Serializable { +public class MdmSyncData implements Serializable { private static final long serialVersionUID = -1642626000860074060L; @@ -93,4 +93,7 @@ public class MdmSyncData implements Serializable { @ApiParam("同步失败信息") private String syncFailMessage; + + @ApiParam("同步数据值") + private List syncData; } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmSyncDataThrough.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmSyncDataThrough.java new file mode 100644 index 0000000..fd725d5 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmSyncDataThrough.java @@ -0,0 +1,112 @@ +package cn.estsh.i3plus.pojo.mdm.bean.master; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description : 主数据齿轮 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-12 18:09 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MDM_SYNC_DATA_THROUGH") +@ApiModel("处理以通过中心同步数据") +public class MdmSyncDataThrough extends BaseMdmBean { + + private static final long serialVersionUID = -1642626000861174060L; + + @ApiParam("同步数据类型") + @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_SYNC_TYPE.class) + private Integer syncType; + + public int getSyncTypeVal() { + return syncType == null ? MdmEnumUtil.MDM_SYNC_TYPE.INSERT.getValue() : syncType; + } + + public String getSyncTypeTxt() { + return syncType == null ? "无" : MdmEnumUtil.MDM_SYNC_TYPE.valueOfDescription(syncType); + } + + @ApiParam("同步模块") + @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_SYNC_APP_TYPE.class) + private Integer syncAppType; + + public int getSyncAppTypeVal() { + return syncAppType == null ? MdmEnumUtil.MDM_SYNC_APP_TYPE.INTERNAL.getValue() : syncAppType; + } + + public String getSyncAppTypeTxt() { + return syncAppType == null ? "无" : MdmEnumUtil.MDM_SYNC_APP_TYPE.valueOfDescription(syncAppType); + } + + @ApiParam("同步模块") + private Long syncSoftType; + + @ApiParam("同步模块名称") + private String syncSoftTypeName; + + @ApiParam("是否是主数据") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + private Integer isMasterData; + + public int getIsMasterDataVal() { + return isMasterData == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isMasterData; + } + + public String getIsMasterDataTxt() { + return isMasterData == null ? "无" : CommonEnumUtil.TRUE_OR_FALSE.valueOfDescription(isMasterData); + } + + @ApiParam("同步数据class") + private String syncDataClass; + + public String getSyncDataClassSimpleName() { + if (syncDataClass == null) { + return null; + } + + return syncDataClass.trim().substring(syncDataClass.trim().lastIndexOf(".") + 1); + } + + @ApiParam("同步数据id") + @Transient + @AnnoOutputColumn(hidden = true) + private List syncDataId; + + @ApiParam("同步数据用户名") + private String syncDateUserName; + + @ApiParam("同步时间") + private String syncDateTime; + + @ApiParam("同步失败键") + private String syncFailKey; + + @ApiParam("同步失败时间") + private String syncFailDateTime; + + @ApiParam("同步失败信息") + private String syncFailMessage; + + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmSyncDataThroughRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmSyncDataThroughRepository.java new file mode 100644 index 0000000..1189a8d --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmSyncDataThroughRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mdm.repository.master; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; +import cn.estsh.i3plus.pojo.mdm.bean.master.MdmSyncDataThrough; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-15 16:26 + * @Modify: + **/ +@Repository +public interface MdmSyncDataThroughRepository extends BaseRepository { +} From e66c99e5096e3f36120a2d1eb9c5a4df25b7dc56 Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Thu, 27 May 2021 18:14:10 +0800 Subject: [PATCH 14/45] =?UTF-8?q?Mdm=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java index 0deccf1..06f9f58 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java @@ -3,17 +3,9 @@ package cn.estsh.i3plus.pojo.mdm.bean.base; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; -import org.hibernate.annotations.GenericGenerator; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; import java.io.Serializable; import java.util.List; From dfa897720ed7ed462a56d810b7c24b079d48dfd9 Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Thu, 27 May 2021 18:18:04 +0800 Subject: [PATCH 15/45] =?UTF-8?q?Mdm=E5=A2=9E=E5=8A=A0repo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mdm/repository/master/MdmfieldRepository.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmfieldRepository.java diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmfieldRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmfieldRepository.java new file mode 100644 index 0000000..3ed4cc5 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmfieldRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mdm.repository.master; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mdm.bean.base.MdmField; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : pantianhu + * @CreateDate : 2021-05-26 20:33 + * @Modify: + **/ +@Repository +public interface MdmfieldRepository extends BaseRepository { +} From a47b8d17856221b54b94134f47fe4d2109155dda Mon Sep 17 00:00:00 2001 From: Xiao-yin0517 Date: Fri, 28 May 2021 19:04:53 +0800 Subject: [PATCH 16/45] =?UTF-8?q?syncDataId=E6=94=B9=E4=B8=BAstring?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmSyncDataThrough.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmSyncDataThrough.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmSyncDataThrough.java index fd725d5..a1fd2c2 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmSyncDataThrough.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmSyncDataThrough.java @@ -89,9 +89,8 @@ public class MdmSyncDataThrough extends BaseMdmBean { } @ApiParam("同步数据id") - @Transient @AnnoOutputColumn(hidden = true) - private List syncDataId; + private String syncDataId; @ApiParam("同步数据用户名") private String syncDateUserName; From 8b9883d2f761d62c008cf538e11aedf4af63bdf9 Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Mon, 31 May 2021 18:15:08 +0800 Subject: [PATCH 17/45] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=92=8C=E5=AD=97=E6=AE=B5=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mdm/bean/base/MdmField.java | 8 +++++ .../estsh/i3plus/pojo/mdm/bean/base/MdmMail.java | 41 ++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmMail.java diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java index 95b3c94..545ee73 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java @@ -39,6 +39,14 @@ public class MdmField extends BaseMdmBean { @ApiParam(value ="字段描述") private String fieldDescription; + @Column(name="SERVICE_NAME") + @ApiParam(value ="服务名称") + private String serviceName; + + @Column(name="SERVICE_CODE") + @ApiParam(value ="服务代码") + private String serviceCode; + @Column(name="IS_SELECT") @ApiParam(value ="是否选中") private Integer isSelect; diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmMail.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmMail.java new file mode 100644 index 0000000..24b1806 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmMail.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mdm.bean.base; + +import io.swagger.annotations.ApiModel; +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 : pantianhu + * @CreateDate : 2021-05-29 15:17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MDM_MAIL") +@ApiModel("邮件配置") +public class MdmMail extends BaseMdmBean{ + @Column(name = "MESSAGE_SENDER_NAME_RDD") + @ApiParam(value = "发送者名称") + private String messageSenderNameRdd; + + @Column(name = "MESSAGE_RECEIVERS_NAME_RDD") + @ApiParam(value = "接受者名称") + private String messageReceiversNameRdd; + + @Column(name = "IS_SEND") + @ApiParam(value = "是否发送") + private Integer isSend; + +} From b9bae06c0cf7503d270446ffb0f62bc995b94f91 Mon Sep 17 00:00:00 2001 From: Xiao-yin0517 Date: Thu, 3 Jun 2021 13:51:16 +0800 Subject: [PATCH 18/45] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mdm/bean/base/MdmField.java | 4 +++ .../pojo/mdm/bean/busi/MdmDataSubscribe.java | 30 +++++++++++++++++++--- .../i3plus/pojo/mdm/bean/busi/MdmExternalApp.java | 15 ++++++++--- .../repository/busi/MdmExternalAppRepository.java | 6 +++++ .../mdm/repository/master/MdmMailRepository.java | 17 ++++++++++++ 5 files changed, 65 insertions(+), 7 deletions(-) create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmMailRepository.java diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java index 545ee73..443e6b5 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java @@ -31,6 +31,10 @@ public class MdmField extends BaseMdmBean { @ApiParam(value ="表名") private String tableName; + @Column(name="TABLE_DESCRIPTION") + @ApiParam(value ="表描述") + private String tableDescription; + @Column(name="FIELD_NAME") @ApiParam(value ="字段名称") private String fieldName; diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java index b9cb717..e3eee60 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java @@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; @@ -41,6 +38,31 @@ public class MdmDataSubscribe extends BaseBean { @ApiParam("主数据名称") private String mdmName; + + @Column(name = "MDM_SUBSCRIBE") + @ApiParam("订阅对象") + private String mdmSubscribe; + + @Column(name = "MDM_SUBSCRIBE_TYPE") + @ApiParam("订阅类型") + private Integer mdmSubscribeType; + + @Column(name = "MDM_SUBSCRIBE_PERMISSIONS") + @ApiParam("订阅权限") + private String mdmSubscribePermissions; + + @Column(name = "MDM_SUBSCRIBE_FIELD") + @ApiParam("订阅字段") + @Lob + private String mdmSubscribeField; + + @Transient + @ApiParam("订阅字段保存List") + private List mdmSubscribeFields; + + + + @Column(name = "INTERNAL_APP_NUM") @ApiParam("内部订阅应用数量") private Integer internalAppNum; diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java index 0d20273..5da00ee 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java @@ -31,21 +31,30 @@ public class MdmExternalApp extends BaseBean { private static final long serialVersionUID = -5344361274535836969L; @Column(name = "APP_NAME") - @ApiParam("应用名称") + @ApiParam("服务名称") private String appName; @Column(name = "APP_CODE") - @ApiParam("应用代码") + @ApiParam("服务代码") private String appCode; @Column(name = "CALL_TOKEN") @ApiParam("调用令牌") private String callToken; + @Column(name = "APP_BRIEF") + @ApiParam("服务简介") + private String appBrief; + @Column(name = "CALLBACK_URL") - @ApiParam("回调地址") + @ApiParam("回调接口") private String callbackUrl; + + @Column(name = "EMAIL") + @ApiParam("通知邮箱") + private String email; + @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private String operateType; diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java index 7d89f14..264f9ca 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java @@ -1,9 +1,14 @@ package cn.estsh.i3plus.pojo.mdm.repository.busi; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.mdm.bean.busi.MdmExternalApp; import org.springframework.stereotype.Repository; +import java.util.List; +import java.util.Set; + /** * @Description : * @Reference : @@ -13,4 +18,5 @@ import org.springframework.stereotype.Repository; **/ @Repository public interface MdmExternalAppRepository extends BaseRepository { + } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmMailRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmMailRepository.java new file mode 100644 index 0000000..12c5d04 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmMailRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mdm.repository.master; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mdm.bean.base.MdmMail; +import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-15 16:26 + * @Modify: + **/ +@Repository +public interface MdmMailRepository extends BaseRepository { +} From 6e6b0a7c1144416ef04c4274235d3a40e4e0bd90 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 4 Jun 2021 00:18:38 +0800 Subject: [PATCH 19/45] =?UTF-8?q?=E6=8E=92=E7=A8=8B=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 6 ++++++ .../main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 4 +++- 4 files changed, 14 insertions(+), 1 deletion(-) 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 3a8b8ff..b22eb80 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 @@ -109,6 +109,8 @@ public class BaseOrder extends BaseAPS { @FieldAnnotation(modify = false) private Integer delayTime; + private transient Date lastBegin; + @JsonBackReference public List getWorks() { return BeanRelation.list(this, EBaseOrder.Works); 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 a5618c5..866ebe5 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 @@ -166,6 +166,9 @@ public class Work extends BaseAPS { @ApiParam(value ="动态拆分工作ID") private Long originWorkId; + @ApiParam(value ="工作排序顺序") + private Integer workSeqNumber; + // 排程时，找插入位置的评估值 private transient double evaluateValue = 0; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 006a0e1..4125b4d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -120,6 +120,12 @@ public class WorkPlan extends BaseAPS { @ApiParam(value ="打印时间") private Date printTime; + @ApiParam(value ="生产结束时间") + @FieldAnnotation(display = false) + @Transient + @RippleAnnotation(dependence = {"PostPlan.resProduceEnd"}, method = "calcReverse") + private Date resProduceEnd; + @Transient @FieldAnnotation(property = false) private boolean hasCominbed = false; 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 f8a71a0..ec2bba5 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 @@ -1292,7 +1292,9 @@ public class ApsEnumUtil { public enum SANLUX_OPERATION_TYPE { NORMAL("NORMAL", "正常工序"), FOUR_SULFIDATION("FOUR_SULFIDATION", "四车间硫化"), - FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间牵纱"); + FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间牵纱"), + FOUR_COATING("FOUR_COATING", "四车间覆胶"), + FOUR_WRAPPING("FOUR_WRAPPING", "四车间包布"); private String value; private String description; From a8b163261d0000ee4eb193e2adb898e9f094a00f Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 4 Jun 2021 09:49:47 +0800 Subject: [PATCH 20/45] =?UTF-8?q?mysql=20=E7=89=88=E6=9C=AC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= 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 6b0573d..06cac17 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 @@ -3321,7 +3321,8 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_PART_TYPE { RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器"), - UTENSIL(50, "器具"); + UTENSIL(50, "器具"), + TRADE_PRODUCT(60,"贸易品"); private int value; private String description; From de75b430087e6965aabec76653357d64ba1173af Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 4 Jun 2021 23:18:22 +0800 Subject: [PATCH 21/45] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 06cac17..2867507 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 @@ -1838,7 +1838,9 @@ public class WmsEnumUtil { FINISH(20, "处理中"), FAIL(30, "已完成"), CLOSE(40, "已关闭"), - CANCEL(50, "已取消"); + CANCEL(50, "已取消"), + REJECT(60, "全部退货"), + SPECIAL(70, "全部特采"); private int value; private String description; @@ -1873,7 +1875,8 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QC_ITEM_STATUS { NORMAL(10, "正常"), - CANCELLATION(20, "已处理"); + CANCELLATION(20, "已处理"), + SPECIAL(30, "部分特采"); private int value; private String description; From 778df56d2ecbed6963a05cbc6ae70829d9d34017 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 8 Jun 2021 11:11:08 +0800 Subject: [PATCH 22/45] =?UTF-8?q?16217=2020135--=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=96=99=E6=9E=B6=E9=9C=80=E8=A6=81=E8=B7=9F=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E7=BB=91=E5=AE=9A=E5=85=B3=E7=B3=BB--2021-06-08=20161?= =?UTF-8?q?62=2020135--=E8=87=AA=E5=8A=A8=E6=93=8D=E4=BD=9C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E5=8F=B7=E6=89=AB=E7=A0=81=EF=BC=88=E5=9C=A8?= =?UTF-8?q?=E6=AF=8F=E4=B8=80=E4=B8=AA=E5=B7=A5=E4=BD=8D=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E6=AD=A5=E6=89=AB=E7=A0=81=E5=B7=A5=E5=8F=B7=EF=BC=8C=E6=AF=8F?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=B8=80=E6=AC=A1=E9=9C=80=E8=A6=81=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E4=B8=80=E6=AC=A1=E5=B7=A5=E5=8F=B7=EF=BC=89--2021-06?= =?UTF-8?q?-28=2016152=2020135--=E5=BC=82=E5=B8=B8=E9=94=81=E5=AE=9A?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E9=94=81=E5=92=8C=E8=A7=A3=E9=94=81=E8=AE=B0?= =?UTF-8?q?=E5=BD=95--2021-06-25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java | 10 +++++----- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java | 6 ++++-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java | 6 ++++-- .../cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 3 +++ 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java index 70ef63e..58af48c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java @@ -4,15 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : MES_容器 @@ -40,6 +36,10 @@ public class MesContainer extends BaseBean { @ApiParam(value = "容器类型代码") private String ctCode; + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "产线代码") + private String workCenterCode; + @Column(name = "USE_STATUS") @ApiParam(value = "使用状态") private String useStatus; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index b463dcc..29b7d8d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -5,8 +5,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -77,4 +75,8 @@ public class MesPackageTravel extends BaseBean implements Serializable { @Column(name = "QR_CODE") @ApiParam("包装二维码") private String qrCode; + + @Column(name = "EMPLOYEE_NUMBER") + @ApiParam("员工编号") + private String employeeNumber; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index 4721ce4..60ff8fd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -4,8 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -162,6 +160,10 @@ public class MesProduceSnTravel extends BaseBean implements Serializable { @ApiParam("生产批次") private String lotNo; + @Column(name = "EMPLOYEE_NUMBER") + @ApiParam("员工编号") + private String employeeNumber; + @Transient @ApiParam("返回信息") private String resultMsg; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 44c290b..62bf9dd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -166,6 +166,9 @@ public class StationRequestBean implements Serializable { @ApiParam("工步弹框状态") private Boolean stepDialogStatus = false; + @ApiParam("按钮显示开关") + private Boolean buttonDisplay = true; + @ApiParam("是否按时完成") private Integer isOnTimeComplete = 1; From 470b05ebf00b0a441b282ac0519665b7f17c764e Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 8 Jun 2021 16:20:50 +0800 Subject: [PATCH 23/45] =?UTF-8?q?=E5=8C=97=E4=BA=ACptl=E4=BA=AE=E7=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/ptl/model/MgnBjAblePickModel.java | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java new file mode 100644 index 0000000..ed7aaad --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import lombok.Data; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.net.Socket; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/6/8 2:12 PM + * @Modify: + */ +@Data +public class MgnBjAblePickModel { + + private Socket socket = null; + + private String organizeCode; + private String areaNo; + private String clientInfo; + private String ip; + private Integer port; + + private Integer timeout = 3000; + private Integer sleepTime = 2000; + + private DataOutputStream bw; + private DataInputStream br; +} From e7df36d3e9a1a21eba73a7313190581666e57c86 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 9 Jun 2021 09:41:01 +0800 Subject: [PATCH 24/45] =?UTF-8?q?=E8=BF=98=E5=8E=9Fmerge=20pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-screen/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 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 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 b2dbbd1..0272934 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index a9e288f..b948580 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 17f3171..cf1a42a 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 2de88b5..c338f71 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 7f94617..d98b7d8 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 60fc467..a758a6a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index bef0b07..4988104 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 a785f21..dba12cc 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 d6d2f8e..81670b2 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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-screen/pom.xml b/modules/i3plus-pojo-screen/pom.xml index 6bef2bc..48930f8 100644 --- a/modules/i3plus-pojo-screen/pom.xml +++ b/modules/i3plus-pojo-screen/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT 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 0368700..0f615b6 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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 d221913..183a03c 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 5fcd08a..0fea52b 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f250672..f8d2d25 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 diff --git a/sonar-project.properties b/sonar-project.properties index 8c37b31..37d8ae0 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -7,7 +7,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo 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 9cfcb2a59d96bc30fd418f75e4dba6f6d4e59569 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 9 Jun 2021 11:49:09 +0800 Subject: [PATCH 25/45] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E5=A2=9E=E5=8A=A0&PO=E5=A2=9E=E5=8A=A0=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=9C=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 8 +++++--- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 323b3f8..37fc2ec 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -15,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; import java.util.List; @@ -263,7 +263,9 @@ public class WmsPOMaster extends BaseBean { @ApiParam(value = "收货日期时间") public String receiveDateTime; - + @Transient + @ApiParam("默认收货库存地") + private String erpAreaNo; 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 571116c..3da2cb3 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 @@ -236,7 +236,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCostCenter(), "costCenter", packBean); DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getThirdRemake(), "thirdRemake", packBean); - + DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getVendorNo(), "vendorNo", packBean); getStringBuilderPack(wmsDocMovementMaster, packBean); From ee42edc94c613f0595042fc830703ac5fab5f17b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 9 Jun 2021 16:14:53 +0800 Subject: [PATCH 26/45] =?UTF-8?q?=E3=80=903484=2020063-=E5=BE=85=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=8A=A5=E5=B7=A5=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?-20210610=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 37 ++++++++++++++- .../i3plus/pojo/mes/bean/MesFailureModeParts.java | 54 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesPendingReportType.java | 44 ++++++++++++++++++ .../repository/MesFailureModePartsRepository.java | 15 ++++++ .../repository/MesPendingReportTypeRepository.java | 15 ++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 17 +++++++ 6 files changed, 181 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFailureModeParts.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPendingReportType.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModePartsRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPendingReportTypeRepository.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 f4df909..8277381 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 @@ -2101,7 +2101,9 @@ public class MesEnumUtil { MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"), MES_JISA(640, "jisaExcelService", "JISA导入"), MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"), - MES_HOLIDAY_VACATION(660, "holidayVacationExcelService", "节假日导入"); + MES_HOLIDAY_VACATION(660, "holidayVacationExcelService", "节假日导入"), + MES_PENDING_REPORT_TYPE(670, "PendingReportTypeExcelService", "待处理报工类型导入"), + MES_FAILURE_MODE_PARTS(680, "FailureModePartsExcelService", "失效模式零件导入"); private int value; private String service; @@ -8432,4 +8434,37 @@ public class MesEnumUtil { return tmp; } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PENDING_REPORT_TYPE { + + IDENTIFICATION_TYPE(10, "鉴定类型"), + FAILURE_MODE(20, "失效模式"); + + private int value; + private String description; + + PENDING_REPORT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFailureModeParts.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFailureModeParts.java new file mode 100644 index 0000000..0e91071 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFailureModeParts.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_FAILURE_MODE_PARTS") +@Api("MES_失效模式零件") +public class MesFailureModeParts extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5274274774653791153L; + + @Column(name = "PATTERN_CODE") + @ApiParam("模式代码") + private String patternCode; + + @Column(name = "PATTERN_NAME") + @ApiParam("模式代码名称") + private String patternName; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("零件名称") + private String partNameRdd; + + @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("上限值") + private Double maximum = 0d; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPendingReportType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPendingReportType.java new file mode 100644 index 0000000..6557e2c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPendingReportType.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PENDING_REPORT_TYPE") +@Api("MES_待处理报工类型") +public class MesPendingReportType extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5274274774653791153L; + + @Column(name = "PATTERN_CODE") + @ApiParam("模式代码") + private String patternCode; + + @Column(name = "PATTERN_NAME") + @ApiParam("模式代码名称") + private String patternName; + + @Column(name = "REPORT_TYPE") + @ApiParam("类型") + private Integer reportType; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModePartsRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModePartsRepository.java new file mode 100644 index 0000000..db123d0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModePartsRepository.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.MesFailureModeParts; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Repository +public interface MesFailureModePartsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPendingReportTypeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPendingReportTypeRepository.java new file mode 100644 index 0000000..546c407 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPendingReportTypeRepository.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.MesPendingReportType; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Repository +public interface MesPendingReportTypeRepository extends BaseRepository { +} 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 b759a7d..147360b 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 @@ -3825,4 +3825,21 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesDbDataCheck.getIsValid(), "isValid", packBean); return packBean; } + + public static DdlPackBean getMesPendingReportType(MesPendingReportType mesPendingReportType) { + DdlPackBean packBean = getAllBaseData(mesPendingReportType.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesPendingReportType.getPatternCode(), "patternCode", packBean); + DdlPreparedPack.getStringEqualPack(mesPendingReportType.getPatternName(), "patternName", packBean); + DdlPreparedPack.getNumEqualPack(mesPendingReportType.getReportType(), "reportType", packBean); + DdlPreparedPack.getNumEqualPack(mesPendingReportType.getIsValid(), "isValid", packBean); + return packBean; + } + + public static DdlPackBean getMesFailureModeParts(MesFailureModeParts mesFailureModeParts) { + DdlPackBean packBean = getAllBaseData(mesFailureModeParts.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesFailureModeParts.getPatternCode(), "patternCode", packBean); + DdlPreparedPack.getStringEqualPack(mesFailureModeParts.getPartNo(), "partNo", packBean); + DdlPreparedPack.getNumEqualPack(mesFailureModeParts.getIsValid(), "isValid", packBean); + return packBean; + } } From eeb9ab500bbc2b7a13150730479d42aef495229a Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 10 Jun 2021 11:57:45 +0800 Subject: [PATCH 27/45] =?UTF-8?q?=E6=8E=92=E7=A8=8B=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java | 10 +++++----- .../cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java | 13 +++++++++++++ .../cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java | 1 + 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java index 294ec49..a4091af 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java @@ -57,4 +57,8 @@ public class HeuristicRule extends BaseRule { @ApiParam(value ="组炉区间") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String batchPeriod; + + @Column(name="REVER_FLUSH_PLAN") + @ApiParam(value ="逆向刷新计划") + private Boolean reverFlushPlan = false; } 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 be15e07..7fce6f7 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 @@ -63,6 +63,11 @@ public class StandOperation extends BaseAPS { @ApiParam(value ="分割余数") private Double remainder; + @Column(name="MIN_SPACE_TIME") + @ApiParam(value ="最小时间间隔") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) + private String minSpaceTime; + @Column(name="COMB_TYPE") @ApiParam(value ="生产组合方式") @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java index a5caf9e..35f5add 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java @@ -25,12 +25,12 @@ public class DateDuration { public static final double PRECISION = 0.00001; private String value; - private int time = 0; + private long time = 0; private double rate = 0.0; private boolean bValid = false; private int unit = 0; - public DateDuration(int value) { + public DateDuration(long value) { this.time = value; } @@ -65,7 +65,7 @@ public class DateDuration { * 对于无效的时间区间，返回0。单位为秒。 * @return */ - public int getTime() { + public long getTime() { return this.time; } @@ -73,7 +73,7 @@ public class DateDuration { * 设置新的时间区间。 * @return */ - public void setTime(int time) { + public void setTime(long time) { this.time = time; } @@ -144,7 +144,7 @@ public class DateDuration { * @param amount * @return */ - public int getTime(double amount) { + public long getTime(double amount) { if (amount < PRECISION) return getTime(); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java index 0846ded..6c0b455 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java @@ -5,6 +5,12 @@ import lombok.Data; @Data public class RuleDetailModel { + @ApiParam(value ="主执行进度") + private Integer mainProcess = 0; + + @ApiParam(value ="总规则数") + private Integer mainSize = 0; + @ApiParam(value ="当前执行进度") private Integer curProcess = 0; @@ -14,8 +20,15 @@ public class RuleDetailModel { @ApiParam(value ="进度消息") private String processMsg = ""; + @ApiParam(value ="进度消息明细") + private String subMsg = ""; + private Boolean finish = false; @ApiParam(value ="异常消息") private String exception = ""; + + public void addProcess() { + this.curProcess += 1; + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java index 7344176..f3df9c1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java @@ -11,6 +11,7 @@ import lombok.Data; **/ @Data public class RuleGroupProgress { + private Integer mainProgress; private String message; private Integer progress; } From 27ceea41139d53b0831d4de89070d70ab8bb2698 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Thu, 10 Jun 2021 17:49:20 +0800 Subject: [PATCH 28/45] =?UTF-8?q?16147=2020135-=E4=B8=8D=E8=89=AF=E5=93=81?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=89=AB=E6=9D=A1=E7=A0=81=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=8E=BB=E6=8E=89=E6=8A=A5=E5=BA=9F=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E8=BF=99=E4=B8=AA=E9=80=89=E6=8B=A9=E6=A1=86--2021-06?= =?UTF-8?q?-18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java index 9eeb99a..b195a30 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java @@ -29,15 +29,12 @@ public class CosmaDefectModel { @ApiParam("过程条码") private String serialNumber; - @ApiParam("缺陷代码集合") - private List defectCodeList; + @ApiParam("缺陷代码") + private String defectCode; @ApiParam("缺陷位置") private String location; @ApiParam("操作人") private String userName; - - @ApiParam("报废原因") - private String scrapCode; } From fe3416a73633d30727e78a944395c04fee3d7be6 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 10 Jun 2021 18:38:25 +0800 Subject: [PATCH 29/45] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E6=96=B0=E5=A2=9E?= 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 3da2cb3..4d58a9e 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 @@ -236,7 +236,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCostCenter(), "costCenter", packBean); DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getThirdRemake(), "thirdRemake", packBean); - DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getVendorNo(), "vendorNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getVendorNo(), "vendorNo", packBean); getStringBuilderPack(wmsDocMovementMaster, packBean); @@ -484,6 +484,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result); DdlPreparedPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result); DdlPreparedPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result); + DdlPreparedPack.getStringLikerPack(basVendor.getUserName(), "userName", result); DdlPreparedPack.getNumEqualPack(basVendor.getIsAsn(), "isAsn", result); DdlPreparedPack.getNumEqualPack(basVendor.getVendorType(), "vendorType", result); From aa78fd8bd5c71d9408fb942d1c1838098a417044 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Thu, 10 Jun 2021 19:46:36 +0800 Subject: [PATCH 30/45] =?UTF-8?q?=E5=8D=A1=E6=96=AF=E9=A9=AC=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E9=94=81=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesLockRecord.java | 59 ++++++++++++++++++++++ .../mes/repository/MesLockRecordRepository.java | 16 ++++++ 2 files changed, 75 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLockRecordRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java new file mode 100644 index 0000000..7607f1f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description :锁定记录 + * @Reference : + * @Author : dominic + * @CreateDate : 2021-06-10 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_LOCK_RECORD") +@Api("mes锁定记录表") +public class MesLockRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5132229443235106976L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位代码") + private String workCellCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "LOCK_REASON") + @ApiParam("锁定原因") + private String lockReason; + + @Column(name = "EMPLOYEE_NUMBER") + @ApiParam("工号") + private String employeeNumber; + + @Column(name = "LOCK_STATUS") + @ColumnDefault("1") + @ApiParam("锁定状态") + private Integer lockStatus; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLockRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLockRecordRepository.java new file mode 100644 index 0000000..94c05a6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLockRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesLockRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : dominic + * @CreateDate : 2021/6/10 19:36 + * @Modify: + **/ +@Repository +public interface MesLockRecordRepository extends BaseRepository { +} From dbdcbec03269fe0bd346764ff626e60c6f6e8abf Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 11 Jun 2021 09:22:19 +0800 Subject: [PATCH 31/45] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=8A=A5=E8=A1=A8=E6=96=B0=E5=A2=9E=E6=96=99?= =?UTF-8?q?=E6=9E=B6=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java index be65d70..b849f71 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java @@ -8,6 +8,7 @@ import java.io.Serializable; /** * 产品履历报表-产品信息 + * * @author yumingxing * @version 1.0 * @date 2020/12/18 15:16 @@ -33,6 +34,9 @@ public class ProductSnModel implements Serializable { @ApiParam("CMS标签号") private String qrCode; + @ApiParam("料架号") + private String ctNo; + @ApiParam("产线") private String workCenterName; @@ -55,10 +59,8 @@ public class ProductSnModel implements Serializable { private String qcStatusName; - - - public ProductSnModel(String packageNo,String customerPartNo, String serialNumber, String partNo, - String qrCode, String workCenterName, String processName, + public ProductSnModel(String packageNo, String customerPartNo, String serialNumber, String partNo, + String qrCode, String ctNo, String workCenterName, String processName, String workCellName, String createDatetime, String createUser, Integer qcStatus) { this.packageNo = packageNo; @@ -66,6 +68,7 @@ public class ProductSnModel implements Serializable { this.serialNumber = serialNumber; this.partNo = partNo; this.qrCode = qrCode; + this.ctNo = ctNo; this.workCenterName = workCenterName; this.processName = processName; this.workCellName = workCellName; From 35e41f94e18d576817a317453830dbb3e45d966e Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 11 Jun 2021 11:15:14 +0800 Subject: [PATCH 32/45] =?UTF-8?q?=E5=8D=A1=E6=96=AF=E9=A9=AC=E9=94=81?= =?UTF-8?q?=E5=AE=9A=E8=AE=B0=E5=BD=95=E8=A1=A8=E9=94=81=E5=AE=9A=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E8=B5=8B=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java index 7607f1f..8d3d516 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java @@ -55,5 +55,5 @@ public class MesLockRecord extends BaseBean implements Serializable { @Column(name = "LOCK_STATUS") @ColumnDefault("1") @ApiParam("锁定状态") - private Integer lockStatus; + private Integer lockStatus = 1; } From 29d62c4334e1dd513bf13e47b3d21867f70468c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 15 Jun 2021 18:05:06 +0800 Subject: [PATCH 33/45] =?UTF-8?q?=E3=80=903484=2020063-=E5=BE=85=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=8A=A5=E5=B7=A5=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?-20210610=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/bean/MesFailureModeApproval.java | 60 ++++++++++++++++++++++ .../MesFailureModeApprovalRepository.java | 14 +++++ 2 files changed, 74 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFailureModeApproval.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModeApprovalRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFailureModeApproval.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFailureModeApproval.java new file mode 100644 index 0000000..e957f35 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFailureModeApproval.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_FAILURE_MODE_APPROVAL") +@Api("MES_失效模式审批人员") +public class MesFailureModeApproval extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5274274774653791153L; + + @Column(name = "PATTERN_CODE") + @ApiParam("模式代码") + private String patternCode; + + @Column(name = "PATTERN_NAME") + @ApiParam("模式代码名称") + private String patternName; + + @Column(name = "DEPARTMENT_NAME_RDD") + @ApiParam("部门名称") + private String departmentNameRdd; + + @Column(name = "DEPARTMENT_ID") + @ApiParam("部门id") + private Long departmentId; + + @Column(name = "USER_NAME") + @ApiParam("人员名称") + private String userName; + + @Column(name = "USER_ID") + @ApiParam("人员id") + private Long userId; + + @Column(name = "PERSONNEL_LEVEL") + @ApiParam("人员级别") + private Integer personnelLevel; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModeApprovalRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModeApprovalRepository.java new file mode 100644 index 0000000..21636c6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModeApprovalRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesFailureModeApproval; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:53 + * @Modify: + **/ +public interface MesFailureModeApprovalRepository extends BaseRepository { +} From bef841570793efe2e6b9e90bf013901f45026cd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=8F=8C=E5=8F=8C?= Date: Tue, 15 Jun 2021 22:49:35 +0800 Subject: [PATCH 34/45] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetai?= =?UTF-8?q?l.java'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 泰国需求：接口表增加PACKAGE_NO字段索引 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index 64587ab..cc831dc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -29,7 +29,8 @@ import java.io.Serializable; @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_PACKAGE_DETAIL", indexes = { @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "PART_NO") + @Index(columnList = "PART_NO"), + @Index(columnList = "PACKAGE_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER", "IF_CODE"}) }) From b545d4928a73b4286c2de71b94c45177a4cd4377 Mon Sep 17 00:00:00 2001 From: nies Date: Wed, 16 Jun 2021 17:14:58 +0800 Subject: [PATCH 35/45] =?UTF-8?q?SYSMENU=20=E6=96=B0=E5=A2=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 59afede..b05afcb 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -99,6 +99,11 @@ public class SysMenu extends BaseBean { @AnnoOutputColumn(required = false) private String menuIcon; + @Column(name="MENU_BACKGROUND_IMAGE") + @ApiParam(value ="资源背景图片" , access ="资源背景图片") + @AnnoOutputColumn(required = false) + private String menuBackgroundImage; + @Column(name="MENU_DESCRIPTION") @ApiParam(value ="资源描述" , access ="配置描述") @AnnoOutputColumn(required = false) From 0170a86f60d8697e912541ab4749df6cf8231a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 16 Jun 2021 17:52:30 +0800 Subject: [PATCH 36/45] =?UTF-8?q?=E3=80=903484=2020063-=E5=BE=85=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=8A=A5=E5=B7=A5=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?-20210610=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 37 ++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 8277381..27fb77b 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 @@ -2102,8 +2102,8 @@ public class MesEnumUtil { MES_JISA(640, "jisaExcelService", "JISA导入"), MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"), MES_HOLIDAY_VACATION(660, "holidayVacationExcelService", "节假日导入"), - MES_PENDING_REPORT_TYPE(670, "PendingReportTypeExcelService", "待处理报工类型导入"), - MES_FAILURE_MODE_PARTS(680, "FailureModePartsExcelService", "失效模式零件导入"); + MES_PENDING_REPORT_TYPE(670, "pendingReportTypeExcelService", "待处理报工类型导入"), + MES_FAILURE_MODE_PARTS(680, "failureModePartsExcelService", "失效模式零件导入"); private int value; private String service; @@ -8467,4 +8467,37 @@ public class MesEnumUtil { return description; } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PERSONNEL_LEVEL { + + ONE(10, "一级"), + TWO(20, "二级"); + + private int value; + private String description; + + PERSONNEL_LEVEL(int value, String description) { + this.value = value; + this.description = description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } From 6947405f4455f47e9c146a70ab72d7424759dc87 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Thu, 17 Jun 2021 16:31:44 +0800 Subject: [PATCH 37/45] =?UTF-8?q?16328=2020135--=E9=94=81=E5=AE=9A?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=A2=9E=E5=8A=A0=E9=9B=B6=E4=BB=B6=E7=A0=81?= =?UTF-8?q?=E8=BF=99=E4=B8=AA=E5=AD=97=E6=AE=B5--2021-06-23?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java index 8d3d516..0617ce2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java @@ -44,6 +44,10 @@ public class MesLockRecord extends BaseBean implements Serializable { @ApiParam("工序代码") private String processCode; + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + @Column(name = "LOCK_REASON") @ApiParam("锁定原因") private String lockReason; From 8b5447f5cab0e505e5537753a8da443f30f72faf Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 17 Jun 2021 22:25:19 +0800 Subject: [PATCH 38/45] =?UTF-8?q?=E5=81=9C=E6=9C=BA=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java | 13 +++++++++++++ .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java | 4 ++++ .../cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java | 1 + 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index a8890ef..ff9e619 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.andon.model; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import java.io.Serializable; /** @@ -77,6 +78,18 @@ public class AndonBoardModel implements Serializable { @ApiParam("停线时间比率") private String downtimeRate; + @ApiParam("周") + private Integer week; + + @ApiParam(value = "事件原因代码") + public String ecCode; + + @ApiParam(value = "事件原因描述") + public String ecNameRdd; + + @ApiParam(value = "小时") + public String hour; + public int getTotalTimeVal() { return totalTime == null ? 0 : totalTime; } 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 27fb77b..6c1626f 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 @@ -4796,7 +4796,8 @@ public class MesEnumUtil { CANCEL(30, "取消"), OFFLINE(40, "下线"), SHIPMENT(50, "发运"), - SPECIAL(60, "特殊标识"); + SPECIAL(60, "特殊标识"), + FORCE_REPORT_WORK(70, "强制报工"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java index 4ece2f1..0f467f2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java @@ -77,4 +77,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable { @Transient @ApiParam("收货日期") private String receiptDate; + + @Transient + @ApiParam("选配类型") + private Integer optionType; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java index ed7aaad..743fe36 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java @@ -22,6 +22,7 @@ public class MgnBjAblePickModel { private String clientInfo; private String ip; private Integer port; + private boolean isBackOff; private Integer timeout = 3000; private Integer sleepTime = 2000; From 33b4b60c38362fa07ee192c7cb1752eca8dea7a8 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 18 Jun 2021 10:11:44 +0800 Subject: [PATCH 39/45] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E7=8E=87=E8=B6=8B?= =?UTF-8?q?=E5=8A=BF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/report/ScrapRateTrendReportModel.java | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapRateTrendReportModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapRateTrendReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapRateTrendReportModel.java new file mode 100644 index 0000000..b8506ca --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapRateTrendReportModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description : 报废率趋势model + * @Reference : + * @Author : dominic + * @CreateDate : 2021/6/17 19:12 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("报废率趋势model") +public class ScrapRateTrendReportModel { + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("修改时间") + private String modifyDatetime; + + @ApiParam("操作类型") + private Integer operateType; + + @ApiParam("报废原因") + private String scrapCode; +} From 66c627a698280fb5c3f32353986f6e984b08827a Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Sat, 19 Jun 2021 16:28:01 +0800 Subject: [PATCH 40/45] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B3=B0=E5=9B=BD?= =?UTF-8?q?=E6=89=AD=E7=9F=A9=E4=BA=A7=E7=BA=BF=E4=B8=93=E7=94=A8=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCarModel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCarModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCarModel.java index ca4c442..6978b10 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCarModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCarModel.java @@ -29,6 +29,10 @@ public class MesPartCarModel extends BaseBean implements Serializable { private static final long serialVersionUID = -4039513102671811231L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; From 5a354229f7eff78dfd8be23d6186b421aa0a1fd2 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Mon, 21 Jun 2021 09:54:10 +0800 Subject: [PATCH 41/45] =?UTF-8?q?=E6=B3=B0=E5=9B=BD=E7=94=B5=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 6 ++- .../pojo/mes/bean/MesElectrotestingPrintData.java | 59 ++++++++++++++++++++++ .../MesElectrotestingPrintDataRepository.java | 16 ++++++ 3 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesElectrotestingPrintData.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesElectrotestingPrintDataRepository.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 6c1626f..ba8f21d 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 @@ -2103,7 +2103,9 @@ public class MesEnumUtil { MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"), MES_HOLIDAY_VACATION(660, "holidayVacationExcelService", "节假日导入"), MES_PENDING_REPORT_TYPE(670, "pendingReportTypeExcelService", "待处理报工类型导入"), - MES_FAILURE_MODE_PARTS(680, "failureModePartsExcelService", "失效模式零件导入"); + MES_FAILURE_MODE_PARTS(680, "failureModePartsExcelService", "失效模式零件导入"), + MES_ELECTROTESTING_PRINT_DATA(690, "electrotestingPrintDataExcelService", "电检打印数据导入"); + private int value; private String service; @@ -5728,7 +5730,7 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum VALUE_TYPE { - + MANUAL_ASSIGNMENT("10", "手工赋值"), SPEL_EXPRESSION("20", "spel表达式"), FUNCTION_ASSIGNMENT("30", "函数赋值"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesElectrotestingPrintData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesElectrotestingPrintData.java new file mode 100644 index 0000000..5ecc961 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesElectrotestingPrintData.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description : 泰国电检打印数据 + * @Reference : + * @Author : dominic + * @CreateDate : 2021/6/16 14:15 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_ELECTROTESTING_PRINT_DATA") +@Api("MES_电检打印数据") +public class MesElectrotestingPrintData extends BaseBean implements Serializable { + private static final long serialVersionUID = 5179928838368157923L; + + @Column(name = "COLOUR_CODE") + @ApiParam("颜色代码") + private String colourCode; + + @Column(name = "VARIANT") + @ApiParam("型号") + private String variant; + + @Column(name = "PRODUCTION_NUMBER") + @ApiParam("产品号") + private String productionNumber; + + @Column(name = "COMMISSION_NUMBER") + @ApiParam("佣金号") + private String commissionNumber; + + @Column(name = "QAD_NO") + @ApiParam("位置号") + private String qadNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PRINT_STATUS") + @ApiParam("打印状态") + private Integer printStatus = 10; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesElectrotestingPrintDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesElectrotestingPrintDataRepository.java new file mode 100644 index 0000000..43915c2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesElectrotestingPrintDataRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesElectrotestingPrintData; +import org.springframework.stereotype.Repository; + +/** + * @Description : 泰国电检打印数据 + * @Reference : + * @Author : dominic + * @CreateDate : 2021/6/16 14:27 + * @Modify: + **/ +@Repository +public interface MesElectrotestingPrintDataRepository extends BaseRepository { +} From 005d3ef8f940505cd6a1986e0c33edb891877a70 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 21 Jun 2021 11:18:47 +0800 Subject: [PATCH 42/45] =?UTF-8?q?=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index b3c48f6..3918199 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -5,17 +5,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; /** @@ -31,7 +28,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_PART") +@Table(name = "MES_PART", indexes = { + @Index(columnList = "PART_NO") +}) @Api("物料信息") public class MesPart extends BaseBean implements Serializable { private static final long serialVersionUID = -7731182105899332283L; From e0e1231e09f4c6a5b102296469de127a0976ac85 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 21 Jun 2021 17:39:33 +0800 Subject: [PATCH 43/45] =?UTF-8?q?16381=2019081-andon=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=A4=84=E7=90=86-=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/andon/bean/AndonMgnManageQueue.java | 548 +++++++++++++++++++++ .../repository/IAndonMgnManageQueueRepository.java | 13 + 2 files changed, 561 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMgnManageQueue.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMgnManageQueueRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMgnManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMgnManageQueue.java new file mode 100644 index 0000000..adc39e2 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMgnManageQueue.java @@ -0,0 +1,548 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.andon.model.BaseManageQueue; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import io.swagger.models.auth.In; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.beanutils.BeanUtils; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.List; + +/** + * @Description : 安灯队列 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_MANAGE_QUEUE", indexes = { + @Index(columnList = "WORK_CENTER_CODE", name = "ANDON_INDEX_WORK_CENTER_CODE"), + @Index(columnList = "WORK_CELL_CODE", name = "ANDON_INDEX_WORK_CELL_CODE"), + @Index(columnList = "ORGANIZE_CODE", name = "ANDON_INDEX_ORGANIZE_CODE"), + @Index(columnList = "ANDON_ORDER_NO", name = "ANDON_INDEX_ANDON_ORDER_NO"), + @Index(columnList = "ALARM_CODE", name = "ANDON_INDEX_ALARM_CODE"), + @Index(columnList = "STATUS_CODE", name = "ANDON_INDEX_STATUS_CODE"), + @Index(columnList = "ACTION_CODE", name = "ANDON_INDEX_ACTION_CODE"), + @Index(columnList = "EQUIPMENT_CODE", name = "ANDON_INDEX_EQUIPMENT_CODE") +}) +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Api("安灯队列") +public class AndonMgnManageQueue extends BaseManageQueue implements Serializable { + + private static final long serialVersionUID = 183865984747203897L; + + @Transient + @ApiParam(value ="触发事件") + private String triggerEvent; + + @Column(name = "ROUTE_CODE") + @ApiParam(value = "流程代码") + private String routeCode; + + @Column(name = "ROUTE_STATUS_CODE") + @ApiParam(value = "状态点代码") + private String routeStatusCode; + + @Column(name = "SEQ") + @ApiParam(value = "序号", example = "1") + private Double seq; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="呼叫时间，查询开始时间", example = "2018-01-01 01:00:00") + public String callTimeStart; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="呼叫时间，查询结束时间", example = "2018-01-01 01:00:00") + public String callTimeEnd; + + @Transient + @ApiParam(value = "呼叫人名字") + private String callUserName; + + @Transient + @ApiParam(value = "响应人名字") + private String confirmUserName; + + @Column(name = "SOURCE_TYPE") + @ApiParam(value = "安灯来源类型") + private String sourceType = AndonEnumUtil.ALARM_SOURCE_TYPE.SOFT.getValue(); + + @Transient + @ApiParam(value = "解决人名字") + private String resetUserName; + + @Column(name = "IS_SHIFT_CALL") + @ApiParam(value = "是否转呼", example = "1") + private Integer isShiftCall; + + @Column(name="SHIFT_CALL_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="转呼时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String shiftCallTime; + + @Column(name = "RP_OBJECT_CODE") + @ApiParam(value = "转呼对象代码") + private String rpObjectCode; + + @Column(name = "SC_RESPONSE_CODE") + @ApiParam(value = "转呼响应方式") + private String scResponseCode; + + @Column(name = "SC_RP_LEVEL") + @ApiParam(value = "转呼通知等级") + private String scRpLevel; + + @Column(name = "SHIFT_CODE") + @ApiParam(value = "班次") + private String shiftCode; + + @Column(name = "PRODUCTION_NUM") + @ApiParam(value = "生产号") + private String productionNum; + + @Column(name = "MODEL") + @ApiParam(value = "车型") + private String model; + + @Column(name = "FAULT_CAUSE") + @ApiParam(value = "故障原因") + private String faultCause; + + @Column(name = "PROCESS_METHOD") + @ApiParam(value = "处理方法") + private String processMethod; + + @Column(name = "REPLACE_SPARE_PART") + @ApiParam(value = "更换备件") + private String replaceSparePart; + + @Column(name = "MAINTENANCE_SCORE") + @ApiParam(value = "维修评分") + private String maintenanceScore; + + @Column(name = "UNQUALIFIED_QTY") + @ApiParam(value = "不良品数量") + private Integer unqualifiedQty; + + @Column(name = "PREVENTIVE_MEASURES") + @ApiParam(value = "维修工程师预防性对策") + private String preventiveMeasures; + + @Column(name = "ENGINEER_SUGGESTION") + @ApiParam(value = "工艺工程师建议") + private String engineerSuggestion; + + @Column(name = "RESPONSE_SPEED") + @ApiParam(value = "响应速度") + private String responseSpeed; + + @Column(name = "REPAIR_SPEED") + @ApiParam(value = "修复速度") + private String repairSpeed; + + @Column(name = "MONTH") + @ApiParam(value = "月") + private Integer month; + + @Column(name = "WEEK") + @ApiParam(value = "周") + private Integer week; + + + @Transient + @ApiParam(value = "异常时长", example = "0") + private Long execptionTime; + + @Transient + @ApiParam(value = "响应时长", example = "0") + private Long signTime; + + @Transient + @ApiParam(value = "ANDON次数（用于报表统计）", example = "0") + private Long andonCount; + + @Transient + @ApiParam(value = "平均响应时长", example = "0") + private Double avgSignTime; + + @Transient + @ApiParam(value = "解决时长", example = "0") + private Long resolveTime; + + @Transient + @ApiParam(value = "平均解决时长", example = "0") + private Double avgResolveTime; + + @Transient + @ApiParam(value = "查询条件：ANDON状态") + private List statusList; + + @Transient + @ApiParam(value = "查询条件：ANDON状态") + private List typeList; + + @Transient + @ApiParam(value = "比例", example = "0") + private Double proportion; + + @Transient + @ApiParam(value = "当前比例（累加）", example = "0") + private Double currentProportion; + + @Transient + @ApiParam(value = "总次数（用于报表统计）", example = "0") + private Integer sumCount; + + @Column(name = "SEND_FLAG") + @ApiParam(value = "发送标志") + private String sendFlag; + + @Column(name = "SIGN_SEND_FLAG") + @ApiParam(value = "响应已通知标识") + private String signSendFlag; + + /** + * 1 = 是，2 = 否 + */ + @Transient + @ApiParam(value = "是否勾选加入自处理问题库", example = "2") + private Integer isDisposal; + + @Column(name = "ALARM_DETAIL_NAME_RDD") + @ApiParam(value = "安灯子类型名称") + private String alarmDetailNameRdd; + + @Column(name = "EPM_CODE") + @ApiParam(value = "事件现象代码") + private String epmCode; + + @Column(name = "EPM_NAME_RDD") + @ApiParam(value = "事件现象描述") + private String epmNameRdd; + + @Column(name = "IMPORTANCE_CODE") + @ApiParam(value = "重要等级代码") + private String importanceCode; + + @Column(name = "IMPORTANCE_NAME_RDD") + @ApiParam(value = "重要等级名称") + private String importanceNameRdd; + + @Column(name = "ORGANIZE_NAME_RDD") + @ApiParam(value = "组织名称") + private String organizeNameRdd; + + @Column(name = "REJECT_OPINION") + @ApiParam(value = "驳回意见") + private String rejectOpinion; + + @Column(name = "OPEN_INFO") + @ApiParam(value = "放行说明") + private String openInfo; + + @Column(name = "IS_OVER_TIME") + @ApiParam(value = "是否超时") + private Integer overTimeFlag; + + @Transient + @ApiParam(value = "安灯状态集合") + private List statusCodeList; + + @Transient + @ApiParam(value = "日发生次数") + private int dayTime; + + @Transient + @ApiParam(value = "周发生次数") + private int weekendsTime; + + @Transient + @ApiParam(value = "事件统计报表该事件描述的总次数") + private int acCodeTime; + + @ApiParam(value = "操作来源") + @Transient + private String operationFlag; + + // 安灯附属表 + @Transient + @ApiParam(value ="临时/纠正措施") + private String tempCorrectMethod; + + @Transient + @ApiParam(value ="预防/纠正措施") + private String preCorrectMethod; + + @Transient + @ApiParam(value ="客户") + private String customer; + + @Transient + @ApiParam(value ="零件号") + private String partNo; + + @Transient + @ApiParam(value ="零件名称") + private String partName; + + @Transient + @ApiParam(value ="报废数量") + private Double scrapNum; + + @Transient + @ApiParam(value ="批次") + private String lot; + + @Transient + @ApiParam(value ="零件数量") + private Double partNum; + + @Transient + @ApiParam(value ="设备名称") + private String deviceName; + + @Transient + @ApiParam(value ="是否更换备件") + private Integer isChangeBackup; + + @Transient + @ApiParam(value ="备件名称") + private String backupPartName; + + @Transient + @ApiParam(value ="规格型号") + private String scale; + + @Transient + @ApiParam(value ="当前件数") + private Integer currentProdNum; + + @Transient + @ApiParam(value ="生产累计件数") + private Integer totalProdNum; + + @Transient + @ApiParam(value ="安灯类型名称") + private String alarmCodeName; + + @Transient + @ApiParam(value ="响应时长-分钟") + private Integer downtime; + + @Transient + @ApiParam(value ="故障时长-分钟") + private Integer brokenTime; + + @Transient + @ApiParam(value ="响应时长(分钟)") + private Double sumDowntime; + + @Transient + @ApiParam(value ="故障时长(分钟)") + private Double sumBrokenTime; + + @Transient + @ApiParam(value ="故障字符串") + private String faultStr; + + @Transient + @ApiParam(value ="百分比") + private Integer propagation; + + // 是否转呼 + public Integer getIsShiftCall() { + return this.isShiftCall == null ? 0 : this.isShiftCall; + } + + // 获取优先级别 + public Integer getPriorityLevel() { + return this.priorityLevel == null ? 0 : this.priorityLevel; + } + + /** + * 工位统计 构造函数 + * @param workCenterCode + * @param workCenterNameRdd + * @param workCellCode + * @param workCellNameRdd + * @param equipmentCode + * @param equipmentNameRdd + * @param shiftCode + * @param shiftNameRdd + * @param alarmCode + * @param andonCount + */ + public AndonMgnManageQueue(String workCenterCode, String workCenterNameRdd, String workCellCode, String workCellNameRdd, + String equipmentCode, String equipmentNameRdd, String shiftCode, String shiftNameRdd, + String alarmCode, Long andonCount, String callTime, String resetTime) { + this.workCenterCode = workCenterCode; + this.workCenterNameRdd = workCenterNameRdd; + this.workCellNameRdd = workCellNameRdd; + this.workCellCode = workCellCode; + this.equipmentCode = equipmentCode; + this.equipmentNameRdd = equipmentNameRdd; + this.shiftCode = shiftCode; + this.shiftNameRdd = shiftNameRdd; + this.alarmCode = alarmCode; + this.andonCount = andonCount; + this.callTime = callTime; + this.resetTime = resetTime; + } + + /** + * 原因统计 使用Java内存计算（获取原始数据） + * @param acCode + * @param acNameRdd + * @param workCenterCode + * @param workCenterNameRdd + * @param workCellCode + * @param workCellNameRdd + * @param alarmCode + * @param ecCode + * @param ecNameRdd + * @param emCode + * @param emNameRdd + * @param callTime + * @param confirmTime + * @param resetTime + */ + public AndonMgnManageQueue(String acCode, String acNameRdd, String workCenterCode, String workCenterNameRdd, String workCellCode, String workCellNameRdd, String alarmCode, String ecCode, String ecNameRdd, String emCode, String emNameRdd, String callTime, String confirmTime, String resetTime){ + this.acCode = acCode; + this.acNameRdd = acNameRdd; + this.workCenterCode = workCenterCode; + this.workCenterNameRdd = workCenterNameRdd; + this.workCellCode = workCellCode; + this.workCellNameRdd = workCellNameRdd; + this.alarmCode = alarmCode; + this.ecCode = ecCode; + this.ecNameRdd = ecNameRdd; + this.emCode = emCode; + this.emNameRdd = emNameRdd; + this.callTime = callTime; + this.confirmTime = confirmTime; + this.resetTime = resetTime; + } + + /** + * 人员统计 使用Java内存计算（获取原始数据） + * @param organizeCode + * @param workCenterNameRdd + * @param workCellCode + * @param workCellNameRdd + * @param resetUser + * @param alarmCode + * @param callTime + * @param confirmTime + * @param resetTime + */ + public AndonMgnManageQueue(String organizeCode, String workCenterNameRdd, String workCellCode, String workCellNameRdd, String resetUser, String alarmCode, String callTime, String confirmTime, String resetTime){ + this.organizeCode = organizeCode; + this.workCenterNameRdd = workCenterNameRdd; + this.workCellCode = workCellCode; + this.workCellNameRdd = workCellNameRdd; + this.resetUser = resetUser; + this.alarmCode = alarmCode; + this.callTime = callTime; + this.confirmTime = confirmTime; + this.resetTime = resetTime; + } + + /** + * 统计分析柏拉图 使用JAVA内存计算（获取原始数据） + * @param workCenterNameRdd + * @param alarmCode + * @param ecCode + * @param ecNameRdd + * @param callTime + * @param confirmTime + * @param resetTime + */ + public AndonMgnManageQueue(String workCenterNameRdd, String alarmCode, String ecCode, String ecNameRdd, String callTime, String confirmTime, String resetTime){ + this.workCenterNameRdd = workCenterNameRdd; + this.ecNameRdd = ecNameRdd; + this.ecCode = ecCode; + this.alarmCode = alarmCode; + this.callTime = callTime; + this.confirmTime = confirmTime; + this.resetTime = resetTime; + } + + public AndonMgnManageQueue() { + } + + /** + * 安灯问题情况报表 + * @param organizeNameRdd + * @param workCenterNameRdd + * @param andonCount + */ + public AndonMgnManageQueue(String organizeNameRdd, String workCenterCode, String workCenterNameRdd, Long andonCount) { + this.organizeNameRdd = organizeNameRdd; + this.workCenterCode = workCenterCode; + this.workCenterNameRdd = workCenterNameRdd; + this.andonCount = andonCount; + } + + /** + * 工位统计报表查询 构造函数 + * @param workCenterCode + * @param workCenterNameRdd + * @param workCellCode + * @param workCellNameRdd + * @param equipmentCode + * @param equipmentNameRdd + * @param shiftCode + * @param shiftNameRdd + * @param alarmCode + * @param andonCount + */ + public AndonMgnManageQueue(String workCenterCode, String workCenterNameRdd, String workCellNameRdd, String workCellCode, + String equipmentCode, String equipmentNameRdd, String shiftCode, String shiftNameRdd, + String alarmCode, Long andonCount) { + this.workCenterCode = workCenterCode; + this.workCenterNameRdd = workCenterNameRdd; + this.workCellNameRdd = workCellNameRdd; + this.workCellCode = workCellCode; + this.equipmentCode = equipmentCode; + this.equipmentNameRdd = equipmentNameRdd; + this.shiftCode = shiftCode; + this.shiftNameRdd = shiftNameRdd; + this.alarmCode = alarmCode; + this.andonCount = andonCount; + } + + + public static void main(String[] args) { + try { + List ds = new ArrayList(); + ds.add(new AndonMgnManageQueue()); + System.out.println(BeanUtils.describe(ds)); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (InvocationTargetException e) { + e.printStackTrace(); + } catch (NoSuchMethodException e) { + e.printStackTrace(); + } + } + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMgnManageQueueRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMgnManageQueueRepository.java new file mode 100644 index 0000000..dbf3408 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMgnManageQueueRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonMgnManageQueue; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/6/18 5:14 PM + * @Modify: + */ +public interface IAndonMgnManageQueueRepository extends BaseRepository { +} From a63ce49a89199f0e4a716822250a3cddc4bcfa65 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 21 Jun 2021 18:02:32 +0800 Subject: [PATCH 44/45] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 4d58a9e..ab02943 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 @@ -135,7 +135,9 @@ public class WmsHqlPack { //查询参数封装 // 该查询封装用于单据主表查询明细使用equal 精准查询 - DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); + if (!StringUtil.isEmpty(wmsDocMovementDetails.getOrderNo())) { + DdlPreparedPack.getInPackList(Arrays.asList(wmsDocMovementDetails.getOrderNo().split(",")), "orderNo", result); + } DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result); DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result); From 7a92162ca6855a4a6eb47c538675484b006479ad Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 22 Jun 2021 14:46:50 +0800 Subject: [PATCH 45/45] =?UTF-8?q?=E5=8D=A1=E6=96=AF=E9=A9=AC=E9=94=81?= =?UTF-8?q?=E5=AE=9A=E8=AE=B0=E5=BD=95=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E4=BD=8D=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java index 0617ce2..0e9d030 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java @@ -40,6 +40,10 @@ public class MesLockRecord extends BaseBean implements Serializable { @ApiParam("工位代码") private String workCellCode; + @Column(name = "WORK_CELL_NAME") + @ApiParam("工位名称") + private String workCellName; + @Column(name = "PROCESS_CODE") @ApiParam("工序代码") private String processCode;