From 49f0c0c33a37fbf40b0070dd915f1377509eb3d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sun, 5 Jul 2020 19:11:22 +0800 Subject: [PATCH 1/8] =?UTF-8?q?2092=20MES202006-=E9=A6=96=E6=A3=80?= =?UTF-8?q?=E3=80=81=E5=B7=A1=E6=A3=80=E6=A3=80=E9=AA=8C=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=94=9F=E6=88=90=E9=80=BB=E8=BE=91=E5=8F=98=E6=9B=B4-20200615?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java | 8 ++++++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index b9c75bf..37a6716 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -92,6 +92,14 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("数量标识") private String numberFlag; + @Column(name = "MAXIMUM") + @ApiParam("最大数") + private Integer maximum = 0; + + @Column(name = "MINIMUM") + @ApiParam("最小数") + private Integer minimum = 0; + @Transient @ApiParam("检测类型名称") private String checkTypeName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index 60fae90..61dec82 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -87,4 +87,12 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam(value = "检测项类型名称") @Transient private String businessTypeName; + + @Column(name = "MAXIMUM") + @ApiParam("最大数") + private Integer maximum = 0; + + @Column(name = "MINIMUM") + @ApiParam("最小数") + private Integer minimum = 0; } From 6bc9aa1f708ee00c6cb188627b90868a2d583523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 6 Jul 2020 13:37:13 +0800 Subject: [PATCH 2/8] =?UTF-8?q?2092=20MES202006-=E9=A6=96=E6=A3=80?= =?UTF-8?q?=E3=80=81=E5=B7=A1=E6=A3=80=E6=A3=80=E9=AA=8C=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=94=9F=E6=88=90=E9=80=BB=E8=BE=91=E5=8F=98=E6=9B=B4-20200615?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index 37a6716..1b6ee58 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -94,11 +94,11 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @Column(name = "MAXIMUM") @ApiParam("最大数") - private Integer maximum = 0; + private Double maximum = 0d; @Column(name = "MINIMUM") @ApiParam("最小数") - private Integer minimum = 0; + private Double minimum = 0d; @Transient @ApiParam("检测类型名称") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index 61dec82..c78132b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -90,9 +90,9 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Column(name = "MAXIMUM") @ApiParam("最大数") - private Integer maximum = 0; + private Double maximum = 0d; @Column(name = "MINIMUM") @ApiParam("最小数") - private Integer minimum = 0; + private Double minimum = 0d; } From 716f0ac1f9c0d1c87fa070eb61ae99fb9891597d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 7 Jul 2020 21:29:57 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA=E5=92=8C?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=A1=BA=E5=BA=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 45 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesObjectCfg.java | 8 ++++ 2 files changed, 53 insertions(+) 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 4eaace4..c4605d7 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 @@ -991,6 +991,51 @@ public class MesEnumUtil { } } + /** + * Mes 对象结构是否展示 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OBJECT_CFG_IS_SHOW { + + SHOW(1, "是"), + NO_SHOW(2, "否"); + + private int value; + private String description; + + OBJECT_CFG_IS_SHOW(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } /** * Mes 客户订单来源 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index 9f25f06..a63724c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -58,6 +58,14 @@ public class MesObjectCfg extends BaseBean implements Serializable { @ApiParam("是否保存 1存 2不存") private Integer isSave; + @Column(name = "SHOW_SEQ") + @ApiParam("显示顺序") + private Integer showSeq; + + @Column(name = "IS_SHOW") + @ApiParam("是否显示") + private Integer isShow; + @Transient @ApiParam("是否存储名") private String isSaveName; From a84186e023e788edda86066077b8a80f1fc98051 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 8 Jul 2020 01:48:03 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=B8=AD=E8=88=AA=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=8F=91=E5=B8=83?= 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 +- .../i3plus/pojo/mes/bean/MesCellFeedRecord.java | 8 ++-- .../pojo/mes/bean/MesWorkCellMonitorLog.java | 3 +- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 51 ++++++++++++++++------ modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 23 files changed, 63 insertions(+), 39 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 697131c..761dd07 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..8ef99a3 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..a6c1bea 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..0a2f9d4 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index aca1465..5f809e6 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..557548a 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index a6a0d68..8778b3c 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..34a7337 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..670eb15 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..ce2dc01 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..b8c9643 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java index aa1dc88..9056293 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java @@ -9,9 +9,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.*; import java.io.Serializable; /** @@ -26,7 +24,9 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CELL_FEED_RECORD") +@Table(name = "MES_CELL_FEED_RECORD", indexes = { + @Index(columnList = "ORDER_NO") +}) @Api("工位投料履历信息") public class MesCellFeedRecord extends BaseBean implements Serializable { private static final long serialVersionUID = 1947971369489107783L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java index 92bcaf8..324db04 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java @@ -23,7 +23,8 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = { - @Index(columnList = "CREATE_DATE_TIME") + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "WORK_CENTER_CODE") }) @Api("工位监控异常信息") public class MesWorkCellMonitorLog extends BaseBean implements Serializable { 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 767ad06..0d768d6 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 @@ -15,6 +15,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import java.util.List; + /** * @Description: * @Reference: Mes 条件封装 @@ -939,6 +940,15 @@ public class MesHqlPack { */ public static DdlPackBean getMesQcOrder(MesQcOrder qcOrder, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrder, organizeCode); + if (!StringUtils.isEmpty(qcOrder.getRelationOrderNo())) { + DdlPreparedPack.getStringEqualPack(qcOrder.getRelationOrderNo(), "relationOrderNo", packBean); + } + if (!StringUtils.isEmpty(qcOrder.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(qcOrder.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(qcOrder.getProductSn())) { + DdlPreparedPack.getStringEqualPack(qcOrder.getProductSn(), "productSn", packBean); + } if (!StringUtils.isEmpty(qcOrder.getOrderNo())) { DdlPreparedPack.getStringEqualPack(qcOrder.getOrderNo(), "orderNo", packBean); } @@ -2037,7 +2047,7 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesProdBindRecord.getSupplierCode())) { DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSupplierCode(), "supplierCode", packBean); } - if(!StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeEnd())) { + if (!StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProdBindRecord.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( mesProdBindRecord.getCreateDateTimeStart(), mesProdBindRecord.getCreateDateTimeEnd(), @@ -2376,19 +2386,20 @@ public class MesHqlPack { /** * 界面组件配置 + * * @param windowModule * @param organizeCode * @return */ public static DdlPackBean getMesWindowModule(MesWindowModule windowModule, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(windowModule, organizeCode); - if(!StringUtils.isEmpty(windowModule.getWindowNo())){ + if (!StringUtils.isEmpty(windowModule.getWindowNo())) { DdlPreparedPack.getStringLikerPack(windowModule.getWindowNo(), "windowNo", packBean); } - if(!StringUtils.isEmpty(windowModule.getModuleCode())){ + if (!StringUtils.isEmpty(windowModule.getModuleCode())) { DdlPreparedPack.getStringLikerPack(windowModule.getModuleCode(), "moduleCode", packBean); } - if(!StringUtils.isEmpty(windowModule.getWindowModuleBack())){ + if (!StringUtils.isEmpty(windowModule.getWindowModuleBack())) { DdlPreparedPack.getStringLikerPack(windowModule.getWindowModuleBack(), "windowModuleBack", packBean); } return packBean; @@ -2396,22 +2407,23 @@ public class MesHqlPack { /** * 界面组件参数配置 + * * @param windowModuleParam * @param organizeCode * @return */ public static DdlPackBean getMesWindowModuleParam(MesWindowModuleParam windowModuleParam, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(windowModuleParam, organizeCode); - if(!StringUtils.isEmpty(windowModuleParam.getWindowNo())){ + if (!StringUtils.isEmpty(windowModuleParam.getWindowNo())) { DdlPreparedPack.getStringLikerPack(windowModuleParam.getWindowNo(), "windowNo", packBean); } - if(!StringUtils.isEmpty(windowModuleParam.getModuleCode())){ + if (!StringUtils.isEmpty(windowModuleParam.getModuleCode())) { DdlPreparedPack.getStringLikerPack(windowModuleParam.getModuleCode(), "moduleCode", packBean); } - if(!StringUtils.isEmpty(windowModuleParam.getParamCode())){ + if (!StringUtils.isEmpty(windowModuleParam.getParamCode())) { DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamCode(), "paramCode", packBean); } - if(!StringUtils.isEmpty(windowModuleParam.getParamValue())){ + if (!StringUtils.isEmpty(windowModuleParam.getParamValue())) { DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamValue(), "paramValue", packBean); } return packBean; @@ -2419,22 +2431,23 @@ public class MesHqlPack { /** * 数据预警配置 + * * @param dataWarning * @param organizeCode * @return */ public static DdlPackBean getMesDataWarning(MesDataWarning dataWarning, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(dataWarning, organizeCode); - if(!StringUtils.isEmpty(dataWarning.getObjectCode())){ + if (!StringUtils.isEmpty(dataWarning.getObjectCode())) { DdlPreparedPack.getStringLikerPack(dataWarning.getObjectCode(), "objectCode", packBean); } - if(!StringUtils.isEmpty(dataWarning.getWarningRule())){ + if (!StringUtils.isEmpty(dataWarning.getWarningRule())) { DdlPreparedPack.getStringLikerPack(dataWarning.getWarningRule(), "warningRule", packBean); } - if(!StringUtils.isEmpty(dataWarning.getWarningItem())){ + if (!StringUtils.isEmpty(dataWarning.getWarningItem())) { DdlPreparedPack.getStringLikerPack(dataWarning.getWarningItem(), "warningItem", packBean); } - if(!StringUtils.isEmpty(dataWarning.getInformMode())){ + if (!StringUtils.isEmpty(dataWarning.getInformMode())) { DdlPreparedPack.getNumEqualPack(dataWarning.getInformMode(), "informMode", packBean); } return packBean; @@ -2458,6 +2471,7 @@ public class MesHqlPack { return result; } + /** * 封装公用查询参数 * @@ -2485,9 +2499,9 @@ public class MesHqlPack { } - /** * 按条件分页查询产品条码补打印数据 + * * @param mesProduceSn * @return */ @@ -2714,7 +2728,7 @@ public class MesHqlPack { public static DdlPackBean getDataAuthCondition(MesDataAuth dataAuth, String organizeCode) { DdlPackBean packBean; - if(dataAuth.getIsValidVal() == 0) { + if (dataAuth.getIsValidVal() == 0) { packBean = DdlPackBean.getDdlPackBean(organizeCode); } else { packBean = DdlPackBean.getDdlPackBean(organizeCode, dataAuth.getIsValidVal()); @@ -2869,6 +2883,7 @@ public class MesHqlPack { /** * 导入模板信息分页查询条件 + * * @param template * @return */ @@ -2883,6 +2898,7 @@ public class MesHqlPack { /** * 导入模板明细信息分页查询条件 + * * @param details * @return */ @@ -2945,6 +2961,7 @@ public class MesHqlPack { /** * 物料校验项 + * * @param partCheck * @param organizeCode * @return @@ -2990,6 +3007,7 @@ public class MesHqlPack { /** * MES AGV停机记录信息条件查询 + * * @param stopRecord * @return */ @@ -3093,6 +3111,7 @@ public class MesHqlPack { /** * 扩展对象配置 + * * @param extendObjectCfg * @param organizeCode * @return @@ -3116,6 +3135,7 @@ public class MesHqlPack { /** * 产品工作中心配置 + * * @param prodWorkCenter * @param organizeCode * @return @@ -3133,6 +3153,7 @@ public class MesHqlPack { /** * 客户JIT预装队列 + * * @param queueJitPlan * @param organizeCode * @return @@ -3167,6 +3188,7 @@ public class MesHqlPack { /** * 客户JIT预装队列明细 + * * @param queueJitPlanDetail * @param organizeCode * @return @@ -3184,6 +3206,7 @@ public class MesHqlPack { /** * 客户JIT预装队列BOM + * * @param queueJitPlanBom * @param organizeCode * @return diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..1d29933 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..284225c 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..7ff16c9 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..353a02b 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..b125cee 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..c9d54a9 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..39f1e2f 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..df01041 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc8fce6..c2104bf 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 6440fd2dfec34a36fcd8bda1b1aff116a95cdf4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 8 Jul 2020 09:22:37 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E9=A6=96=E6=A3=80=E3=80=81=E5=B7=A1?= =?UTF-8?q?=E6=A3=80=E6=8A=A5=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E3=80=81=E4=BA=A7=E7=BA=BF=E5=92=8C=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) 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 0d768d6..2c690ad 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 @@ -940,15 +940,6 @@ public class MesHqlPack { */ public static DdlPackBean getMesQcOrder(MesQcOrder qcOrder, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrder, organizeCode); - if (!StringUtils.isEmpty(qcOrder.getRelationOrderNo())) { - DdlPreparedPack.getStringEqualPack(qcOrder.getRelationOrderNo(), "relationOrderNo", packBean); - } - if (!StringUtils.isEmpty(qcOrder.getWorkCenterCode())) { - DdlPreparedPack.getStringEqualPack(qcOrder.getWorkCenterCode(), "workCenterCode", packBean); - } - if (!StringUtils.isEmpty(qcOrder.getProductSn())) { - DdlPreparedPack.getStringEqualPack(qcOrder.getProductSn(), "productSn", packBean); - } if (!StringUtils.isEmpty(qcOrder.getOrderNo())) { DdlPreparedPack.getStringEqualPack(qcOrder.getOrderNo(), "orderNo", packBean); } @@ -964,6 +955,12 @@ public class MesHqlPack { if (!StringUtils.isEmpty(qcOrder.getCheckType())) { DdlPreparedPack.getNumEqualPack(qcOrder.getCheckType(), "checkType", packBean); } + if (!StringUtils.isEmpty(qcOrder.getWorkCenterCode())) { + DdlPreparedPack.getNumEqualPack(qcOrder.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(qcOrder.getRelationOrderNo())) { + DdlPreparedPack.getNumEqualPack(qcOrder.getRelationOrderNo(), "relationOrderNo", packBean); + } // 时间段查询 if (!StringUtils.isEmpty(qcOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder( From 79fb42e149c511c05e2f4a07f9a5b8b6f6b9b285 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 9 Jul 2020 15:38:59 +0800 Subject: [PATCH 6/8] =?UTF-8?q?MES=5FPROD=5FBIND=5FRECORD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0mdt=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index 66ba978..94ceddd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -28,6 +28,7 @@ import java.io.Serializable; @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "KP_SN"), @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "MODIFY_DATE_TIME"), @Index(columnList = "ITEM_PART_NO") }) @Api("产品绑定记录表") From acda4c2541bd5735c287a1f68f06f6cbafbcba95 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 15 Jul 2020 19:31:58 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 932bdd9..3428e74 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-PROD-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 1d799ed294dc26fa4ff9179d1bb30c41374eb7f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 17 Jul 2020 16:31:03 +0800 Subject: [PATCH 8/8] =?UTF-8?q?2447=20=E4=B8=AD=E8=88=AA=20=E6=89=A3?= =?UTF-8?q?=E5=87=8F=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 358e5d0..359c160 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -4009,7 +4009,8 @@ public class MesPcnEnumUtil { public enum PRODUCE_ERROR_RECORD { JUMP_PROCESS(10, "跳过工序"), JUMP_STEP(20, "跳过工步"), - JUMP_STATE(30, "跳过状态点"); + JUMP_STATE(30, "跳过状态点"), + ABNORMAL_DEDUCTION(40, "扣减异常"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java index fe7b942..51f3b81 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceErrorRecord.java @@ -28,7 +28,7 @@ public class MesProduceErrorRecord extends BaseBean { private static final long serialVersionUID = 209753108845613052L; @Column(name = "ERROR_TYPE") - @ApiParam("异常类型 10:工序跳过 20:工步跳过") + @ApiParam("异常类型 10:工序跳过 20:工步跳过 40:扣料异常") private Integer errorType; @Column(name = "SERIAL_NUMBER") @@ -63,5 +63,8 @@ public class MesProduceErrorRecord extends BaseBean { @ApiParam("状态点代码") private String statusCode; + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常内容") + private String errorMessage; }