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 01/87] =?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 02/87] =?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 03/87] =?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 04/87] =?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 05/87] =?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 06/87] =?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 25382f0265f2a2574680d5bc15d4f4ddc18cf91d Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 13 Jul 2020 23:40:27 +0800 Subject: [PATCH 07/87] Fix Bug #2357,2358 --- .../pojo/mes/bean/MesScatterPartProdCfg.java | 4 +++ .../pojo/model/mes/TorqueCollectionModel.java | 31 +++++++++++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java index c443ad0..ffdb270 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java @@ -165,4 +165,8 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable { @Column(name = "MULTIMEDIA_PLUG_QTY") @ApiParam("多媒体插头数量") private Double multimediaPlusQty; + + @Column(name = "QUALIFIED_COUNT") + @ApiParam("应收合格数") + private Double qualifiedCount; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java index fc9bff7..5a874ab 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java @@ -88,6 +88,9 @@ public class TorqueCollectionModel implements Serializable { @ApiParam("确认扫描次数") private Integer checkScanCount; + @ApiParam("实际确认扫描次数") + private Integer actualCheckScanCount; + @ApiParam("组合码发送顺序") private Integer sendSeq; @@ -103,8 +106,31 @@ public class TorqueCollectionModel implements Serializable { @ApiParam("是否黄枪") private Integer isYellowGun; + @ApiParam("应收合格数") + private Double qualifiedCount; + + @ApiParam("实际合格数") + private Double actualQualifiedCount; + + @ApiParam("工步信息行颜色") + private String color; + + @ApiParam("扭矩显示信息") + private String torqueInfo; + @ApiParam("扭矩颜色") + private String torqueColor; + + @ApiParam("绑定关键件信息") + private String bindPartKeyInfo; + @ApiParam("绑定关键件颜色") + private String bindPartKeyColor; + + @ApiParam("是否大枪") + private Integer isPf; + /** * 大枪查询结果构造方法 + * * @param vinCode * @param prodCfgTypeCode * @param gradeCode @@ -120,7 +146,7 @@ public class TorqueCollectionModel implements Serializable { */ public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo, String partName, Integer torqueNo, Integer checkScanCount, Integer sendSeq, - Integer yellowGunRule, Integer isEndSeq, String groupCode) { + Integer yellowGunRule, Integer isEndSeq, String groupCode, Integer isPf, Double qualifiedCount) { this.vinCode = vinCode; this.prodCfgTypeCode = prodCfgTypeCode; this.gradeCode = gradeCode; @@ -133,10 +159,13 @@ public class TorqueCollectionModel implements Serializable { this.yellowGunRule = yellowGunRule; this.isEndSeq = isEndSeq; this.groupCode = groupCode; + this.isPf = isPf; + this.qualifiedCount = qualifiedCount; } /** * 小枪结果数据构造方法 + * * @param vinCode * @param prodCfgTypeCode * @param gradeCode From e5cd6692d49020c3a178156f7e840c0043dfc3e3 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 14 Jul 2020 00:43:51 +0800 Subject: [PATCH 08/87] Finish Task #2359 --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 58 ++++++++++++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java | 4 ++ 2 files changed, 62 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 cc7e9ae..e0b81de 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 @@ -6691,4 +6691,62 @@ public class MesEnumUtil { return tmp; } } + + /** + * QAD 解析对象 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QAD_DATA_OBJECT { + BOM("soapenv#Envelope#SyncBOM", "getBomList", "MesBom","BOM"), + CUSTOMER_PART("soapenv#Envelope#SyncCustomerItem","getCustomerPartList", "MesCustomerPart","客户物料号"), + CUSTOMER("soapenv#Envelope#SyncCustomer","getCustomerList", "MesCustomer","客户信息"), + PART("soapenv#Envelope#SyncItem","getPartList", "MesPart","物料信息"); + + private String code; + private String method; + private String objectCode; + private String description; + + QAD_DATA_OBJECT(String code, String method, String objectCode, String description) { + this.code = code; + this.method = method; + this.objectCode = objectCode; + this.description = description; + } + + public String getCode() { + return code; + } + + public String getMethod() { + return method; + } + + public String getObjectCode() { + return objectCode; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static QAD_DATA_OBJECT getByCode(String code) { + for (QAD_DATA_OBJECT qadDataObject : values()) { + if (qadDataObject.getCode().equals(code)) { + return qadDataObject; + } + } + return null; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java index 8298ef7..700a5cb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java @@ -81,6 +81,10 @@ public class MesBom extends BaseBean implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String effEndTime; + @Column(name = "BOM_CODE") + @ApiParam("BOM代码") + private String bomCode; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From 4260316f62065f62c0d27c0d98432fd72dcb49fd Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 14 Jul 2020 01:43:24 +0800 Subject: [PATCH 09/87] test merge dev --- 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-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 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..1e17935 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..37b8a51 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index aca1465..0a44fb0 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index a6a0d68..ba89b61 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..fdcf6e3 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..60d9861 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..54c8306 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..190efa7 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..5896851 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..80498fc 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..076f15a 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..1351ed3 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..67b0bff 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..15d36cd 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc8fce6..2eddf76 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 7e48674d9e1af8ade7cc5ba7be24ba8b9723ff1d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 14 Jul 2020 01:52:28 +0800 Subject: [PATCH 10/87] dev merge test --- 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-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 +- 20 files changed, 20 insertions(+), 20 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 1e17935..d2521de 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 37b8a51..b599490 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 0a44fb0..aca1465 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 6df1cc2..ae38208 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 ba89b61..a6a0d68 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 fdcf6e3..04b40d4 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 d266163..6854e65 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 60d9861..ac387fd 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 54c8306..bbe0ff9 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 190efa7..be533a6 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 5896851..14e8567 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 aa3dd42..102ab0e 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 80498fc..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..e755225 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 1351ed3..194f0cb 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 67b0bff..60543fe 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 15d36cd..bdc4cab 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 2eddf76..cc8fce6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From c0cf08fa19497d9a127240efb9f96554c5241bf7 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 14 Jul 2020 15:43:07 +0800 Subject: [PATCH 11/87] =?UTF-8?q?=E3=80=909556=20=E6=AC=A7=E6=B4=B2-RFID?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95-?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=B1=BB=E5=9E=8B=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java index 2a808e1..7c99fe0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java @@ -41,7 +41,7 @@ public class WmsRfidOperateRecord extends BaseBean { @Column(name="OPERATE_TYPE") @ApiParam("操作类型") @AnnoOutputColumn(refClass = WmsEnumUtil.PACKAGE_TYPE.class) - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "PACKAGE_TYPE") public Integer operateType; @Column(name="SRC_LOCATE") From 1c93d2181511f4dfe13cec3ea4dec45c599055c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 14 Jul 2020 18:37:53 +0800 Subject: [PATCH 12/87] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5BIN?= =?UTF-8?q?=5FNO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 46 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java | 2 +- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 336731e..e540c1a 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 @@ -4331,4 +4331,50 @@ public class MesPcnEnumUtil { return valueOf(val); } } + + /** + * MES_产品颜色 类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_COLOR_TYPE { + + PRODUCT_COLOR(10, "产品颜色"), + MATERIAL_COLOR(20, "物料颜色"); + + private int value; + private String description; + + MES_COLOR_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java index 001ffe6..6e95a4a 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java @@ -47,7 +47,7 @@ public class IfPickData extends BaseBean implements Serializable { @ApiParam("物料编号") private String partNo; - @Column(name = "BIN位代码") + @Column(name = "BIN_NO") @ApiParam("物料编号") private String binNo; From f99c5232be9177fc1e5f6dfe50b3a24cab096515 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 14 Jul 2020 21:12:12 +0800 Subject: [PATCH 13/87] =?UTF-8?q?=E3=80=902388=2007=201.2.3.6.2=E6=AC=A7?= =?UTF-8?q?=E6=B4=B2WMS-PCR-=E6=82=AC=E6=8C=82=E9=93=BE=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 150 +++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsSuspenStockSync.java | 117 ++++++++++++++++ .../repository/WmsSuspenStockSyncRepository.java | 16 +++ 3 files changed, 283 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSuspenStockSyncRepository.java 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 e1371ad..44a3c2a 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 @@ -8709,4 +8709,154 @@ public class WmsEnumUtil { return null; } } + + /** + * 悬挂链库存同步状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SUSPEN_STOCK_SYNC_STATUS { + CREATE(10, "CREATE", "创建"), + HANDLED(20, "HANDLED", "已处理"), + HANDLE_ERROR(30, "HANDLE_ERROR", "处理错误"), + PLC_HANDLE_OUTITME(40, "PLC_HANDLE_OUTITME", "PLC处理超时"), + SRC_DATA_ERROR(50, "SRC_DATA_ERROR", "来源数据解析错误"); + + private String code; + private String description; + int value; + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + SUSPEN_STOCK_SYNC_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static SUSPEN_STOCK_SYNC_STATUS codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } + + /** + * 悬挂链库存同步数据来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SUSPEN_STOCK_SYNC_DATA_SRC { + IP(10, "IP", "IP"), + DF(20, "DF", "DF"), + DR(30, "DR", "DR"); + + int value; + private String code; + private String description; + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + SUSPEN_STOCK_SYNC_DATA_SRC(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static SUSPEN_STOCK_SYNC_DATA_SRC codeOf(String code) { + if (StringUtils.isEmpty(code)) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equalsIgnoreCase(code)) { + return values()[i]; + } + } + } + return null; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java new file mode 100644 index 0000000..0470492 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSuspenStockSync.java @@ -0,0 +1,117 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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.Index; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; +import java.util.Map; + +/** + * @Description : 悬挂链库存同步数据 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-07-14 9:53 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_SUSPEN_STOCK_SYNC", indexes = { + @Index(columnList = "ORGANIZE_CODE") +}) +@Api("悬挂链库存同步数据") +public class WmsSuspenStockSync extends BaseBean { + + @Column(name = "SRC") + @ApiParam(value = "数据来源") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String src; + + @Column(name = "SERVER_URL") + @ApiParam(value = "服务地址") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String serverUrl; + + @Column(name = "LOCATE_NO") + @ApiParam(value = "库位号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String locateNo; + + @Column(name = "PART_NO_A") + @ApiParam(value = "物料号A") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partNoA; + + @Column(name = "PART_NO_B") + @ApiParam(value = "物料号B") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partNoB; + + @Column(name = "QTY_A") + @ApiParam(value = "数量A") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private Double qtyA; + + @Column(name = "qty_b") + @ApiParam(value = "数量B") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private Double qtyB; + + @Column(name = "LOT_NO_A") + @ApiParam(value = "批次A") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String lotNoA; + + @Column(name = "LOT_NO_B") + @ApiParam(value = "批次B") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String lotNoB; + + @Column(name = "STATUS") + @ApiParam(value = "状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.SUSPEN_STOCK_SYNC_STATUS.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer status; + + @Column(name = "ERROR_MSG") + @ApiParam(value = "错误信息") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String errorMsg; + + @Transient + @ApiParam(value = "物料数组集") + private String[] partNos; + + @Transient + @ApiParam(value = "数量数组集") + private Double[] qtys; + + @Transient + @ApiParam(value = "批次数组集") + private String[] lotNos; + + @Transient + @ApiParam(value = "物料数据List") + private List partList; + + @Transient + @ApiParam(value = "物料数据Map") + private Map partNameMap; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSuspenStockSyncRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSuspenStockSyncRepository.java new file mode 100644 index 0000000..f4dd112 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSuspenStockSyncRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsSuspenStockSync; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-07-14 10:33 + * @Modify: + **/ +@Repository +public interface WmsSuspenStockSyncRepository extends BaseRepository { +} From cc4d17a81f94837ccd1aadc7df4c553e653722da Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 14 Jul 2020 23:03:20 +0800 Subject: [PATCH 14/87] =?UTF-8?q?=E5=A4=A7=E6=9E=AAok=20bug=209492?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java | 2 +- .../java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index c0251f8..47cd239 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -52,7 +52,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @Column(name = "SEQ") @ApiParam("排序号") - private Double seq; + private String seq; @Column(name = "STATUS") @ApiParam("状态") diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java index 5a874ab..cc36f93 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java @@ -112,6 +112,9 @@ public class TorqueCollectionModel implements Serializable { @ApiParam("实际合格数") private Double actualQualifiedCount; + @ApiParam("是否已经发送了新的组合码") + private boolean hasSendAsciiWhenYellow; + @ApiParam("工步信息行颜色") private String color; From 538b224f67f198802d726127605c22b920d929b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 15 Jul 2020 00:31:44 +0800 Subject: [PATCH 15/87] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=A4=96=E6=9D=A1=E7=A0=81=E8=AF=86=E5=88=AB=E4=B8=8A=E7=BA=BF?= =?UTF-8?q?-PCR=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/model/OnLineSnModel.java | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OnLineSnModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OnLineSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OnLineSnModel.java new file mode 100644 index 0000000..94d0db4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OnLineSnModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 动作请求参数 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +public class OnLineSnModel { + + @ApiParam("扫描信息") + private String scanInfo; + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("用户信息") + private String userInfo; + +} From ec87065eb56edccefc185ecda5b879d3b1a034d1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 15 Jul 2020 09:19:36 +0800 Subject: [PATCH 16/87] if pick data --- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java index 6e95a4a..e3bf5e0 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java @@ -48,7 +48,7 @@ public class IfPickData extends BaseBean implements Serializable { private String partNo; @Column(name = "BIN_NO") - @ApiParam("物料编号") + @ApiParam("BIN位代码") private String binNo; @Column(name = "QTY") From 860f6d11f07e460d0da182780b5c592ef72efe10 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 15 Jul 2020 09:31:26 +0800 Subject: [PATCH 17/87] Finish Task #2080 Cost:8h --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 6 ++++-- 1 file changed, 4 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 e1371ad..02188d9 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 @@ -194,7 +194,8 @@ public class WmsEnumUtil { SUB(20, "SUB", "委外采购"), TAR(30, "TAR", "多角贸易采购"), TAP(40, "TAP", "多角代采购"), - AMP(50, "AMP", "AMP收货"); + AMP(50, "AMP", "AMP收货"), + INNER(60, "INNER", "内部收货"); private int value; private String code; @@ -790,7 +791,8 @@ public class WmsEnumUtil { CONTAINER_OUTSTORE(560, "CONTAINER_OUTSTORE", "AGV料车出库"), CONTAINER_INSTORE(570, "CONTAINER_INSTORE", "AGV料车入库"), AGV_PART_NO_OUT(580, "AGV_PART_NO_OUT", "AGV物料出库"), - FORKLIFT_PART_NO_OUT(590, "FORKLIFT_PART_NO_OUT", "PAD物料出库"); + FORKLIFT_PART_NO_OUT(590, "FORKLIFT_PART_NO_OUT", "PAD物料出库"), + INTERNAL_SHIPPING(600, "INTERNAL_SHIPPING", "内部发运"); private int value; private String code; private String description; From df125e71b9d786c690482b152c0d8b8089000556 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 15 Jul 2020 10:39:41 +0800 Subject: [PATCH 18/87] =?UTF-8?q?=E6=B3=B0=E5=9B=BD=E7=BF=BB=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 1a11e38..0d6a7ec 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -11,7 +11,12 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.persistence.Version; /** * @Description : 库存移动单条码信息 @@ -163,6 +168,10 @@ public class WmsMoveSn extends BaseBean { @ApiParam("供应商编号") private String vendorNo; + @Column(name = "SRC_SN") + @ApiParam("原条码") + public String srcSn; + @Transient @ApiParam("业务类型编码") @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") From e1b3b14a368a9977305d84dd6b3b84c8a59dbcc3 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 15 Jul 2020 12:27:27 +0800 Subject: [PATCH 19/87] test merge dev --- 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-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 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..1e17935 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..37b8a51 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index aca1465..0a44fb0 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index a6a0d68..ba89b61 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..fdcf6e3 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..60d9861 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..54c8306 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..190efa7 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..5896851 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..80498fc 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..076f15a 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..1351ed3 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..67b0bff 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..15d36cd 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc8fce6..2eddf76 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 300e308394c5f420ee7a156d06a3e26fec1b75e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 15 Jul 2020 15:36:46 +0800 Subject: [PATCH 20/87] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=B2=E6=A3=80?= =?UTF-8?q?=E8=A7=84=E5=88=99=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index e0b81de..c2cf91f 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 @@ -1965,7 +1965,8 @@ public class MesEnumUtil { ENCODE_RULE_MAP(470, "mesEncodeRuleMapExcelService", "编码规则映射导入"), SCATTER_PART_PROD_CFG(480, "scatterPartProdCfgExcelService", "散件零件生产配置"), MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"), - MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系"); + MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系"), + BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"); private int value; private String service; From b69fcdc0c665d244ec0fb53289a6a907f63c6384 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 15 Jul 2020 18:49:38 +0800 Subject: [PATCH 21/87] Finish Task #2399 Cost:6h --- .../estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 9 +++++++++ .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 5 +++-- .../i3plus/pojo/mes/bean/MesScatterPartProdCfg.java | 4 ++++ .../cn/estsh/i3plus/pojo/mes/model/SoapModel.java | 20 ++++++++++++++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SoapModel.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 c2cf91f..fc9ae03 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 @@ -6741,6 +6741,15 @@ public class MesEnumUtil { return tmp; } + public static QAD_DATA_OBJECT getByObjectCode(String objectCode) { + for (QAD_DATA_OBJECT qadDataObject : values()) { + if (qadDataObject.getObjectCode().equals(objectCode)) { + return qadDataObject; + } + } + return null; + } + public static QAD_DATA_OBJECT getByCode(String code) { for (QAD_DATA_OBJECT qadDataObject : values()) { if (qadDataObject.getCode().equals(code)) { 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 e540c1a..a9d036e 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 @@ -3763,8 +3763,9 @@ public class MesPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum VERIFY_MODE { - PART_NO("10", "按物料号匹配"), - WORK_CENTER_CODE("20", "按产线匹配"); + PART_NO_BY_BOM("10", "按物料号匹配By-Bom"), + WORK_CENTER_CODE_BY_BOM("20", "按产线匹配By-Bom"), + WORK_CENTER_CODE_BY_SCATTER("30", "按产线匹配By-Scatter"); private String value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java index ffdb270..cec7195 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java @@ -169,4 +169,8 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable { @Column(name = "QUALIFIED_COUNT") @ApiParam("应收合格数") private Double qualifiedCount; + + @Column(name = "IS_CHECK") + @ApiParam("是否复核校验") + private Integer isCheck; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SoapModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SoapModel.java new file mode 100644 index 0000000..dd94176 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SoapModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/15 1:35 下午 + * @Modify: + */ +@Data +public class SoapModel { + + private String soapJson; + + private List> soapList; +} From acda4c2541bd5735c287a1f68f06f6cbafbcba95 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 15 Jul 2020 19:31:58 +0800 Subject: [PATCH 22/87] =?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 dffdf884710ed93f1a3075681c320071e718f0c3 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 15 Jul 2020 20:36:48 +0800 Subject: [PATCH 23/87] =?UTF-8?q?=E3=80=909556=20=E6=AC=A7=E6=B4=B2-RFID?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95-?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=B1=BB=E5=9E=8B=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java index 7c99fe0..8efb843 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRfidOperateRecord.java @@ -40,8 +40,8 @@ public class WmsRfidOperateRecord extends BaseBean { @Column(name="OPERATE_TYPE") @ApiParam("操作类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.PACKAGE_TYPE.class) - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "PACKAGE_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.RFID_OPERATE_TYPE.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "RFID_OPERATE_TYPE") public Integer operateType; @Column(name="SRC_LOCATE") From 6750f114597aea715325280e3bac2075906497a3 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 15 Jul 2020 21:57:03 +0800 Subject: [PATCH 24/87] =?UTF-8?q?=E3=80=902388=2007=201.2.3.6.2=E6=AC=A7?= =?UTF-8?q?=E6=B4=B2WMS-PCR-=E6=82=AC=E6=8C=82=E9=93=BE=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsSuspenStockSyncModel.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSuspenStockSyncModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSuspenStockSyncModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSuspenStockSyncModel.java new file mode 100644 index 0000000..cc87941 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSuspenStockSyncModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : 定时同步悬挂链库存数据JOB + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-07-15 14:47 + * @Modify: + **/ +@Data +public class WmsSuspenStockSyncModel implements Serializable { + + private static final long serialVersionUID = -6690672187776424774L; + + private String src;// 来源数据 + private String serverUrl;//地址 + private Integer namespaceIndex;//命名空间索引，默认为2 + private String userName;//用户名 + private String password;//密码 + private Double requestInterval;//请求间隔,默认为500 + private String readTagName;//读的地址 + private String partTagNameA;//物料号A + private String partTagNameB;//物料号B + private String qtyTagNameA;//数量A + private String qtyTagNameB;//数量B + private String lotNoTagNameA;//批次A + private String lotNoTagNameB;//批次B + private String locateTagName;//库位代码 + private Integer plcExeOutTime;//超时时间 + private String ackTagName;//修改的地址 + private Integer tagValueType;//数据类型 +} From 12520276852471531b20690765b4d91cb8767b1c Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 16 Jul 2020 00:00:49 +0800 Subject: [PATCH 25/87] =?UTF-8?q?dl=E5=B0=8F=E6=9E=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/bean/MesScatterPartProdCfg.java | 48 ++++++------- .../cn/estsh/i3plus/pojo/model/mes/PsetModel.java | 22 ++++++ .../pojo/model/mes/TorqueCollectionModel.java | 82 ++++++++++++++-------- 3 files changed, 99 insertions(+), 53 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/PsetModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java index ffdb270..308b6b8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java @@ -86,37 +86,37 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable { @ApiParam("防错码长度") private Integer pokeYokeLength; - @Column(name = "PEST1") - @ApiParam("PEST编码1") - private String pest1; + @Column(name = "PSET1") + @ApiParam("PSET1") + private String pset1; - @Column(name = "PEST2") - @ApiParam("PEST编码2") - private String pest2; + @Column(name = "PSET2") + @ApiParam("PSET2") + private String pset2; - @Column(name = "PEST3") - @ApiParam("PEST编码3") - private String pest3; + @Column(name = "PSET3") + @ApiParam("PSET3") + private String pset3; - @Column(name = "PEST4") - @ApiParam("PEST编码4") - private String pest4; + @Column(name = "PSET4") + @ApiParam("PSET4") + private String pset4; - @Column(name = "PEST5") - @ApiParam("PEST编码5") - private String pest5; + @Column(name = "PSET5") + @ApiParam("PSET5") + private String pset5; - @Column(name = "PEST6") - @ApiParam("PEST编码6") - private String pest6; + @Column(name = "PSET6") + @ApiParam("PSET6") + private String pset6; - @Column(name = "PEST7") - @ApiParam("PEST编码7") - private String pest7; + @Column(name = "PSET7") + @ApiParam("PSET7") + private String pset7; - @Column(name = "PEST8") - @ApiParam("PEST编码8") - private String pest8; + @Column(name = "PSET8") + @ApiParam("PSET8") + private String pset8; @Column(name = "TORQUE_NO") @ApiParam("扭矩枪编号") diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/PsetModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/PsetModel.java new file mode 100644 index 0000000..9547b4c --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/PsetModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.model.mes; + +import lombok.AllArgsConstructor; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/7/15 21:43 + * @desc + */ +@Data +@AllArgsConstructor +public class PsetModel { + + private String psetName; + + private Integer psetNum; + + private Integer psetCount; + + private boolean torqueStatus; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java index cc36f93..b3cf6be 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java @@ -5,6 +5,10 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** * @Description : MES扭矩采集模型 @@ -38,37 +42,37 @@ public class TorqueCollectionModel implements Serializable { private String partName; @ApiParam("PEST编码1") - private Integer pest1; + private Integer pset1; @ApiParam("PEST编码2") - private Integer pest2; + private Integer pset2; @ApiParam("PEST编码3") - private Integer pest3; + private Integer pset3; @ApiParam("PEST编码4") - private Integer pest4; + private Integer pset4; @ApiParam("PEST编码5") - private Integer pest5; + private Integer pset5; @ApiParam("PEST编码6") - private Integer pest6; + private Integer pset6; @ApiParam("PEST编码7") - private Integer pest7; + private Integer pset7; @ApiParam("PEST编码8") - private Integer pest8; + private Integer pset8; @ApiParam("扭矩枪编号") private Integer torqueNo; @ApiParam("PEST号") - private Integer pestNum; + private Integer psetNum; @ApiParam("PEST数量") - private Integer pestCount; + private Integer psetCount; /** * 1-未采集， 2-已采集, 3-无需打扭矩 @@ -131,6 +135,11 @@ public class TorqueCollectionModel implements Serializable { @ApiParam("是否大枪") private Integer isPf; + @ApiParam("psets总数") + private Integer psetSum; + + private Map psets = new LinkedHashMap<>(); + /** * 大枪查询结果构造方法 * @@ -175,34 +184,49 @@ public class TorqueCollectionModel implements Serializable { * @param colorCode * @param partNo * @param partName - * @param pest1 - * @param pest2 - * @param pest3 - * @param pest4 - * @param pest5 - * @param pest6 - * @param pest7 - * @param pest8 + * @param pset1 + * @param pset2 + * @param pset3 + * @param pset4 + * @param pset5 + * @param pset6 + * @param pset7 + * @param pset8 * @param torqueNo */ public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, - String colorCode, String partNo, String partName, Integer pest1, Integer pest2, - Integer pest3, Integer pest4, Integer pest5, Integer pest6, Integer pest7, Integer pest8, - Integer torqueNo) { + String colorCode, String partNo, String partName, Integer pset1, Integer pset2, + Integer pset3, Integer pset4, Integer pset5, Integer pset6, Integer pset7, Integer pset8, + Integer torqueNo, Integer sendSeq, Integer checkScanCount) { this.vinCode = vinCode; this.prodCfgTypeCode = prodCfgTypeCode; this.gradeCode = gradeCode; this.colorCode = colorCode; this.partNo = partNo; this.partName = partName; - this.pest1 = pest1; - this.pest2 = pest2; - this.pest3 = pest3; - this.pest4 = pest4; - this.pest5 = pest5; - this.pest6 = pest6; - this.pest7 = pest7; - this.pest8 = pest8; + this.pset1 = pset1; + this.pset2 = pset2; + this.pset3 = pset3; + this.pset4 = pset4; + this.pset5 = pset5; + this.pset6 = pset6; + this.pset7 = pset7; + this.pset8 = pset8; this.torqueNo = torqueNo; + this.sendSeq = sendSeq; + this.checkScanCount = checkScanCount; + assemblePsets(); } + + private void assemblePsets() { + psets.put("pset1", new PsetModel("pset1", 1, this.pset1, false)); + psets.put("pset2", new PsetModel("pset2", 2, this.pset2, false)); + psets.put("pset3", new PsetModel("pset3", 3, this.pset3, false)); + psets.put("pset4", new PsetModel("pset4", 4, this.pset4, false)); + psets.put("pset5", new PsetModel("pset5", 5, this.pset5, false)); + psets.put("pset6", new PsetModel("pset6", 6, this.pset6, false)); + psets.put("pset7", new PsetModel("pset7", 7, this.pset7, false)); + psets.put("pset8", new PsetModel("pset8", 8, this.pset8, false)); + } + } From 5d62ebf26f6439fc33c0e8a7757be4581fec98c2 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 16 Jul 2020 10:39:14 +0800 Subject: [PATCH 26/87] =?UTF-8?q?Finish=20Task=20#2424=20Cost:8h=202424=20?= =?UTF-8?q?07=201.2.3.7.1=E6=96=B0=E5=A2=9E=E6=A3=80=E6=9F=A5=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E5=8C=85=E8=A3=85=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 7 ++++--- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 10 ++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 0d6a7ec..d3a2c16 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -81,6 +81,7 @@ public class WmsMoveSn extends BaseBean { @ApiParam("备注") public String remark; + @Column(name = "LOT_NO") @ApiParam("批次编号") public String lotNo; @@ -168,9 +169,9 @@ public class WmsMoveSn extends BaseBean { @ApiParam("供应商编号") private String vendorNo; - @Column(name = "SRC_SN") - @ApiParam("原条码") - public String srcSn; + @Column(name = "SERIAl_SN") + @ApiParam("产品条码") + public String serialSn; @Transient @ApiParam("业务类型编码") 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 a3f367b..e13269d 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 @@ -799,5 +799,15 @@ public class WmsStockSn extends BaseBean { this.color = color; } + public WmsStockSn(String packageNo, Double qty, String qualityDate, String lotNo, String dateCode, String leftCode, String fixLotNo) { + this.packageNo = packageNo; + this.qty = qty; + this.qualityDate = qualityDate; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.leftCode = leftCode; + this.fixLotNo = fixLotNo; + } + } From 9a516f893fdf6e859b4b1496699d2e42fc580732 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 16 Jul 2020 11:10:17 +0800 Subject: [PATCH 27/87] =?UTF-8?q?=E5=90=88=E5=B9=B6dev=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=88=B0test?= 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-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 +- 20 files changed, 20 insertions(+), 20 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 1e17935..d2521de 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 37b8a51..b599490 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 0a44fb0..aca1465 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 6df1cc2..ae38208 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 ba89b61..a6a0d68 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 fdcf6e3..04b40d4 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 d266163..6854e65 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 60d9861..ac387fd 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 54c8306..bbe0ff9 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 190efa7..be533a6 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 5896851..14e8567 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 aa3dd42..102ab0e 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 80498fc..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..e755225 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 1351ed3..194f0cb 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 67b0bff..60543fe 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 15d36cd..bdc4cab 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 2eddf76..cc8fce6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 19e16c623e85532960c61d3fb6a646d8717b82d2 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 16 Jul 2020 11:14:14 +0800 Subject: [PATCH 28/87] =?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 0786d8d..268eaf2 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-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 2e5ab2cdcd685a0fb3b1c511d51e8916449c4253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 16 Jul 2020 13:05:07 +0800 Subject: [PATCH 29/87] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E5=A4=96=E4=B8=8A?= =?UTF-8?q?=E7=BA=BF=E6=B7=BB=E5=8A=A0=E8=B5=8B=E5=80=BC=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/MesPcnEnumUtil.java | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) 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 a9d036e..df68d86 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 @@ -4378,4 +4378,49 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 选配类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OPTION_TYPE { + OPTION(10, "选配件"), + BOM_DISASSEMBLY(20, "BOM拆解"); + + private int value; + private String description; + + OPTION_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static 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; + } + } } From 34a9cbe0ac4cdd6bba13ac5d56a910bdb71e362e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 16 Jul 2020 14:26:12 +0800 Subject: [PATCH 30/87] =?UTF-8?q?=E4=BF=AE=E6=94=B9PTL=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/ptl/bean/PtlTime.java | 40 +++++++++++++++++++ .../i3plus/pojo/ptl/model/PojoFieldModel.java | 46 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/ptl/model/PojoModel.java | 36 +++++++++++++++++ .../pojo/ptl/repository/PtlTimeRepository.java | 10 +++++ 4 files changed, 132 insertions(+) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTime.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PojoFieldModel.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PojoModel.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTimeRepository.java diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTime.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTime.java new file mode 100644 index 0000000..7033251 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTime.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.ptl.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; + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TIME") +@Api("工步参数") +public class PtlTime extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6674121566943415827L; + @Column(name = "MODULE") + @ApiParam("组件") + private String module; + + @Column(name = "ELAPSE") + @ApiParam("耗时") + private Long elapse; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PojoFieldModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PojoFieldModel.java new file mode 100644 index 0000000..18ad42e --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PojoFieldModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : PojoField模型 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2020-04-28 + * @Modify: + * @Modify: + **/ +@Data +public class PojoFieldModel implements Serializable { + + private static final long serialVersionUID = 366939009033748970L; + @ApiParam(value ="属性名") + private String fieldName; + + @ApiParam(value ="属性类型") + private String fieldType; + + @ApiParam(value ="属性描述") + private String fieldDesc; + + @ApiParam(value ="字段名称") + private String fieldColumnName; + + @ApiParam(value = "数据来源") + private String dataSrc; + + @ApiParam(value = "开窗列表显示列名称") + private String listColumnName; + + @ApiParam(value = "开窗搜索列名称") + private String searchColumnName; + + @ApiParam(value = "回显列名") + private String explicitColumnName; + + @ApiParam(value = "下拉框规则") + private Integer selectRule; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PojoModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PojoModel.java new file mode 100644 index 0000000..bd59909 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PojoModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : Pojo模型 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2020-04-28 + * @Modify: + **/ +@Data +public class PojoModel implements Serializable { + private static final long serialVersionUID = -3491931203656275910L; + @ApiParam(value ="包名") + private String packageName; + + @ApiParam(value ="POJO类名") + private String simpleName; + + @ApiParam(value ="POJO类全名") + private String fullName; + + @ApiParam(value ="表名称名") + private String tableName; + + @ApiParam(value ="POJO类描述") + private String pojoDesc; + + @ApiParam(value ="属性集合") + private List fieldList; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTimeRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTimeRepository.java new file mode 100644 index 0000000..6aabb25 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTimeRepository.java @@ -0,0 +1,10 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlTime; +import org.springframework.stereotype.Repository; + +@Repository +public interface PtlTimeRepository extends BaseRepository { +} From bd3e32d39ee13b074cd5110f152aa3331d5907d2 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 16 Jul 2020 15:36:51 +0800 Subject: [PATCH 31/87] =?UTF-8?q?=E5=B0=8F=E6=9E=AA=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/mes/PsetModel.java | 2 ++ .../i3plus/pojo/model/mes/TorqueCollectionModel.java | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/PsetModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/PsetModel.java index 9547b4c..2ca1917 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/PsetModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/PsetModel.java @@ -18,5 +18,7 @@ public class PsetModel { private Integer psetCount; + private Integer actualCount; + private boolean torqueStatus; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java index b3cf6be..374d58e 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java @@ -219,14 +219,14 @@ public class TorqueCollectionModel implements Serializable { } private void assemblePsets() { - psets.put("pset1", new PsetModel("pset1", 1, this.pset1, false)); - psets.put("pset2", new PsetModel("pset2", 2, this.pset2, false)); - psets.put("pset3", new PsetModel("pset3", 3, this.pset3, false)); - psets.put("pset4", new PsetModel("pset4", 4, this.pset4, false)); - psets.put("pset5", new PsetModel("pset5", 5, this.pset5, false)); - psets.put("pset6", new PsetModel("pset6", 6, this.pset6, false)); - psets.put("pset7", new PsetModel("pset7", 7, this.pset7, false)); - psets.put("pset8", new PsetModel("pset8", 8, this.pset8, false)); + psets.put("pset1", new PsetModel("pset1", 1, this.pset1, 0, false)); + psets.put("pset2", new PsetModel("pset2", 2, this.pset2, 0, false)); + psets.put("pset3", new PsetModel("pset3", 3, this.pset3, 0, false)); + psets.put("pset4", new PsetModel("pset4", 4, this.pset4, 0, false)); + psets.put("pset5", new PsetModel("pset5", 5, this.pset5, 0, false)); + psets.put("pset6", new PsetModel("pset6", 6, this.pset6, 0, false)); + psets.put("pset7", new PsetModel("pset7", 7, this.pset7, 0, false)); + psets.put("pset8", new PsetModel("pset8", 8, this.pset8, 0, false)); } } From 6dd0614533e02ae2ab6dacdccb1aa227179dc6af Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 16 Jul 2020 17:34:58 +0800 Subject: [PATCH 32/87] =?UTF-8?q?=E3=80=90=E6=AC=A7=E6=B4=B2-=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E6=82=AC=E6=8C=82=E9=93=BE=E6=B1=87=E6=80=BB=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=BA=93=E5=AD=98=E6=95=B0=E6=8D=AEJOB-=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 74 ---------------------- 1 file changed, 74 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 a84bb2b..0c538e3 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 @@ -8787,78 +8787,4 @@ public class WmsEnumUtil { return null; } } - - /** - * 悬挂链库存同步数据来源 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SUSPEN_STOCK_SYNC_DATA_SRC { - IP(10, "IP", "IP"), - DF(20, "DF", "DF"), - DR(30, "DR", "DR"); - - int value; - private String code; - private String description; - - public int getValue() { - return value; - } - - public String getCode() { - return code; - } - - public String getDescription() { - return description; - } - - SUSPEN_STOCK_SYNC_DATA_SRC(int value, String code, String description) { - this.value = value; - this.code = code; - this.description = description; - } - - public static String valueOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - - public static String valueOfDescription(int val) { - return valueOf(val); - } - - public static int descriptionOfValue(String desc) { - return descOf(desc); - } - - - public static int descOf(String desc) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(desc)) { - tmp = values()[i].value; - } - } - return tmp; - } - - public static SUSPEN_STOCK_SYNC_DATA_SRC codeOf(String code) { - if (StringUtils.isEmpty(code)) { - return null; - } else { - for (int i = 0; i < values().length; i++) { - if (values()[i].code.equalsIgnoreCase(code)) { - return values()[i]; - } - } - } - return null; - } - } } From f5b4c666bf29792cfda90b8f85f6639098062b9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 16 Jul 2020 17:40:33 +0800 Subject: [PATCH 33/87] =?UTF-8?q?=E3=80=90=E5=A4=A9=E6=B4=A5bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=209627,9615,9614,9610,9585,9445,9439,9428,9421,9401?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java | 10 ++++++++++ .../java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java | 3 +++ 2 files changed, 13 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java index b554be7..15c9efe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java @@ -60,6 +60,9 @@ public class ProdPackModel implements Serializable { @ApiParam("物料号") public String parentPartNo; + @ApiParam("是否封箱") + public Integer isSealed; + public ProdPackModel() { } @@ -77,4 +80,11 @@ public class ProdPackModel implements Serializable { this.printStatus = printStatus; this.modifyDatetime = modifyDatetime; } + + public ProdPackModel(Integer isSealed,String serialNumber, String packageNo, String createDatetime) { + this.isSealed = isSealed; + this.serialNumber = serialNumber; + this.packageNo = packageNo; + this.createDatetime = createDatetime; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java index f039ece..4ce479b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java @@ -62,4 +62,7 @@ public class StationResultBean implements Serializable { @ApiParam("工位参数") private Map wcpcMap = new HashMap<>(); + + @ApiParam("定时秒数") + private Integer timer; } From 7533a3ef443ad2179f52b1d4b7a6289526592a14 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 16 Jul 2020 18:56:15 +0800 Subject: [PATCH 34/87] =?UTF-8?q?[=E4=BB=BB=E5=8A=A12408]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java index 16d16db..ef91b1e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java @@ -37,10 +37,12 @@ public class ButtonDynamicModel { private String paramValue; - public ButtonDynamicModel(Long id, String buttonCode, String buttonName) { + public ButtonDynamicModel(Long id, String buttonCode, String buttonName, String windowNo, String windowModuleBack) { this.id = id; this.buttonCode = buttonCode; this.buttonName = buttonName; + this.windowNo = windowNo; + this.windowModuleBack = windowModuleBack; } From d2ff83e22baab6ae244209e8f9c8b35d186de7ab Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 16 Jul 2020 19:11:07 +0800 Subject: [PATCH 35/87] test merge dev --- 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-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 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..1e17935 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..37b8a51 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index aca1465..0a44fb0 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index a6a0d68..ba89b61 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..fdcf6e3 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..60d9861 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..54c8306 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..190efa7 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..5896851 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..80498fc 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..076f15a 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..1351ed3 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..67b0bff 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..15d36cd 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc8fce6..2eddf76 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 9b6be3167d21e411e9f21ecd4abde3e65264ff58 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 16 Jul 2020 19:22:57 +0800 Subject: [PATCH 36/87] dev merge test --- 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-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 +- 20 files changed, 20 insertions(+), 20 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 1e17935..d2521de 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 37b8a51..b599490 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 0a44fb0..aca1465 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 6df1cc2..ae38208 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 ba89b61..a6a0d68 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 fdcf6e3..04b40d4 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 d266163..6854e65 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 60d9861..ac387fd 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 54c8306..bbe0ff9 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 190efa7..be533a6 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 5896851..14e8567 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 aa3dd42..102ab0e 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 80498fc..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..e755225 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 1351ed3..194f0cb 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 67b0bff..60543fe 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 15d36cd..bdc4cab 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 2eddf76..cc8fce6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 54a51a4c69619cac8a75ad6e2992e2d4d2685577 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 16 Jul 2020 20:43:41 +0800 Subject: [PATCH 37/87] Fix Bug #916 --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 13 +++++- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 46 ++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index fc9ae03..faf97ff 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 @@ -5837,7 +5837,18 @@ public class MesEnumUtil { STRING("10", "String", "字符串"), BOOLEAN("20","Boolean", "布尔"), WORD("30", "Word", "整形-Word"), - DWORD("40","Dword", "整形-DWord"); + DWORD("40","Dword", "整形-DWord"), + LONG("50", "Long", "长整形-Long"), + SHORT("60", "Short", "UShort"), + DOUBLE("70", "Double", "双精度-Double"), + FLOAT("80", "Float", "单精度-Float"), + LLONG("90", "LLong", "LLONG"), + QWORD("100", "QWord", "QWORD"), + BCD("110", "BCD", "BCD"), + LBCD("120", "LBCD", "LBCD"), + BYTE("130", "Byte", "Byte"), + CHAR("140", "Char", "Char"), + Date("150", "DateTime", "日期"); private String value; private String code; 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 df68d86..f1ba2ff 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 @@ -4423,4 +4423,50 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 关键件校验并转过程条码工步 取值模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum VALUE_RANGE { + + SCAN(10, "扫描"), + READ_CACHE(20, "读取缓存"); + + private int value; + private String description; + + VALUE_RANGE(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; + } + } } From 8f7d6d46af8576c83ccd5063ad33a7ad3938003e Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 16 Jul 2020 20:59:44 +0800 Subject: [PATCH 38/87] Fix Bug #9457 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java index 9a9ab5c..a5dd664 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java @@ -102,6 +102,9 @@ public class MesPlcModel implements Serializable { @ApiParam("默认赋值属性") private String defaultRule; + @ApiParam("工装代码") + private String toolingCode; + public MesPlcModel() { } @@ -109,7 +112,8 @@ public class MesPlcModel implements Serializable { public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel, String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName, - String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl, Integer plcType, String defaultRule) { + String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, + String objectCode, String opcUrl, Integer plcType, String defaultRule, String toolingCode) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -139,5 +143,6 @@ public class MesPlcModel implements Serializable { this.opcUrl = opcUrl; this.plcType = plcType; this.defaultRule = defaultRule; + this.toolingCode = toolingCode; } } From 747cfeb125e43a78f0059ca9587bcc645b82a75e Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 16 Jul 2020 21:45:19 +0800 Subject: [PATCH 39/87] Finish Task #2080 Cost:8h --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 268eaf2..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 204da853c3afea46f2d89cded1ba945e82527bc1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 17 Jul 2020 11:27:27 +0800 Subject: [PATCH 40/87] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A2442]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java | 6 +++--- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 19 +++++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index 9b2b76a..6fbf7bc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -625,9 +625,9 @@ public class PtlEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PTL_TASK_STATUS { CREATE(10, "创建"), - EXECUTION(20, "执行中"), - COMPLETE(30, "完成"), - CANCEL(40, "取消"); + COMPLETE(20, "完成"), + CLOSE(30, "关闭"), + EXECUTION(40, "执行中"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index d29b37b..9c85618 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -830,7 +830,8 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_SECTION_TASK_DETAIL_STATUS { CREATE(10, "CREATE", "创建"), - COMPLETE(20, "COMPLETE", "完成"); + COMPLETE(20, "COMPLETE", "完成"), + CLOSE(30, "CLOSE", "关闭"); private int value; private String code; @@ -860,8 +861,9 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_SECTION_TASK_STATUS { - CREATE(10, "CREATE", "新建"), - RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"); + CREATE(10, "CREATE", "创建"), + COMPLETE(20, "COMPLETE", "完成"), + CLOSE(30, "CLOSE", "关闭"); private int value; private String code; @@ -915,10 +917,10 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PTL_MAIN_TASK_STATUS { - CREATE(10, "CREATE", "新建"), - RECEIPT(20, "RECEIPT", "执行中"), - RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"), - CANCELLED(40, "CANCELLED", "已取消"); + CREATE(10, "CREATE", "创建"), + COMPLETE(20, "COMPLETE", "完成"), + CLOSE(30, "CLOSE", "关闭"), + EXECUTION(40, "EXECUTION", "执行中"); private int value; private String code; @@ -1413,7 +1415,8 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_TASK_STATUS { CREATE(10, "CREATE", "创建"), - RECEIPT_FINISH(30, "COMPLETED", "完成"); + COMPLETE(20, "COMPLETE", "完成"), + CLOSE(30, "CLOSE", "关闭"); private int value; private String code; 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 41/87] =?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; } From 9461057a07526c15c1221dc06e9b29cacc46ed49 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 17 Jul 2020 16:33:43 +0800 Subject: [PATCH 42/87] Finish Task #2080 Cost:8h --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 9 ++++++++- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 4 ++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 12 ++++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 13 +++++++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 4 ++++ 6 files changed, 45 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 0c538e3..8ce9652 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 @@ -792,7 +792,14 @@ public class WmsEnumUtil { CONTAINER_INSTORE(570, "CONTAINER_INSTORE", "AGV料车入库"), AGV_PART_NO_OUT(580, "AGV_PART_NO_OUT", "AGV物料出库"), FORKLIFT_PART_NO_OUT(590, "FORKLIFT_PART_NO_OUT", "PAD物料出库"), - INTERNAL_SHIPPING(600, "INTERNAL_SHIPPING", "内部发运"); + INTERNAL_SHIPPING(600, "INTERNAL_SHIPPING", "内部发运"), + ASSEMBLY_DISASSEMBLY_STORAGE(610, "ASSEMBLY_DISASSEMBLY_STORAGE\n", "总成拆解入库"), + INTERNAL_WORK_ORDER_MATERIAL_STORAGE(620, "INTERNAL_WORK_ORDER_MATERIAL_STORAGE", "内部工单物料入库"), + PART_NUMBER_CONVERSION_MATERIAL_STORAGE(630, "PART_NUMBER_CONVERSION_MATERIAL_STORAGE", "零件号转化物料入库"), + PART_NUMBER_CONVERSION_MATERIAL_OUT_STOCK(640, "PART_NUMBER_CONVERSION_MATERIAL_OUT_STOCK", "零件号转化物料出库"), + INTERNAL_WORK_ORDER_MATERIAL_OUT_STOCK(650, "INTERNAL_SHIPPING", "内部工单物料出库"), + CUSTOMER_RETURN_SCRAP(660, "CUSTOMER_RETURN_SCRAP", "客户退货报废"), + MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废"); private int value; private String code; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 223cded..6f05876 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -173,4 +173,8 @@ public class WmsDocFgDetail extends BaseBean { @ApiParam(value = "子位置号") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String itemSeqNo; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam(value = "jis料架号") + private String queueGroupNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 1a63eb3..de91d7b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -223,6 +223,18 @@ public class WmsDocMovementMaster extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class) private Integer isGoodProduct; + @Column(name = "COST_CENTER") + @ApiParam(value = "成本中心") + private String costCenter; + + @Column(name = "REMAKE") + @ApiParam(value = "备注1") + private Integer remake; + + @Column(name = "DESC") + @ApiParam(value = "备注2") + private String desc; + @Transient @ApiParam(value = "发运单号") private String shipOrderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 4525fd2..4e5da1c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -256,6 +256,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") private Integer consignation = 2; + @Column(name = "QUEUE_GROUP_NO") + @ApiParam(value = "jis料架号") + private String queueGroupNo; + public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index e639538..2a5f544 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -216,6 +216,19 @@ public class WmsMoveToERP extends BaseBean { @ApiParam(value = "方向") private Integer podDir; + + @Column(name = "COST_CENTER") + @ApiParam(value = "成本中心") + private String costCenter; + + @Column(name = "DESC") + @ApiParam(value = "备注2") + private String desc; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam(value = "jis料架号") + private String queueGroupNo; + @Transient private Long shippingId; 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 1dcc9ff..84530c1 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 @@ -171,6 +171,10 @@ public class WmsPOMaster extends BaseBean { @Column(name = "ZDOC", columnDefinition = "varchar(50) default ''") public String zdoc; + @ApiParam("发运单号") + @Column(name = "SHIPMENT_NOTE_NUMBER") + public String shipmentNoteNumber; + public WmsPOMaster() { } From 02d46cfb69a318a383f1afd2fc1f54164614c280 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 17 Jul 2020 17:16:12 +0800 Subject: [PATCH 43/87] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= 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 ae014e9..0786d8d 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-PROD-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 3fd979a565b1a126daa95388ca7589b4c466070d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 17 Jul 2020 17:24:10 +0800 Subject: [PATCH 44/87] test merge master --- 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-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 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..11691be 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..8ef99a3 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 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-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 81266fbfb6dfffc7b270665823cda46fc7ec9616 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 17 Jul 2020 17:28:36 +0800 Subject: [PATCH 45/87] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= 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-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 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..11691be 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..8ef99a3 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 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-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 diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..ae014e9 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 767c1bffbcd32291b50715833b51d696d9dc1c25 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 17 Jul 2020 17:33:12 +0800 Subject: [PATCH 46/87] test merge dev --- 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-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 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..1e17935 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..37b8a51 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index aca1465..0a44fb0 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index a6a0d68..ba89b61 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..fdcf6e3 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..60d9861 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..54c8306 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..190efa7 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..5896851 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..80498fc 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..076f15a 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..1351ed3 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..67b0bff 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..15d36cd 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc8fce6..2eddf76 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From b3999ad481112aacda7ec16edbc3a2e05ee0d12b Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 17 Jul 2020 17:40:12 +0800 Subject: [PATCH 47/87] dev merge test --- 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-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 +- 20 files changed, 20 insertions(+), 20 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 1e17935..d2521de 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 37b8a51..b599490 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 0a44fb0..aca1465 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 6df1cc2..ae38208 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 ba89b61..a6a0d68 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 fdcf6e3..04b40d4 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 d266163..6854e65 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 60d9861..ac387fd 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 54c8306..bbe0ff9 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 190efa7..be533a6 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 5896851..14e8567 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 aa3dd42..102ab0e 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 80498fc..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..e755225 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 1351ed3..194f0cb 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 67b0bff..60543fe 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 15d36cd..bdc4cab 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 2eddf76..cc8fce6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From c230c57c97ebe4b8a89181a87dd3ecbdeb785a0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 17 Jul 2020 17:59:02 +0800 Subject: [PATCH 48/87] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=20=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20=E9=87=8D=E8=BD=BD=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 42 ++++++++++++++++++++++ .../pojo/form/bean/BfMethodDetailProperty.java | 31 ---------------- .../i3plus/pojo/platform/bean/SysMessage.java | 15 ++++++-- .../i3plus/pojo/platform/bean/SysRefRoleMenu.java | 1 + .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 23 +++++++----- 5 files changed, 71 insertions(+), 41 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index bb75436..8fcfab5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -419,6 +419,48 @@ public class ImppEnumUtil { } /** + * 用户消息发送状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MESSAGE_SEND_STATUS { + + SENDING(1, "发送中"), + SEND_SUCCESS(2, "发送成功"), + SEND_FAIL(3, "发送失败"); + + private int value; + private String description; + + MESSAGE_SEND_STATUS() { + } + + MESSAGE_SEND_STATUS(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; + } + + } + + /** * 用户消息类型 * 1.NOTICE：通知 * 2.STATION_LETTER：站内信 diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java index 8085d44..06adc7a 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java @@ -57,29 +57,11 @@ public class BfMethodDetailProperty extends BaseBean { @ApiParam(value ="主对象元素名称") private String priElementNameRdd; - @Column(name="PRI_ELEMENT_PROPERTY_ID") - @ApiParam(value ="主对象元素属性id") - @JsonSerialize(using = ToStringSerializer.class) - private Long priElementPropertyId; - - @Column(name="PRI_ELEMENT_PROPERTY_NAME_RDD") - @ApiParam(value ="主对象元素属性名称") - private String priElementPropertyNameRdd; - - @Column(name="PRI_ELEMENT_PROPERTY_CODE_RDD") - @ApiParam(value ="主对象元素属性code") - private String priElementPropertyCodeRdd; - // 枚举:BlockFormEnumUtil.TRIGGER_EVENT @Column(name="PRI_ELEMENT_EVENT") @ApiParam(value ="主对象元素事件") private Integer priElementEvent; - // 枚举:BlockFormEnumUtil.SQL_REF_TYPE - @Column(name="ASSOCIATE_TYPE") - @ApiParam(value ="关联类型") - private Integer associateType; - @Column(name="SEC_METHOD_DETAIL_ID") @ApiParam(value ="关联功能明细id") @JsonSerialize(using = ToStringSerializer.class) @@ -98,19 +80,6 @@ public class BfMethodDetailProperty extends BaseBean { @ApiParam(value ="关联对象元素名称") private String secElementNameRdd; - @Column(name="SEC_ELEMENT_PROPERTY_ID") - @ApiParam(value ="关联对象元素属性id") - @JsonSerialize(using = ToStringSerializer.class) - private Long secElementPropertyId; - - @Column(name="SEC_ELEMENT_PROPERTY_NAME_RDD") - @ApiParam(value ="关联对象元素属性名称") - private String secElementPropertyNameRdd; - - @Column(name="SEC_ELEMENT_PROPERTY_CODE_RDD") - @ApiParam(value ="关联对象元素属性Code") - private String secElementPropertyCodeRdd; - @Transient @ApiParam(value ="表单功能明细关联属性") private List refList; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index 903c276..e41ee5c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.platform.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -93,13 +95,22 @@ public class SysMessage extends BaseBean { @ApiParam(value = "是否系统邮件") private Integer isSystem; + @Column(name = "SEND_STATUS") + @ApiParam(value = "发送状态") + @AnnoOutputColumn(refClass = ImppEnumUtil.MESSAGE_SEND_STATUS.class) + private Integer sendStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam(value = "错误信息") + private String errorMessage; + @Transient @ApiParam(value = "阅读统计") @JsonSerialize(using = ToStringSerializer.class) private Long readCount; - public long getReadCountVal(){ - if(readCount == null){ + public long getReadCountVal() { + if (readCount == null) { return 0; } else { return readCount.longValue(); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java index 840eb7e..4743182 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java @@ -33,6 +33,7 @@ import java.util.List; public class SysRefRoleMenu extends BaseBean { private static final long serialVersionUID = -2013469818246101184L; + @Column(name="MENU_ID") @ApiParam(value ="菜单ID" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 9036bc3..166e94a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -508,17 +508,14 @@ public class CoreHqlPack { * @param sysTaskCycle * @return */ - public static String packHqlSysTaskCycle(SysTaskCycle sysTaskCycle) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysTaskCycle(SysTaskCycle sysTaskCycle) { + DdlPackBean result = DdlPackBean.getDdlPackBean(sysTaskCycle); // hql拼接 - HqlPack.getStringLikerPack(sysTaskCycle.getName(), "name", result); - HqlPack.getStringEqualPack(sysTaskCycle.getOrganizeCode(), "organizeCode", result); - - // 添加默认排序 - HqlPack.getOrderDefault(sysTaskCycle); + DdlPreparedPack.getStringLikerPack(sysTaskCycle.getName(), "name", result); + DdlPreparedPack.getStringEqualPack(sysTaskCycle.getOrganizeCode(), "organizeCode", result); - return result.toString(); + return result; } /** @@ -1144,4 +1141,14 @@ public class CoreHqlPack { return ddlPackBean; } + + public static DdlPackBean packHqlSysTaskPlanOnly(SysTaskPlan sysTaskPlan){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysTaskPlan); + + DdlPreparedPack.getNumEqualPack(sysTaskPlan.getId(),"id",ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysTaskPlan.getName(),"name",ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysTaskPlan.getGroupName(),"groupName",ddlPackBean); + + return ddlPackBean; + } } \ No newline at end of file From 50999e49f24c41fe5448e4aa1c51b79055316151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 17 Jul 2020 18:00:34 +0800 Subject: [PATCH 49/87] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=8E=9F=E5=A7=8B=E6=8A=A5=E6=96=87=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java | 3 +++ .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java | 11 +++++++++++ .../i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 10 ++++++++++ 3 files changed, 24 insertions(+) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java index cde8a74..dac4976 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java @@ -91,5 +91,8 @@ public class BsSuitDataDetail extends BaseBean { @ApiParam(value = "适配请求文件列表") private List bsSuitFileList; + @Transient + @ApiParam(value = "id-查询条件") + private List searchIdList; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index 469b391..957bd5e 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -149,5 +149,16 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "适配请求文件列表") private List bsSuitFileList; + @Transient + @ApiParam(value = "适配记录报文-查询条件") + private String searchMessage; + + @Transient + @ApiParam(value = "适配入参-查询条件") + private String searchInputParam; + + @Transient + @ApiParam(value = "id-查询条件") + private List searchIdList; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index cf43265..28aa126 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -318,6 +318,7 @@ public class SoftSwitchHqlPack { public static DdlPackBean packHqlBsSuitRecord(BsSuitRecord bsSuitRecord){ DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPreparedPack.getInPackList(bsSuitRecord.getSearchIdList(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean); @@ -342,6 +343,7 @@ public class SoftSwitchHqlPack { public static DdlPackBean packHqlBsSuitDataDetail(BsSuitDataDetail bsSuitDataDetail){ DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPreparedPack.getInPackList(bsSuitDataDetail.getSearchIdList(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); @@ -409,4 +411,12 @@ public class SoftSwitchHqlPack { return ddlPackBean; } + + public static DdlPackBean packHqlBsLongData(BsLongData bsLongData){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bsLongData); + DdlPreparedPack.timeBuilder(bsLongData.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); + DdlPreparedPack.getNumEqualPack(bsLongData.getRefDataType(),"refDataType",ddlPackBean); + DdlPreparedPack.getStringLikePack(bsLongData.getData(),"data",ddlPackBean); + return ddlPackBean; + } } From e17318dbcbc7fb79027ca3e8b72e524299c1bb44 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 17 Jul 2020 20:12:45 +0800 Subject: [PATCH 50/87] Finish Task #2080 Cost:8h --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index de91d7b..2f6c498 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -229,7 +229,7 @@ public class WmsDocMovementMaster extends BaseBean { @Column(name = "REMAKE") @ApiParam(value = "备注1") - private Integer remake; + private String remake; @Column(name = "DESC") @ApiParam(value = "备注2") From c9e4c7290115cafd37e20b836f84c582d03a1fc2 Mon Sep 17 00:00:00 2001 From: qianhs Date: Sat, 18 Jul 2020 13:50:39 +0800 Subject: [PATCH 51/87] Finish Task #2080 Cost:8h --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 2f6c498..f20b634 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -231,9 +231,9 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "备注1") private String remake; - @Column(name = "DESC") + @Column(name = "SECONDARY_REMAKE") @ApiParam(value = "备注2") - private String desc; + private String secondaryRemake; @Transient @ApiParam(value = "发运单号") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 2a5f544..5b06475 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -221,9 +221,9 @@ public class WmsMoveToERP extends BaseBean { @ApiParam(value = "成本中心") private String costCenter; - @Column(name = "DESC") + @Column(name = "SECONDARY_REMAKE") @ApiParam(value = "备注2") - private String desc; + private String secondaryRemake; @Column(name = "QUEUE_GROUP_NO") @ApiParam(value = "jis料架号") From 88b85b03d2c47c427a87b65f559dc567a3f91a3c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 18 Jul 2020 20:22:57 +0800 Subject: [PATCH 52/87] =?UTF-8?q?Finish=20Task=20#2436=20Cost:8h=20?= =?UTF-8?q?=E6=8B=A3=E8=B4=A7=E3=80=81=E5=AE=A2=E6=88=B7=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=80=E5=8C=96=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index d3a2c16..40da59c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -169,6 +169,10 @@ public class WmsMoveSn extends BaseBean { @ApiParam("供应商编号") private String vendorNo; + @Column(name = "srcSn") + @ApiParam("原条码") + private String srcSn; + @Column(name = "SERIAl_SN") @ApiParam("产品条码") public String serialSn; From a25df616e3ef09f29793e0398cefbc66e0cf8e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 18 Jul 2020 20:47:29 +0800 Subject: [PATCH 53/87] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=98=9F=E5=88=97=E5=88=B7=E6=96=B0=E6=97=B6=E9=97=B4=EF=BC=9B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9PLC=E6=A0=87=E7=AD=BE=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=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 --- .../pojo/mes/model/RefreshInitModuleModel.java | 35 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 8 ++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RefreshInitModuleModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RefreshInitModuleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RefreshInitModuleModel.java new file mode 100644 index 0000000..0d58bbc --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RefreshInitModuleModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class RefreshInitModuleModel implements Serializable { + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("工作单元") + private String workCellCode; + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("用户信息") + private String userInfo; + + @ApiParam("队列展示类型（有序/无序）") + private Object resultObj; + + @ApiParam("展示组件定时刷新频率") + private Integer timer; + + @ApiParam("List字段集") + private List DataAttrList; + + @ApiParam("List结果集") + private List resultList; +} 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 7c9e482..2744f4d 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 @@ -1345,7 +1345,7 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesPlc.getChannel(), "channel", packBean); } if (!StringUtils.isEmpty(mesPlc.getTagAddress())) { - DdlPreparedPack.getStringLikerPack(mesPlc.getTagAddress(), "tagAddress", packBean); + DdlPreparedPack.getStringEqualPack(mesPlc.getTagAddress(), "tagAddress", packBean); } if (!StringUtils.isEmpty(mesPlc.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCenterCode(), "workCenterCode", packBean); @@ -1353,6 +1353,12 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesPlc.getPlcCode())) { DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCellCode(), "workCellCode", packBean); } + if (!StringUtils.isEmpty(mesPlc.getEquipmentCode())) { + DdlPreparedPack.getStringEqualPack(mesPlc.getEquipmentCode(), "equipmentCode", packBean); + } + if (!StringUtils.isEmpty(mesPlc.getObjectCode())) { + DdlPreparedPack.getStringEqualPack(mesPlc.getObjectCode(), "objectCode", packBean); + } return packBean; } From 3e95dd4029e724f3902074ffeb252a8b541434c0 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 20 Jul 2020 02:07:38 +0800 Subject: [PATCH 54/87] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8C=97=E4=BA=AC?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=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/wms/bean/WmsStockSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index e13269d..7c2aaa7 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 @@ -280,6 +280,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "包装零件号") private String packagePartNo; + @Column(name = "QUEUE_GROUP_NO") + @ApiParam(value = "jis料架号") + private String queueGroupNo; + @Transient @ApiParam(value = "工厂名称") public String organizeName; From a379c97461bd428c52ff3da22746b1f2d649cbbc Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 20 Jul 2020 10:18:19 +0800 Subject: [PATCH 55/87] =?UTF-8?q?=E3=80=902444=20=E5=9D=A4=E6=B3=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=85=8D=E7=BD=AE=E6=B5=8B=E8=AF=95=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 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 0c538e3..667e5ab 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 @@ -764,18 +764,18 @@ public class WmsEnumUtil { VDA_QC(290, "VDA_QC", "VDA质检"), VDA_SN_SPLIT(300, "VDA_SN_SPLIT", "VDA物料拆分"), VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并"), - KT_RECEPTION(320, "KT_RECEPTION", "KT让步接收"), - KT_SCRAP(330, "KT_SCRAP", "KT报废"), - KT_QUARANTINE(340, "KT_QUARANTINE", "KT隔离"), - KT_BACK_QUARANTINE(350, "KT_BACK_QUARANTINE", "KT反隔离"), - KT_DEFINITE_FAIL(360, "KT_DEFINITE_FAIL", "KT不合格"), - KT_RETURN(370, "KT_RETURN", "KT退货"), - KT_REWORK(380, "KT_REWORK", "KT返工"), - KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"), - KT_SORTING(400, "KT_SORTING", "KT分选"), + RECEPTION(320, "RECEPTION", "让步接收"), + SCRAP(330, "SCRAP", "报废"), + QUARANTINE(340, "QUARANTINE", "隔离"), + BACK_QUARANTINE(350, "BACK_QUARANTINE", "反隔离"), + DEFINITE_FAIL(360, "DEFINITE_FAIL", "不合格"), + RETURN(370, "RETURN", "KT退货"), + REWORK(380, "KT_REWORK", "KT返工"), + MISCALCULATION(390, "MISCALCULATION", "KT误判"), + SORTING(400, "SORTING", "KT分选"), VDA_STATIC_CS(410, "VDA_STATIC_CS", "静态盘点"), VDA_CS_SEARCH(420, "VDA_CS_SEARCH", "VDA盘点查询"), - KT_DEFINITE(430, "KT_DEFINITE", "KT合格"), + DEFINITE(430, "DEFINITE", "合格"), VDA_PACKAGE_MANAGE(440, "VDA_PACKAGE_MANAGE", "VDA编组管理"), KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"), KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"), From 1ac8fae269cfae8e9e7336b7f12b57921b1fa967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 20 Jul 2020 14:51:40 +0800 Subject: [PATCH 56/87] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9E=AA=E5=A4=B4?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java index 167372a..38d4717 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java @@ -79,6 +79,10 @@ public class MesEquipmentTooling extends BaseBean implements Serializable { @ApiParam("按钮颜色") private String btnColor; + @Transient + @ApiParam("按钮类别") + private String btnType; + public Integer getToolingType() { return this.toolingType == null ? 0 : this.toolingType; } From 809c625fc51ecae1b89b90ce0e00b069cee79130 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 20 Jul 2020 16:45:24 +0800 Subject: [PATCH 57/87] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= 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 0786d8d..268eaf2 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-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 2116fdafc7b66b8f6adbdb408f80fa1668786036 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 20 Jul 2020 22:04:09 +0800 Subject: [PATCH 58/87] =?UTF-8?q?agv=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 26 ++++++++++++++++++++-- .../i3plus/pojo/mes/model/StationRequestBean.java | 8 ++++++- .../cn/estsh/i3plus/pojo/mes/model/StepResult.java | 1 + 3 files changed, 32 insertions(+), 3 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 d1df531..ef26467 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 @@ -2542,7 +2542,9 @@ public class MesPcnEnumUtil { STOP_PCS_CTL("stopPcsCtl", "停止监控"), RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"), PROCESS_CONTENT("processContent", "过程组件内容"), - TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容"); + TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容"), + TIME_MODULE_START("timeModuleStart", "定时组件开始"), + TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"); private String value; private String description; @@ -4232,7 +4234,7 @@ public class MesPcnEnumUtil { } /** - * 绑定模式 + * 绑定模式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum KEY_BIND_MODE { @@ -4470,4 +4472,24 @@ public class MesPcnEnumUtil { return tmp; } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AGV_BUTTON_TRIGGER { + + DELAY(10, "延时启动"), + EMERGENCY_STOP(20, "紧急停止"); + + private int value; + private String description; + + AGV_BUTTON_TRIGGER(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + } } 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 07cadf3..f1b6153 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 @@ -141,14 +141,20 @@ public class StationRequestBean implements Serializable { @ApiParam("是否按时完成") private Integer isOnTimeComplete = 1; + @ApiParam("是否是调度程序调用") + private boolean isDispatcherInvoke; + @ApiParam("工位剩余时间") private Long remainWorkTime; + @ApiParam("提醒时间点") + private Integer remindTime; + @ApiParam("是否操作超时") private Integer isTimeOut = 2; @ApiParam("特殊展示数据") - private Map specialDisplayMap = new HashMap<>(); + private Map specialDisplayMap = new HashMap<>(); @ApiParam("物料名称") private String partName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java index 9f3ad59..ffe3af7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; import io.swagger.annotations.Api; import lombok.Data; From 194f49ca1101db2958135a2df0cdb7da82f43fd8 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 21 Jul 2020 00:39:08 +0800 Subject: [PATCH 59/87] =?UTF-8?q?agv=E5=81=9C=E8=BD=A6=E4=BF=A1=E5=8F=B7?= =?UTF-8?q?=20=E5=B7=A5=E4=BD=8D=E9=87=8D=E5=81=9A=20=E5=80=92=E8=AE=A1?= =?UTF-8?q?=E6=97=B6=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/TimeModuleModel.java | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeModuleModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeModuleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeModuleModel.java new file mode 100644 index 0000000..2e6258f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TimeModuleModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +import cn.estsh.i3plus.pojo.mes.bean.MesPlc; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/7/21 00:33 + * @desc + */ +@Data +public class TimeModuleModel { + + private MesPcnEnumUtil timeWay; + + private Integer startTime; + + private Integer endTime; + + private Integer remindTime; + + private String remindContent; + + private String needTimeOutRecord; + + private MesPlc agvRunningPlc; + + private MesPlc mesWriteFlagPlc; + + private MesPlc plcReadFlagPlc; +} From 31c3fcd86804eb699b9e58dfedde907b6a18557d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 21 Jul 2020 11:03:25 +0800 Subject: [PATCH 60/87] =?UTF-8?q?=E6=B3=B0=E5=9B=BD=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java | 9 +++++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index 4ab91b7..025d045 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @Description : 任务单模型 @@ -35,6 +36,9 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam(value = "关联单据业务类型代码") private String busiTypeCode; + @ApiParam(value = "关联单据业务类型代码集合") + private List busiTypeCodeLst; + @ApiParam(value = "计划日期") private String zdate; @@ -107,4 +111,9 @@ public class WmsTaskInfoModel implements Serializable { this.srcZoneNo = srcZoneNo; this.createUser = createUser; } + + public WmsTaskInfoModel(String organizeCode, String busiTypeCode) { + this.organizeCode = organizeCode; + this.busiTypeCode = busiTypeCode; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java index 31cf362..8b08f24 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java @@ -60,6 +60,7 @@ public class WmsPackage extends BaseBean { @Column(name="PRINT_STATUS") @ApiParam(value = "打印状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class) public Integer printStatus; @Column(name="PACK_LEVEL") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index 9132494..67fd34b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -112,6 +112,10 @@ public class WmsTaskInfo extends BaseBean { @ApiParam("工厂集合") private List organizeCodeList; + @Transient + @ApiParam("业务类型代码") + public String busiTypeCode; + public WmsTaskInfo(){}; public WmsTaskInfo(String orderNo ,Integer taskStatus , String zdate ,String ztime,String custNo,String vendorNo){ From 076c6c1b4fc7510ad59a8b11522b1dea9889d761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 21 Jul 2020 16:29:14 +0800 Subject: [PATCH 61/87] =?UTF-8?q?=E6=89=AD=E7=9F=A9=E4=BA=8C=E5=90=88?= =?UTF-8?q?=E4=B8=80=E6=9F=A5=E8=AF=A2=E5=85=B3=E9=94=AE=E4=BB=B6=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96--=E7=9B=AE?= =?UTF-8?q?=E5=89=8D=E6=A0=B9=E6=8D=AE=20=E9=98=9F=E5=88=97=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E9=98=9F=E5=88=97=E6=98=8E=E7=BB=86=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E8=BD=A6=E5=9E=8B=E6=95=A3=E4=BB=B6=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=B8=85=E5=8D=95=EF=BC=8C=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=A1=A8=E3=80=82=E5=8A=A0=E4=B8=8A=E6=9D=A1=E4=BB=B6=E3=80=90?= =?UTF-8?q?=E4=B8=80=E7=99=BE=E4=BD=8D=E6=9D=A1=E7=A0=81=E3=80=91,?= =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E5=9E=8B=E7=9B=B8=E5=90=8C=EF=BC=8C=E8=BD=A6?= =?UTF-8?q?=E5=9E=8B=E7=9B=B8=E5=90=8C=20=E5=86=85=E8=81=94=E6=9F=A5?= =?UTF-8?q?=E5=87=BA=E6=89=80=E6=9C=89=E7=9A=84=E5=85=B3=E9=94=AE=E4=BB=B6?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E2=80=94=E2=80=94>=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=95=A3=E4=BB=B6=E9=85=8D=E7=BD=AE=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E4=B8=AD=E7=9A=84=E9=9B=B6=E4=BB=B6=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=20=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9:=E4=BA=A7=E7=BA=BF=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7=E6=A8=A1=E5=BC=8F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E4=B8=BA=E7=A9=BA=E6=88=9610=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E4=B9=8B=E5=89=8D=E9=80=BB=E8=BE=91=EF=BC=8C=E4=B8=BA?= =?UTF-8?q?20=E6=97=B6=E4=B8=8D=E9=9C=80=E8=A6=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=90=8E=E9=9D=A2?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=B8=8D=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 46 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesWorkCenter.java | 5 +++ 2 files changed, 51 insertions(+) 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 ef26467..8d1abad 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 @@ -4492,4 +4492,50 @@ public class MesPcnEnumUtil { } } + + /** + * 工作中心 工位监控模式 10=工单作业，20=标准作业 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_CENTER_MONITOR_TYPE { + + ORDER_WORK(10, "工单作业"), + STANDARD_WORK(20, "标准作业"); + + private int value; + private String description; + + WORK_CENTER_MONITOR_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index c67110f..a80febf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -66,6 +66,11 @@ public class MesWorkCenter extends BaseBean implements Serializable { @ApiParam("条码生成模式") private Integer generateType; + // 10=工单作业，20=标准作业 + @Column(name = "MONITOR_TYPE") + @ApiParam("工位监控模式") + private Integer monitorType; + @Transient @ApiParam(value = "子集列表") private List childTreeList; From 4df8a743a7520f044beaaca4a847f22c5e5c0fb9 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 21 Jul 2020 18:28:44 +0800 Subject: [PATCH 62/87] =?UTF-8?q?=209735=2019048-=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=96=B7=E6=B6=82=E5=BF=85=E9=9C=80=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=9A=84=E7=BB=B4=E6=8A=A4-2020-07-21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 27 ++++------------------ 1 file changed, 4 insertions(+), 23 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 faf97ff..7f802e0 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 @@ -4276,15 +4276,6 @@ public class MesEnumUtil { return tmp; } - public static String valueOfDescription2(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; - } - } - return tmp; - } } /** @@ -4908,16 +4899,6 @@ public class MesEnumUtil { } return tmp; } - - public static String valueOfDescription2(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; - } - } - return tmp; - } } /** @@ -5003,11 +4984,11 @@ public class MesEnumUtil { return tmp; } - public static String valueOfDescription2(int val) { - String tmp = null; + public static Integer descriptionOfValue(String description) { + Integer tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; + if (values()[i].description.equals(description)) { + tmp = values()[i].value; } } return tmp; From a1af94fe70eb62a2a63967ed5d4de8b86ed7e978 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 21 Jul 2020 22:03:58 +0800 Subject: [PATCH 63/87] Fix Bug #9760 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2744f4d..ffe13b9 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 @@ -1232,7 +1232,7 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(numberRule.getNumberRule(), "numberRule", packBean); } if (!StringUtils.isEmpty(numberRule.getPrefix())) { - DdlPreparedPack.getNumEqualPack(numberRule.getPrefix(), "prefix", packBean); + DdlPreparedPack.getStringLikerPack(numberRule.getPrefix(), "prefix", packBean); } if (null != numberRule.getIsCycle()) { DdlPreparedPack.getNumEqualPack(numberRule.getIsCycle(), "isCycle", packBean); From 3ba1c8ee626c752b6f7dc308a3aba5055358bd82 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 22 Jul 2020 12:30:26 +0800 Subject: [PATCH 64/87] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 8 ++++++-- .../java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 4 ++++ 2 files changed, 10 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 ef26467..1dfbeb4 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 @@ -20,7 +20,8 @@ public class MesPcnEnumUtil { MONITOR_MODULE(10, "监听组件"), REVEAL_MODULE(20, "展示组件"), BUTTON_MODULE(30, "按钮组件"), - TIMING_MODULE(40, "定时组件"); + TIMING_MODULE(40, "定时组件"), + PCS_BACK_MODULE(50, "工序后台组件"); private int value; private String description; @@ -2921,7 +2922,9 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_CELL_MONITOR_TYPE { MONITOR(10, "监听组件"), - SHOW(20, "展示组件"); + SHOW(20, "展示组件"), + BUTTON(30, "按钮组件"), + PROCESS_MONITOR(40, "工序监听组件"); private int value; private String description; @@ -4492,4 +4495,5 @@ public class MesPcnEnumUtil { } } + } 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 f1b6153..8ebfcbe 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -147,6 +148,9 @@ public class StationRequestBean implements Serializable { @ApiParam("工位剩余时间") private Long remainWorkTime; + @ApiParam("停机类型") + private MesPcnEnumUtil.STOP_MACHINE_TYPE stopMachineType; + @ApiParam("提醒时间点") private Integer remindTime; From a577eac60a34599fad71e4b1d785d5378c456b14 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Wed, 22 Jul 2020 14:37:28 +0800 Subject: [PATCH 65/87] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=93=E5=AD=98redis?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=BF=BD=E7=95=A5ModuleServer=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 2 ++ 1 file changed, 2 insertions(+) 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 8ebfcbe..3be58cd 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 @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -127,6 +128,7 @@ public class StationRequestBean implements Serializable { @ApiParam("当前流程状态") private MesStateMachineStatus curFsmState; + @JsonIgnore @ApiParam("展示组件") private Object moduleService; From 3a31ccae7009e8bdbc7d67fc502ed2237670f544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 22 Jul 2020 16:10:02 +0800 Subject: [PATCH 66/87] =?UTF-8?q?=E9=98=9F=E5=88=97=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=B4=E6=97=B6=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/mes/bean/MesQueueOrderDetail.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 394d96c..96d6044 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -176,6 +176,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("主队列状态") private Integer masterStatus; + @Transient + @ApiParam("产品条码") + private String productSn; + public double getQueueSeqVal() { return this.queueSeq == null ? 0.0d : this.queueSeq; } From 4b3470b1fdea424e4a286047338b67471eae50e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 22 Jul 2020 17:57:03 +0800 Subject: [PATCH 67/87] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96=20=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=A4=B1=E8=B4=A5=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 11 +++++++++++ .../cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java | 13 ++++++++++++- .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 10 ++++------ 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 8fcfab5..f6eb1ae 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -218,6 +218,17 @@ public class ImppEnumUtil { return tmp; } + + public static LOG_LEVEL valueOf(int val) { + LOG_LEVEL tmp = ERROR; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i]; + } + } + return tmp; + } + public static String codeOfDescription(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java index 5f54d24..641bee9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.platform.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -9,7 +11,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; import javax.persistence.Column; import javax.persistence.Entity; @@ -139,4 +140,14 @@ public class SysTaskPlan extends BaseBean { } return taskPlanStatus.intValue(); } + + // 枚举 ImppEnumUtil.MESSAGE_TYPE + @Column(name = "LOG_LEVEL") + @ApiParam(value = "日志等级") + @AnnoOutputColumn(refClass = ImppEnumUtil.LOG_LEVEL.class) + private Integer logLevel; + + public int getLogLevelVal() { + return logLevel == null ? ImppEnumUtil.LOG_LEVEL.ERROR.getValue() : logLevel; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 166e94a..225cfd7 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -467,15 +467,13 @@ public class CoreHqlPack { DdlPreparedPack.getStringLikerPack(message.getMessageTitle(), "messageTitle", ddlPackBean); DdlPreparedPack.getStringLikerPack(message.getMessageContent(), "messageContent", ddlPackBean); DdlPreparedPack.getNumEqualPack(message.getMessageType(), "messageType", ddlPackBean); - DdlPreparedPack.getStringLikerPack(message.getMessageSenderNameRdd(), "messageSenderNameRdd", - ddlPackBean); - DdlPreparedPack.getStringLikerPack(message.getMessageReceiversNameRdd(), "messageReceiversNameRdd", - ddlPackBean); - DdlPreparedPack.timeBuilder(message.getMessageSendTime(), "messageSendTime", ddlPackBean, - false, false); + DdlPreparedPack.getStringLikerPack(message.getMessageSenderNameRdd(), "messageSenderNameRdd", ddlPackBean); + DdlPreparedPack.getStringLikerPack(message.getMessageReceiversNameRdd(), "messageReceiversNameRdd", ddlPackBean); + DdlPreparedPack.timeBuilder(message.getMessageSendTime(), "messageSendTime", ddlPackBean, false, false); DdlPreparedPack.getNumEqualPack(message.getMessageSenderId(), "messageSenderId", ddlPackBean); DdlPreparedPack.getNumEqualPack(message.getIsUrgent(), "isUrgent", ddlPackBean); DdlPreparedPack.getNumEqualPack(message.getMessageSoftType(), "messageSoftType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(message.getSendStatus(), "sendStatus", ddlPackBean); DdlPreparedPack.getOrderDefault(message); From 374e73128d4a53ab5240ef901eae79e2ae188a4e Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 22 Jul 2020 18:32:43 +0800 Subject: [PATCH 68/87] =?UTF-8?q?=E3=80=90=E5=9D=A4=E6=B3=B0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=B5=8B=E8=AF=95=E3=80=91?= 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 66ad4a6..6b820ef 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 @@ -769,10 +769,10 @@ public class WmsEnumUtil { QUARANTINE(340, "QUARANTINE", "隔离"), BACK_QUARANTINE(350, "BACK_QUARANTINE", "反隔离"), DEFINITE_FAIL(360, "DEFINITE_FAIL", "不合格"), - RETURN(370, "RETURN", "KT退货"), - REWORK(380, "KT_REWORK", "KT返工"), - MISCALCULATION(390, "MISCALCULATION", "KT误判"), - SORTING(400, "SORTING", "KT分选"), + RETURN(370, "RETURN", "退货"), + REWORK(380, "REWORK", "返工"), + MISCALCULATION(390, "MISCALCULATION", "误判"), + SORTING(400, "SORTING", "分选"), VDA_STATIC_CS(410, "VDA_STATIC_CS", "静态盘点"), VDA_CS_SEARCH(420, "VDA_CS_SEARCH", "VDA盘点查询"), DEFINITE(430, "DEFINITE", "合格"), From a1136dd55dabb0745ca4b0f902bfeac8749cdc0e Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 23 Jul 2020 11:56:13 +0800 Subject: [PATCH 69/87] =?UTF-8?q?Fix=20bug=20#9697=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=99=A8=E5=85=B7=E7=B1=BB=E5=9E=8BBOM=E7=9A=84=E7=89=A9?= =?UTF-8?q?=E6=96=99=E7=B1=BB=E5=9E=8B=E5=8D=A1=E6=8E=A7?= 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 268eaf2..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 13142b4ce1f5eec45cd5ee5854e83d13872973a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 23 Jul 2020 20:10:11 +0800 Subject: [PATCH 70/87] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B5=E6=A3=80?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java index fd4a786..79b60b3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesElectricDataModel.java @@ -54,4 +54,7 @@ public class MesElectricDataModel implements Serializable { @ApiParam(value = "FTP文件") private Object ftpFile; + + @ApiParam(value = "过程条码") + private String serialNumber; } \ No newline at end of file From 41ff729f99b9a9e6d70bc43a9e545aa80ecd89fb Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 23 Jul 2020 22:07:20 +0800 Subject: [PATCH 71/87] workorderlog --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java index 7c57d0a..6213888 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java @@ -31,11 +31,11 @@ import java.io.Serializable; public class MesWorkOrderLog extends BaseBean implements Serializable { private static final long serialVersionUID = -5859382100462830988L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("工单号") private String orderNo; - @Column(name = "PART_NO") + @Column(name = "PART_NO", nullable = false) @ApiParam("物料号") private String partNo; @@ -154,7 +154,7 @@ public class MesWorkOrderLog extends BaseBean implements Serializable { @Lob @Column(name = "EXTEND") @ApiParam("扩展数据") - private String extend; + public String extend; @Column(name = "RESERVED1") @ApiParam("预留字段1") @@ -172,6 +172,10 @@ public class MesWorkOrderLog extends BaseBean implements Serializable { @ApiParam("预留字段4") private String reserved4; + @Column(name = "PARENT_PART_NO") + @ApiParam("父阶物料号") + private String parentPartNo; + /********************** 冗余字段 *********************************/ @Transient @ApiParam(value = "工作中心名称") From 03dbb18bb850e4c7ea47f5370a1819c480863335 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 23 Jul 2020 23:46:18 +0800 Subject: [PATCH 72/87] =?UTF-8?q?=208832=20PO-HJMGN-19073--TJX5=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BD=86?= =?UTF-8?q?=E6=98=AF=E6=98=BE=E7=A4=BA=E4=BA=86=E6=96=B0=E6=9D=BE=E7=BA=BF?= =?UTF-8?q?=E7=9A=84=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E3=80=82--2020060?= =?UTF-8?q?9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 2ee4cc2..05520d5 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -556,6 +556,9 @@ public class AndonHqlPack { if (!StringUtils.isEmpty(mesEquipment.getWorkCellCode())){ DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean); } + if (!StringUtils.isEmpty(mesEquipment.getWorkCenterCode())){ + DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCenterCode(), "workCenterCode", packBean); + } if (!StringUtils.isEmpty(mesEquipment.getEquipmentCode())){ DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean); } From c1fd1f6eeea72f83b1f15423abdde20ab1ec8d2f Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 24 Jul 2020 00:01:00 +0800 Subject: [PATCH 73/87] bypass redo release --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 21 +++++++++++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 4 ++++ .../i3plus/pojo/mes/model/StationRequestBean.java | 3 +++ .../pojo/model/mes/TorqueCollectionModel.java | 10 ++++++++-- 4 files changed, 36 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 935554b..d609b14 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 @@ -4542,4 +4542,25 @@ public class MesPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_DATA_DIRECT { + + PLC_WRITE(10, "plc->mes"), + MES_WRITE(20, "mes->plc"), + SHARE(30, "共用"); + + private int value; + private String description; + + PLC_DATA_DIRECT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index fc99205..576a580 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -134,6 +134,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("默认赋值属性") private String defaultRule; + @Column(name = "DATA_DIRECT") + @ApiParam("数据方向 10 plc->mes 20 mes->plc 30共用地址") + private Integer dataDirect; + @Transient @ApiParam("设备名称") private String equipmentName; 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 3be58cd..ad767e6 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 @@ -60,6 +60,9 @@ public class StationRequestBean implements Serializable { @ApiParam("客户端信息") private String clientInfo; + @ApiParam("websocket session连接id") + private String sessionId; + @ApiParam("用户信息") private String userInfo; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java index 374d58e..02084bb 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java @@ -138,6 +138,9 @@ public class TorqueCollectionModel implements Serializable { @ApiParam("psets总数") private Integer psetSum; + @ApiParam("防错码") + private String pokeYokeFix; + private Map psets = new LinkedHashMap<>(); /** @@ -158,7 +161,8 @@ public class TorqueCollectionModel implements Serializable { */ public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo, String partName, Integer torqueNo, Integer checkScanCount, Integer sendSeq, - Integer yellowGunRule, Integer isEndSeq, String groupCode, Integer isPf, Double qualifiedCount) { + Integer yellowGunRule, Integer isEndSeq, String groupCode, Integer isPf, Double qualifiedCount, + String pokeYokeFix) { this.vinCode = vinCode; this.prodCfgTypeCode = prodCfgTypeCode; this.gradeCode = gradeCode; @@ -173,6 +177,7 @@ public class TorqueCollectionModel implements Serializable { this.groupCode = groupCode; this.isPf = isPf; this.qualifiedCount = qualifiedCount; + this.pokeYokeFix = pokeYokeFix; } /** @@ -197,7 +202,7 @@ public class TorqueCollectionModel implements Serializable { public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo, String partName, Integer pset1, Integer pset2, Integer pset3, Integer pset4, Integer pset5, Integer pset6, Integer pset7, Integer pset8, - Integer torqueNo, Integer sendSeq, Integer checkScanCount) { + Integer torqueNo, Integer sendSeq, Integer checkScanCount, String pokeYokeFix) { this.vinCode = vinCode; this.prodCfgTypeCode = prodCfgTypeCode; this.gradeCode = gradeCode; @@ -215,6 +220,7 @@ public class TorqueCollectionModel implements Serializable { this.torqueNo = torqueNo; this.sendSeq = sendSeq; this.checkScanCount = checkScanCount; + this.pokeYokeFix = pokeYokeFix; assemblePsets(); } From c90a009e66d218a6e2482866c46b196471590670 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 24 Jul 2020 18:02:19 +0800 Subject: [PATCH 74/87] Fix Bug #9874 --- .../estsh/i3plus/pojo/mes/model/StationRequestBean.java | 6 ++++++ .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) 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 ad767e6..62c4058 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 @@ -174,6 +174,12 @@ public class StationRequestBean implements Serializable { @ApiParam("区域代码") private String areaCode; + @ApiParam("数量") + private Integer qty; + + @ApiParam("班次名称") + private String shiftName; + @Override public String toString() { return "StationRequestBean{" + 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 ffe13b9..cae893e 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 @@ -296,8 +296,15 @@ public class MesHqlPack { */ public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode); - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); + if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterCode())) { + DdlPreparedPack.getStringLikePack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterName())) { + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterName(), "workCenterName", packBean); + } + if (!StringUtils.isEmpty(mesWorkCenter.getAreaCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); + } return packBean; } @@ -310,13 +317,13 @@ public class MesHqlPack { public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode); if (!StringUtils.isEmpty(mesWorkCell.getWorkCenterCode())) { - DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean); } if (!StringUtils.isEmpty(mesWorkCell.getAreaCode())) { - DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean); + DdlPreparedPack.getStringLikerPack(mesWorkCell.getAreaCode(), "areaCode", packBean); } if (!StringUtils.isEmpty(mesWorkCell.getWorkCellCode())) { - DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean); } return packBean; From 2636e43b9b37f6fcc005fc805a974da788daf346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 24 Jul 2020 22:50:02 +0800 Subject: [PATCH 75/87] =?UTF-8?q?=E3=80=909914=20=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 40dadcc..677525f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -74,6 +74,10 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("工单状态") private Integer workOrderStatus; + @Column(name = "IS_PULL") + @ApiParam("是否投料") + private Integer isPull = 2; + @Column(name = "WO_TYPE") @ApiParam("工单类型") private Integer workOrderType; From 5006e0a9383b61b495f43884891c09083703040b Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 25 Jul 2020 12:43:08 +0800 Subject: [PATCH 76/87] =?UTF-8?q?Finish=20Task=20#2520=20Cost:8h=202520=20?= =?UTF-8?q?07=201.2.3.3.4=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3WMS-?= =?UTF-8?q?JIS=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5=E4=B8=8E=E5=86=85?= =?UTF-8?q?=E9=83=A8=E7=A7=BB=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 6f05876..6447a3a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -177,4 +177,15 @@ public class WmsDocFgDetail extends BaseBean { @Column(name = "QUEUE_GROUP_NO") @ApiParam(value = "jis料架号") private String queueGroupNo; + + @Column(name = "JIS_NO") + @ApiParam(value = "jis编号") + private String jisNo; + + public WmsDocFgDetail(String jisNo) { + this.jisNo = jisNo; + } + + public WmsDocFgDetail() { + } } From 457cb894db696f5cad335b71bf41bfd3f1cbd4a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 25 Jul 2020 16:11:42 +0800 Subject: [PATCH 77/87] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E9=98=9F=E5=88=97=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesWorkCellPoint.java | 4 +++ .../pojo/mes/model/WorkCellPointInfoModel.java | 34 ++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WorkCellPointInfoModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java index ed04956..9ab0cb3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java @@ -50,6 +50,10 @@ public class MesWorkCellPoint extends BaseBean implements Serializable { @ApiParam("队列明细表序号") private Double queueDetailSeq; + @Column(name = "VIN_CODE") + @ApiParam("Vin") + private String vinCode; + public double getQueueSeqVal() { return this.queueSeq == null ? 0 : this.queueSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WorkCellPointInfoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WorkCellPointInfoModel.java new file mode 100644 index 0000000..a809539 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WorkCellPointInfoModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: adair.song + * @CreateDate: 2020/07/25 14:21 + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("工位队列信息model") +public class WorkCellPointInfoModel { + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("工作单元名称") + private String workCellName; + + @ApiParam("Vin") + private String vinCode; + + @ApiParam("组织代码") + private String organizeCode; +} From 9bde10f13c3fd92fc241240249e65e2934b5e07d Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 25 Jul 2020 16:28:57 +0800 Subject: [PATCH 78/87] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=9B=9E=E6=89=A7=E7=95=8C=E9=9D=A2=E6=89=93=E4=B8=8D=E5=BC=80?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 6 +++--- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index de91d7b..54687f5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -231,9 +231,9 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "备注1") private Integer remake; - @Column(name = "DESC") - @ApiParam(value = "备注2") - private String desc; +// @Column(name = "DESC") +// @ApiParam(value = "备注2") +// private String desc; @Transient @ApiParam(value = "发运单号") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 2a5f544..cbc5b58 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -221,9 +221,9 @@ public class WmsMoveToERP extends BaseBean { @ApiParam(value = "成本中心") private String costCenter; - @Column(name = "DESC") - @ApiParam(value = "备注2") - private String desc; +// @Column(name = "DESC") +// @ApiParam(value = "备注2") +// private String desc; @Column(name = "QUEUE_GROUP_NO") @ApiParam(value = "jis料架号") From 0eb571d71771d29c5305552608a5186b9f32ccb1 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 25 Jul 2020 23:48:40 +0800 Subject: [PATCH 79/87] Fix bug #9804 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 4 ++++ 1 file changed, 4 insertions(+) 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 84530c1..902425b 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 @@ -175,6 +175,10 @@ public class WmsPOMaster extends BaseBean { @Column(name = "SHIPMENT_NOTE_NUMBER") public String shipmentNoteNumber; + @ApiParam("erp单号") + @Column(name = "ERP_SRC_NO") + private String erpSrcNo; + public WmsPOMaster() { } From ef40f20e1d2aadffc036b1458ff3b6875b8c6379 Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 26 Jul 2020 18:07:00 +0800 Subject: [PATCH 80/87] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= 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-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 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 11691be..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-PROD-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 8ef99a3..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-PROD-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 a6c1bea..d2521de 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-PROD-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 0a2f9d4..b599490 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-PROD-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 5f809e6..aca1465 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-PROD-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 557548a..ae38208 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-PROD-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 8778b3c..a6a0d68 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-PROD-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 34a7337..04b40d4 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-PROD-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 670eb15..6854e65 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-PROD-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 ce2dc01..ac387fd 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-PROD-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 b8c9643..bbe0ff9 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-PROD-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 1d29933..be533a6 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-PROD-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 284225c..14e8567 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-PROD-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 7ff16c9..102ab0e 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-PROD-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 353a02b..864c56a 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index b125cee..e755225 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-PROD-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 c9d54a9..194f0cb 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-PROD-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 39f1e2f..60543fe 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-PROD-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 df01041..bdc4cab 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-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index c2104bf..cc8fce6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index ae014e9..0786d8d 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-PROD-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From b04ef3caa444b5c0bcff69738aa92cd0041eb02e Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 26 Jul 2020 18:24:09 +0800 Subject: [PATCH 81/87] =?UTF-8?q?=E5=90=88=E5=B9=B6TEST=E5=88=86=E6=94=AF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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-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 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..1e17935 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..37b8a51 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index aca1465..0a44fb0 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index a6a0d68..ba89b61 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..fdcf6e3 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..60d9861 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..54c8306 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..190efa7 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..5896851 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..80498fc 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..076f15a 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..1351ed3 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..67b0bff 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..15d36cd 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc8fce6..2eddf76 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..268eaf2 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-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 5fa18e05f14f59ca205559d48ca23e8a55a3a773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sun, 26 Jul 2020 20:27:55 +0800 Subject: [PATCH 82/87] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=88=AA?= =?UTF-8?q?=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/mes/bean/MesQcOrder.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 7a27711..925d075 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -124,4 +124,8 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("产品条码") private String productSn; + @Transient + @ApiParam("本批次生产总数") + private Double locSrcLotNoQty; + } From 4d608dd4c327abf14df1674122cf16fc0c57c142 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 27 Jul 2020 01:14:49 +0800 Subject: [PATCH 83/87] =?UTF-8?q?=E6=89=A9=E5=B1=95dispatcher=20model?= 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 ++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index d609b14..38a7634 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 @@ -21,7 +21,8 @@ public class MesPcnEnumUtil { REVEAL_MODULE(20, "展示组件"), BUTTON_MODULE(30, "按钮组件"), TIMING_MODULE(40, "定时组件"), - PCS_BACK_MODULE(50, "工序后台组件"); + PCS_BACK_MODULE(50, "工序后台组件"), + PLC_CALLBACK_MODULE(60, "PLC回调工位参数"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 576a580..4e09969 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -138,6 +138,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("数据方向 10 plc->mes 20 mes->plc 30共用地址") private Integer dataDirect; + @Column(name = "CALLBACK_METHOD") + @ApiParam("回调方法名称") + private String callbackMethod; + @Transient @ApiParam("设备名称") private String equipmentName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java index ec019ee..a3e7ec9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java @@ -22,6 +22,10 @@ public class StepDispatchModel { private String moduleDataMapKey; + private String pfKey; + + private String dlKey; + private String scanInfo; public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String moduleDataMapKey, String scanInfo) { From 7ca3b43bfe7eb7de370345fb08a0a8838f7d7abb Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 27 Jul 2020 11:44:42 +0800 Subject: [PATCH 84/87] =?UTF-8?q?=E5=90=88=E5=B9=B6DEV=E5=88=86=E6=94=AF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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-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 +- 21 files changed, 21 insertions(+), 21 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 1e17935..d2521de 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 37b8a51..b599490 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 0a44fb0..aca1465 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 6df1cc2..ae38208 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 ba89b61..a6a0d68 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 fdcf6e3..04b40d4 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 d266163..6854e65 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 60d9861..ac387fd 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 54c8306..bbe0ff9 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 190efa7..be533a6 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 5896851..14e8567 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 aa3dd42..102ab0e 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 80498fc..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 076f15a..e755225 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 1351ed3..194f0cb 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 67b0bff..60543fe 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 15d36cd..bdc4cab 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 2eddf76..cc8fce6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 268eaf2..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 768e31e636c65c0c717a3de1b05874c89d44cf19 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 27 Jul 2020 11:48:32 +0800 Subject: [PATCH 85/87] Fix Bug #9995 --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 35 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesStationBom.java | 8 +++++ 2 files changed, 43 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 7f802e0..f4bba13 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 @@ -6751,4 +6751,39 @@ public class MesEnumUtil { return null; } } + + /** + * 工位BOM 绑定物料类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BIND_PART_TYPE { + POSITIVE(10, "半成品"), + REVERSE_SIDE(20, "原材料"); + + private Integer value; + private String description; + + BIND_PART_TYPE(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 85e63bf..0bda076 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -82,6 +82,14 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam(value = "匹配规则") private Integer matchRule; + @Column(name = "BIND_PART_TYPE") + @ApiParam(value = "绑定物料类型") + private Integer bindPartType; + + @Column(name = "FEED_WARNING_QTY") + @ApiParam(value = "投料预警值") + private Double feedWarningQty; + @Transient @ApiParam("是否已绑定") private Boolean isBind; From e5d54d8c0ab11d34ad0988440f6ef0eb45b88420 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 27 Jul 2020 11:59:33 +0800 Subject: [PATCH 86/87] =?UTF-8?q?=E5=B7=A5=E4=BD=8DBOM=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=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/MesStationBom.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/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 0bda076..7cd1e59 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -84,7 +84,7 @@ public class MesStationBom extends BaseBean implements Serializable { @Column(name = "BIND_PART_TYPE") @ApiParam(value = "绑定物料类型") - private Integer bindPartType; + private Integer bindPartType = 20; @Column(name = "FEED_WARNING_QTY") @ApiParam(value = "投料预警值") From 5f90efe691371845bea2b0ed8c19f0d3dfec9553 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 27 Jul 2020 16:25:02 +0800 Subject: [PATCH 87/87] =?UTF-8?q?Fix=20bug#9982=2019125+=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E9=A1=B5=E9=9D=A2=EF=BC=8CerpSrcNo=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=95=B0=E6=8D=AE=E9=94=99=E8=AF=AF=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=89=93=E5=8D=B0=E5=87=BA=E7=9A=84=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9C=89=E8=AF=AF+0727?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 7c2aaa7..6d0cf25 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 @@ -507,6 +507,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "颜色") private String color; + @Transient + @ApiParam(value = "单据") + private String orderNo; + public WmsStockSn() { } @@ -753,7 +757,7 @@ public class WmsStockSn extends BaseBean { String shippingFlag, String workCenterCode, Integer snType, String packagePartNo, Integer useCount, Integer seqNo, String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc, - String prodCfgTypeName, String custNameRdd, String workOrderCode, String color) { + String prodCfgTypeName, String custNameRdd, String workOrderCode, String color, String orderNo) { this.organizeCode = organizeCode; this.id = id; this.sn = sn; @@ -801,6 +805,7 @@ public class WmsStockSn extends BaseBean { this.custNameRdd = custNameRdd; this.workOrderCode = workOrderCode; this.color = color; + this.orderNo = orderNo; } public WmsStockSn(String packageNo, Double qty, String qualityDate, String lotNo, String dateCode, String leftCode, String fixLotNo) {