From 729a7b6990cb866dba8b4196c54c72fd073e1a9d Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 8 Sep 2020 13:09:56 +0800 Subject: [PATCH 01/33] =?UTF-8?q?=E5=90=88=E5=B9=B6=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-mongo/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 +- 22 files changed, 22 insertions(+), 22 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-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..3751cf9 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/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 1674a47..f10cf39 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 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 cc6131f..0cfb344 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 1e9f1a5c47084c7a9ddf6e5d210a318bda3cfea9 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sun, 13 Sep 2020 22:47:53 +0800 Subject: [PATCH 02/33] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E6=B5=8B=201?= 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-mongo/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 36 ++++++++++++++++ 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/MesCheckDataCfg.java | 47 ++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQcCheckStandard.java | 50 ++++++++++++++++------ .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 4 ++ .../i3plus/pojo/mes/bean/MesQcOrderDetail.java | 47 +++++++++++++++----- .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 16 +++---- 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 +- 27 files changed, 187 insertions(+), 55 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCheckDataCfg.java 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-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 3751cf9..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/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-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 95020ed..900e85d 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 @@ -5170,4 +5170,40 @@ public class MesPcnEnumUtil { } } + /** + * 客户JIT生产队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_CHECK_DATA_SOURCE { + DB(10, "数据库"), + PLC(20, "PLC"), + MANUAL_INPUT(30, "人工输入"); + + private int value; + private String description; + + QC_CHECK_DATA_SOURCE(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; + } + } + } 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 f10cf39..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-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-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCheckDataCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCheckDataCfg.java new file mode 100644 index 0000000..4fb2273 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCheckDataCfg.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/9/11 14:29 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CHECK_DATA_CFG", indexes = { + @Index(columnList = "CHECK_CFG_NO") +}) +@Api("检测数据源配置") +public class MesCheckDataCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -5608847087804566577L; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "FIELD_CODE") + @ApiParam("字段代码") + private String fieldCode; + + @Column(name = "CHECK_CFG_NO") + @ApiParam("检测值配置编号") + private String checkCfgNo; + + +} 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 1b6ee58..1b50bdb 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 @@ -64,18 +64,6 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("频率") private String checkFrequency; - @Transient - @ApiParam("物料名称") - private String partName; - - @Transient - @ApiParam("检测结果") - private String checkResult; - - @Transient - @ApiParam("检测值") - private String checkValue; - @Column(name = "CHECK_ITEM_TYPE") @ApiParam("检测项类型") private String checkItemType; @@ -86,12 +74,32 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @Column(name = "IS_CONCESSION") @ApiParam("是否允许让步") - private Integer isConcession = 0; + private Integer isConcession; @Column(name = "NUMBER_FLAG") @ApiParam("数量标识") private String numberFlag; + @Column(name = "QTY") + @ApiParam("检测数量") + private Integer qty; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CHECK_ORDER_TYPE") + @ApiParam("任务单类型") + private String checkOrderType; + + @Column(name = "DATA_SOURCE") + @ApiParam("数据来源") + private String dataSource; + + @Column(name = "CHECK_VALUE_TYPE") + @ApiParam("任务单类型") + private String checkValueType; + @Column(name = "MAXIMUM") @ApiParam("最大数") private Double maximum = 0d; @@ -100,6 +108,22 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("最小数") private Double minimum = 0d; + @Column(name = "IS_KEY_CHECK_ITEM") + @ApiParam("是否关键检测项") + private Integer isKeyCheckItem; + + @Transient + @ApiParam("物料名称") + private String partName; + + @Transient + @ApiParam("检测结果") + private String checkResult; + + @Transient + @ApiParam("检测值") + private String checkValue; + @Transient @ApiParam("检测类型名称") private String checkTypeName; 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 d2e184a..7e25367 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 @@ -112,6 +112,10 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("样本类型") private Integer sampleType; + @Column(name = "CHECK_ORDER_TYPE") + @ApiParam("任务单类型") + private String checkOrderType; + @ApiParam(value = "检测结果") @Transient private String reulstStatus; 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 c78132b..a999a66 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 @@ -29,7 +29,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QC_ORDER_DETAIL") @Api("MES_检验单明细") -public class MesQcOrderDetail extends BaseBean implements Serializable { +public class MesQcOrderDetail extends BaseBean implements Serializable { private static final long serialVersionUID = -5412635747424111476L; @Column(name = "ORDER_NO") @@ -68,6 +68,10 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam("判定结果") private Integer checkReulst = 0; + @Column(name = "CHECK_VALUE") + @ApiParam("检测值") + private String checkValue; + @Column(name = "ITEM_NO") @ApiParam("检验行号") private Integer itemNo = 0; @@ -76,17 +80,13 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam("产品条码") private String serialNumber; - @Column(name = "CHECK_VALUE") - @ApiParam("检测值") - private String checkValue; - - @ApiParam(value = "已完成数量") - @Transient - private Integer finishQty = 0; + @Column(name = "QTY") + @ApiParam("数量") + private Integer qty; - @ApiParam(value = "检测项类型名称") - @Transient - private String businessTypeName; + @Column(name = "FINISH_QTY") + @ApiParam("已检数量") + private Integer finishQty; @Column(name = "MAXIMUM") @ApiParam("最大数") @@ -95,4 +95,29 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Column(name = "MINIMUM") @ApiParam("最小数") private Double minimum = 0d; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "DATA_SOURCE") + @ApiParam("数据源") + private String dataSource; + + @Column(name = "CHECK_VALUE_TYPE") + @ApiParam("检测值类型") + private String checkValueType; + + @Column(name = "IS_KEY_CHECK_ITEM") + @ApiParam("是否关键检测项") + private Integer isKeyCheckItem; + + @ApiParam(value = "检测项类型名称") + @Transient + private String businessTypeName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index c7e2797..bcac673 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -465,20 +465,16 @@ public class MesPcnHqlPack { } /** - * 获取工作中心下所有的投料数据 + * 获取检测单下的所有检测明细 * - * @param mesQcOrderDetail + * @param qcOrder * @param organizeCode * @return */ - public static DdlPackBean getMesQcOrderDetail(MesQcOrderDetail mesQcOrderDetail, String organizeCode) { - DdlPackBean packBean = getAllBaseData(organizeCode); - DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getOrderNo(), "orderNo", packBean); - DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getCheckType(), "checkType", packBean); - DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getCheckItemType(), "checkItemType", packBean); - if (mesQcOrderDetail.getCheckType() == MesPcnEnumUtil.MES_QC_CHECK_TYPE.FIRST_CHECK.getValue()) { - DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getFinishQty() + 1, "itemNo", packBean); - } + public static DdlPackBean getMesQcOrderDetail(MesQcOrder qcOrder, String organizeCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(qcOrder.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getNumEqualPack(qcOrder.getCheckType(), "checkType", packBean); return packBean; } 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 0cfb344..cc6131f 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 From 7412eb3f16dcdc5b3e83fbc33d9d06c0f59dc9d1 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 14 Sep 2020 13:44:54 +0800 Subject: [PATCH 03/33] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesQcOrderRecord.java | 54 ++++++++++++++++++++++ .../mes/repository/MesCheckDataCfgRepository.java | 14 ++++++ 2 files changed, 68 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCheckDataCfgRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java new file mode 100644 index 0000000..72337e6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QC_ORDER_RECORD") +@Api("MES_检验单检验记录") +public class MesQcOrderRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -5245624982023882232L; + + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "CHECK_RESULT") + @ApiParam("判定结果") + private Integer checkResult = 0; + + @Column(name = "CHECK_VALUE") + @ApiParam("检测值") + private String checkValue; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "CHECK_SEQ") + @ApiParam("检测顺序") + private Integer checkSeq; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCheckDataCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCheckDataCfgRepository.java new file mode 100644 index 0000000..06bc4e1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCheckDataCfgRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesCheckDataCfg; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesCheckDataCfgRepository extends BaseRepository { +} From 531fe743c2181351413a4c171a7f82ea66260882 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 15 Sep 2020 14:23:19 +0800 Subject: [PATCH 04/33] =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=A3=80=E6=B5=8B=20?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=A6=96=E6=A3=80=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 51 +++++++++++++++++++--- .../i3plus/pojo/mes/bean/MesQcOrderDetail.java | 20 +++++---- .../mes/repository/MesQcOrderRecordRepository.java | 18 ++++++++ 3 files changed, 76 insertions(+), 13 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRecordRepository.java 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 1500290..4b63234 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 @@ -5208,18 +5208,59 @@ public class MesPcnEnumUtil { } /** - * 客户JIT生产队列状态 + * 过程检测数据源类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QC_CHECK_DATA_SOURCE { - DB(10, "数据库"), - PLC(20, "PLC"), - MANUAL_INPUT(30, "人工输入"); + DB(10, "10", "数据库"), + PLC(20, "20", "PLC"), + MANUAL_INPUT(30, "30", "人工输入"); + + private int value; + private String description; + private String code; + + QC_CHECK_DATA_SOURCE(int value, String code, String description) { + this.value = value; + this.description = description; + this.code = code; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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; + } + } + + /** + * 过程检测检测对象数据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_CHECK_VALUE_TYPE { + STRING(10, "字符串"), + INTEGER(20, "数值"); private int value; private String description; - QC_CHECK_DATA_SOURCE(int value, String description) { + QC_CHECK_VALUE_TYPE(int value, String description) { this.value = value; this.description = description; } 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 a999a66..6fefde1 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 @@ -64,14 +64,6 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam("是否允许让步") private Integer isConcession = 0; - @Column(name = "CHECK_REULST") - @ApiParam("判定结果") - private Integer checkReulst = 0; - - @Column(name = "CHECK_VALUE") - @ApiParam("检测值") - private String checkValue; - @Column(name = "ITEM_NO") @ApiParam("检验行号") private Integer itemNo = 0; @@ -120,4 +112,16 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Transient private String businessTypeName; + @Column(name = "CHECK_CFG_NO") + @ApiParam("检测值配置编号") + private String checkCfgNo; + + @Transient + @ApiParam("判定结果") + private Integer checkResult = 0; + + @Transient + @ApiParam("检测值") + private String checkValue; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRecordRepository.java new file mode 100644 index 0000000..33abfd8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRecordRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart; +import cn.estsh.i3plus.pojo.mes.bean.MesQcOrderRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-05-20 + * @Modify: + **/ +@Repository +public interface MesQcOrderRecordRepository extends BaseRepository { + +} From dd1ece9be844ab91c49e362945ebe745c642f773 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 15 Sep 2020 17:45:32 +0800 Subject: [PATCH 05/33] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=20=E6=A3=80=E6=B5=8B=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=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 | 24 ++++++++++++++++++++-- 1 file changed, 22 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 4b63234..8b95c10 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 @@ -3779,7 +3779,7 @@ public class MesPcnEnumUtil { * 整体检测结果状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum CHECK_REULST { + public enum CHECK_RESULT { PASS(10, "通过"), NON_PASS(20, "不通过"), @@ -3788,7 +3788,7 @@ public class MesPcnEnumUtil { private int value; private String description; - CHECK_REULST(int value, String description) { + CHECK_RESULT(int value, String description) { this.value = value; this.description = description; } @@ -5284,4 +5284,24 @@ public class MesPcnEnumUtil { } } + /** + * 过程检测检测检测结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_CHECK_VALUE_RESULT { + OK(10), + NOT_OK(20), + MANUAL(30); + + private int value; + + QC_CHECK_VALUE_RESULT(int value) { + this.value = value; + } + + public int getValue() { + return value; + } + } + } From 900fd5d5b7498a9def96703ef06fd5d4801e7e4d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 15 Sep 2020 19:30:41 +0800 Subject: [PATCH 06/33] =?UTF-8?q?MGN=E6=A0=87=E5=87=86=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BF=AE=E6=94=B9=E6=8B=86=E5=8C=85?= 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 | 8 ++++++++ 1 file changed, 8 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 143f6d8..530005d 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 @@ -401,4 +401,12 @@ public class WmsMoveSn extends BaseBean { this.srcSnStatus = srcSnStatus; this.destSnStatus = destSnStatus;; } + + + public WmsMoveSn(String sn, String refSrc, String transTypeName, Integer itemStatus) { + this.sn = sn; + this.refSrc = refSrc; + this.transTypeName = transTypeName; + this.itemStatus = itemStatus; + } } From 6dca5ccb0988dd87d1dcd16987a2360db765f4d2 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 15 Sep 2020 21:23:24 +0800 Subject: [PATCH 07/33] =?UTF-8?q?=E5=BC=82=E6=AD=A5=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java index 917b27c..77ab351 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java @@ -23,5 +23,14 @@ public class FutrueTaskModel { @ApiParam("过程条码") private MesProduceSn produceSn; + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + } From 163d0773a95d0a6f626cfa4b71aa5bb553467ba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 16 Sep 2020 00:28:21 +0800 Subject: [PATCH 08/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= 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-mongo/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 +- 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-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/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 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 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 f06d17f..cc6131f 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 7ab755c9f58a5531f027bc53fb028f7605a91e3a Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 16 Sep 2020 00:46:14 +0800 Subject: [PATCH 09/33] =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=A3=80=E6=B5=8B=2016?= =?UTF-8?q?=20=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/bean/MesLoopQcGenerateDetail.java | 10 ++- .../pojo/mes/bean/MesQcOrderApprovalStatus.java | 89 ++++++++++++++++++++++ .../mes/model/QcOrderCheckDataDetailModel.java | 48 ++++++++++++ .../MesQcOrderApprovalStatusRepository.java | 14 ++++ 4 files changed, 158 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderApprovalStatusRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java index 6a2d772..f7b71d3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java @@ -29,7 +29,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_LOOP_QC_GENERATE_DETAIL") @Api("MES_巡检项生成明细") -public class MesLoopQcGenerateDetail extends BaseBean implements Serializable { +public class MesLoopQcGenerateDetail extends BaseBean implements Serializable { private static final long serialVersionUID = -5412635747424111476L; @Column(name = "RELATION_ORDER_NO") @@ -44,9 +44,13 @@ public class MesLoopQcGenerateDetail extends BaseBean implements Serializable { @ApiParam("检测项") private String checkItem; - @Column(name = "LASR_TIME") + @Column(name = "CHECK_ORDER_TYPE") + @ApiParam("任务单类型") + private String checkOrderType; + + @Column(name = "LAST_TIME") @ApiParam("末次时间") - private String lasrTime; + private String lastTime; @ApiParam(value = "物料号") @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java new file mode 100644 index 0000000..c1774c7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java @@ -0,0 +1,89 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/4/18 21:05 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QC_ORDER_APPROVAL_STATUS") +@Api("检测单审批状态表") +public class MesQcOrderApprovalStatus extends BaseBean implements Serializable { + private static final long serialVersionUID = -3157480917343280506L; + + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("工单号") + private String workOrderNo; + + @Column(name = "PLAN_QTY") + @ApiParam("计划数量") + private Double planQty; + + @Column(name = "CHECK_TYPE") + @ApiParam("检验类型") + private Integer checkType; + + @Column(name = "QC_USER") + @ApiParam("检查人") + private String qcUser; + + @Column(name = "CHECK_RESULT") + @ApiParam("检验结果") + private String checkResult; + + @Column(name = "IS_KEY_CHECK_ITEM") + @ApiParam("是否关键检测") + private Integer isKeyCheckItem; + + @Column(name = "QUALITY_APPROVAL_STATUS") + @ApiParam("质量经理审批状态") + private Integer qualityApprovalStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @Column(name = "QUALITY_CHOICE") + @ApiParam("质量经理审批状态") + private Integer qualityChoice; + + @Column(name = "PRODUCE_APPROVAL_STATUS") + @ApiParam("生产经理审批状态") + private Integer produceApprovalStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @Column(name = "PRODUCE_CHOICE") + @ApiParam("生产经理审批状态") + private Integer produceChoice; + + @Column(name = "APPROVAL_STATUS") + @ApiParam("生产经理审批状态") + private Integer approvalStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java new file mode 100644 index 0000000..170de7d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/9/16 00:24 + * @desc + */ +@Data +public class QcOrderCheckDataDetailModel { + + private Integer checkType; + + private String checkItem; + + private String checkStandard; + + private Integer checkCount; + + private Integer isConcession; + + private Integer isKeyCheckItem; + + private Double max; + + private Double min; + + private String checkValue; + + private Integer checkResult; + + + public QcOrderCheckDataDetailModel(Integer checkType, String checkItem, String checkStandard, Integer checkCount, + Integer isConcession, Integer isKeyCheckItem, Double max, Double min, + String checkValue, Integer checkResult) { + this.checkType = checkType; + this.checkItem = checkItem; + this.checkStandard = checkStandard; + this.checkCount = checkCount; + this.isConcession = isConcession; + this.isKeyCheckItem = isKeyCheckItem; + this.max = max; + this.min = min; + this.checkValue = checkValue; + this.checkResult = checkResult; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderApprovalStatusRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderApprovalStatusRepository.java new file mode 100644 index 0000000..28d572d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderApprovalStatusRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQcOrderApprovalStatus; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesQcOrderApprovalStatusRepository extends BaseRepository { +} From 817f4b28129c1bf40ff35691144781df357c7cad Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 16 Sep 2020 09:26:07 +0800 Subject: [PATCH 10/33] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java index 6224656..7b4df40 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java @@ -45,4 +45,16 @@ public class MesCustProdLine extends BaseBean implements Serializable { @Column(name = "CUST_CODE") @ApiParam("客户代码") private String custCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantCode; + + @Column(name = "CUST_PROD_LINE_FLAG") + @ApiParam("客户产线标识") + private String custProdLineFlag; + + @Column(name = "DOCK_NO") + @ApiParam("dock") + private String dockNo; } From 50c2258f58ca40d65bfa236a2649d683ce456b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 16 Sep 2020 11:31:39 +0800 Subject: [PATCH 11/33] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0=E6=9D=A1=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 35 ++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 37 ++++++++++++++++++++++ 2 files changed, 72 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 ec7d0e5..77340aa 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 @@ -7217,4 +7217,39 @@ public class MesEnumUtil { } } + + /** + * 触发类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STEP_TRIGGER_TYPE { + INTERNAL_TRIGGER(10, "内部触发"), + EXTERNAL_TRIGGER(20, "外部触发"); + + private int value; + private String description; + + STEP_TRIGGER_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; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index bd996b0..eb70530 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -136,6 +136,28 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("产品颜色") private String colorName; + @Transient + @ApiParam("零件号") + private String partNo; + + @Transient + @ApiParam("零件名称") + private String partNameRdd; + + @Transient + @ApiParam("箱数") + private Integer boxQty; + + @Transient + @ApiParam("开始时间") + private String startTime; + + @Transient + @ApiParam("结束时间") + private String endTime; + + public MesQueueOrder(){} + public int getStatusVal() { return this.status == null ? 0 : this.status; } @@ -144,4 +166,19 @@ public class MesQueueOrder extends BaseBean implements Serializable { return this.seq == null ? 0.0d : this.seq; } + public MesQueueOrder(Double seq, String partNo, String partNameRdd,Integer boxQty, + Integer queueType,Integer status,String createUser, + String createDatetime,String modifyUser,String modifyDatetime) { + this.seq = seq; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.boxQty = boxQty; + this.queueType = queueType; + this.status = status; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } + } From ad5c122df80d4263e1ff0f373f11e22073d14a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 16 Sep 2020 16:29:28 +0800 Subject: [PATCH 12/33] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3-=E6=B7=BB=E5=8A=A0=E6=80=BB=E8=A3=85=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=E6=A3=80=E6=B5=8B=E5=BC=B9=E6=A1=86=E5=B7=A5=E6=AD=A5?= =?UTF-8?q?=E5=92=8C=E8=BF=94=E5=B7=A5=E8=BF=94=E4=BF=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ++ .../pojo/mes/model/DismantleRecordModel.java | 46 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/FutrueTaskModel.java | 11 +++++- 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index a22dd03..c809906 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -140,6 +140,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("库位代码") private String locationCode; + @Column(name = "ERP_WORK_CENTER_CODE") + @ApiParam("erp工作中心") + private String erpWorkCenterCode; + @Transient @ApiParam("目标库位代码") private String destLocationCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java new file mode 100644 index 0000000..99913d8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesDismantleRecord; +import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +@Data +public class DismantleRecordModel { + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("缺陷类型") + private String defectType; + + @ApiParam("用户") + private String userInfo; + + @ApiParam("物料拆解集合") + private List dismantleRecordList; + + @ApiParam("不良集合") + private List defectList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java index 77ab351..1fdcdda 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.List; + /** * @Description: 条码解绑实体 * @Reference: @@ -12,7 +14,7 @@ import lombok.Data; * @Modify: **/ @Data -public class FutrueTaskModel { +public class FutrueTaskModel { @ApiParam("实现类") private Object futrueTaskService; @@ -32,5 +34,12 @@ public class FutrueTaskModel { @ApiParam("工作单元代码") private String workCellCode; + @ApiParam("总装批量执行逻辑") + private List requestBeanList; + + @ApiParam("总装批量执行逻辑") + private Object specialBusinessType; + + } From f58e07fa335bb7278d32306fb7f6afcbd06dd586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 16 Sep 2020 16:30:41 +0800 Subject: [PATCH 13/33] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3-=E6=B7=BB=E5=8A=A0=E6=80=BB=E8=A3=85=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=E6=A3=80=E6=B5=8B=E5=BC=B9=E6=A1=86=E5=B7=A5=E6=AD=A5?= =?UTF-8?q?=E5=92=8C=E8=BF=94=E5=B7=A5=E8=BF=94=E4=BF=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java index 99913d8..931906d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DismantleRecordModel.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.mes.bean.MesDefect; import cn.estsh.i3plus.pojo.mes.bean.MesDismantleRecord; -import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; import io.swagger.annotations.ApiParam; import lombok.Data; From ba8022f9ca4ea1c858bd915e57fa7ee174e65401 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 16 Sep 2020 19:31:29 +0800 Subject: [PATCH 14/33] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=98=9F=E5=88=97?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=A2=9E=E5=8A=A0=E6=9D=A1=E7=A0=81=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 382dd6a..e33fd3a 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 @@ -124,6 +124,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("分组序号") private String groupSeq; + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + @Transient @ApiParam("Vin") private String vinCode; @@ -181,10 +185,6 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { private Integer masterStatus; @Transient - @ApiParam("产品条码") - private String productSn; - - @Transient @ApiParam("队列类型") private Integer queueType; From ae6ffa27f485c8dc61694b5f71fef69e865a82ce Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 16 Sep 2020 21:15:50 +0800 Subject: [PATCH 15/33] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/tool/DdlPreparedPack.java | 28 +++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 4 +++ .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 35 +++++++++++++++++++++- 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 926f68f..341490d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.base.tool; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import org.apache.commons.lang3.StringUtils; import java.text.SimpleDateFormat; @@ -649,6 +650,33 @@ public class DdlPreparedPack { } } + + /** + * 多个字段列or查询 + * + * @param data + * @param columnNames + * @param columnNamesKey + * @param packBean + */ + public static void getMultOrPackString(String data, List columnNames, String columnNamesKey, DdlPackBean packBean) { + StringBuffer sbf = new StringBuffer(" and ( "); + if (StringUtil.isEmpty(columnNamesKey)) { + columnNamesKey = "mult_column_name"; + } + for (int i = 0; i < columnNames.size(); i++) { + String columnName = columnNames.get(i); + sbf.append(" model." + columnName + "=:m_" + columnNamesKey); + if (i == columnNames.size() - 1) { + continue; + } + sbf.append(" or "); + } + sbf.append(" )"); + packBean.addColumnQuery(columnNamesKey, sbf.toString(), data); + + } + /** * 封装in String查询语句 * 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 68738c4..fda0174 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 @@ -265,6 +265,10 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", @ApiParam(value = "jis料架号") private String queueGroupNo; + @Transient + @ApiParam(value = "来源存储区/目标存储区") + private Integer srcOrDestZoneno; + 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/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index a587db3..6312970 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -9,7 +9,11 @@ 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 java.util.List; /** @@ -154,6 +158,12 @@ public class WmsStockQuan extends BaseBean { @Transient private Integer isSnapshot; + + @Transient + @ApiParam(value = "应有数量") + private Double theoryQty; + + public Integer getIsSnapshot() { return this.isSnapshot == null ? 0 : this.isSnapshot; } @@ -229,11 +239,34 @@ public class WmsStockQuan extends BaseBean { this.freezeQty = freezeQty; this.consignQty = consignQty; this.lockQty = lockQty; + this.sumQty = sumQty; this.prodCfgTypeCode = prodCfgTypeCode; this.prodCfgTypeName = prodCfgTypeName; this.scrapQty = scrapQty; } + public WmsStockQuan(String organizeCode, String whNo, String zoneNo, String unit, String partNo, String partName, + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, + Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) { + this.organizeCode = organizeCode; + this.whNo = whNo; + this.zoneNo = zoneNo; + this.unit = unit; + this.partNo = partNo; + this.partNameRdd = partName; + this.qty = qty; + this.failQty = failQty; + this.holdQty = holdQty; + this.qcQty = qcQty; + this.rinQty = rinQty; + this.freezeQty = freezeQty; + this.consignQty = consignQty; + this.lockQty = lockQty; + this.sumQty = sumQty; + this.prodCfgTypeCode = prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; + this.scrapQty = scrapQty; + } public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { this.qty = qty; this.failQty = failQty; From 5e0c0a40517b452b0d4da8281ca165315b6f66d0 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 16 Sep 2020 21:18:13 +0800 Subject: [PATCH 16/33] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index ef66f02..9b0e4ed 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1203,8 +1203,15 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", packBean); - DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", packBean); - DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", packBean); + if (wmsMoveDetails.getSrcOrDestZoneno() != null && wmsMoveDetails.getSrcOrDestZoneno().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { + List columnNames = new ArrayList<>(); + columnNames.add("srcZoneNo"); + columnNames.add("destZoneNo"); + DdlPreparedPack.getMultOrPackString(wmsMoveDetails.getZoneNo(), columnNames, null, packBean); + } else { + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", packBean); + } DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", packBean); DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", packBean); From 1072b4fd046ba5d07e495da9c46c649d6445bed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 16 Sep 2020 22:47:10 +0800 Subject: [PATCH 17/33] =?UTF-8?q?=E3=80=90=E5=8D=8A=E6=88=90=E5=93=81?= =?UTF-8?q?=E9=A2=84=E8=A3=85=E9=98=9F=E5=88=97=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/MesQueueOrder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index eb70530..aa802ef 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -168,7 +168,7 @@ public class MesQueueOrder extends BaseBean implements Serializable { public MesQueueOrder(Double seq, String partNo, String partNameRdd,Integer boxQty, Integer queueType,Integer status,String createUser, - String createDatetime,String modifyUser,String modifyDatetime) { + String createDatetime,String modifyUser,String modifyDatetime,String workType) { this.seq = seq; this.partNo = partNo; this.partNameRdd = partNameRdd; @@ -179,6 +179,7 @@ public class MesQueueOrder extends BaseBean implements Serializable { this.createDatetime = createDatetime; this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; + this.workType = workType; } } From 17dae8208170089ee5c2ac10b690c76e387408e5 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Thu, 17 Sep 2020 07:53:52 +0800 Subject: [PATCH 18/33] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E5=B7=A5=E5=8D=95=E7=9A=84=E6=BB=91=E5=8A=A8=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java | 5 +++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java | 17 +++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java index 52fb00f..4ca4350 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : MES_生产计划主表 @@ -86,6 +87,10 @@ public class MesPpMaster extends BaseBean{ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_PLAN_STATUS") private Integer workOrderPlanStatus; + @Transient + @ApiParam("是否要从拉动计算中扣除") + private boolean needMinutPullQty = false; + public Integer getOrderStatus() { return orderStatus == null ? 0 : this.orderStatus.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java index bce6ced..1840675 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java @@ -72,13 +72,18 @@ public class WmsWorkCenter extends BaseBean { searchColumnName = "zoneNo,locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String descLocationCode; - - /** - * 分钟 - **/ - @Column(name = "ADVANCE_PULL_TIMES", columnDefinition = "int default 0") + @Column(name = "PRE_READY_MINUTE", columnDefinition = "int default 180") @ApiParam(value = "提前拉动时间") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) - private Integer advancePullTimes; + private Integer preReadyMinute; + + @Column(name = "PULL_RANGE_MINUTE", columnDefinition = "int default 180") + @ApiParam(value = "拉动区间时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer pullRangeMinute; + @Column(name = "NEXT_PULL_TIME", columnDefinition = "varchar(50) default '' ") + @ApiParam(value = "下次拉动时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private String nextPullTime; } From f9db132861acda07d57feea80d613b71bc344900 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 17 Sep 2020 10:24:42 +0800 Subject: [PATCH 19/33] =?UTF-8?q?=E5=9D=A4=E6=B3=B0SWEBU9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index 691defd..6e210ce 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -11,7 +11,8 @@ public class WmsInterfaceEnumUtil { MES2WMS(30, "MES2WMS", "MES --> WMS"), WMS2MES(40, "WMS2MES", "WMS --> MES"), SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"), - WMS2SWEB(50, "WMS2SWEB", "WMS --> SWEB"); + WMS2SWEB(50, "WMS2SWEB", "WMS --> SWEB"), + SAP2SWEB(50, "SAP2SWEB", "SAP --> SWEB"); private int value; private String name; From a9b18733ec1541423e4362c772ba0fa4d330e035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 17 Sep 2020 16:27:33 +0800 Subject: [PATCH 20/33] =?UTF-8?q?=E3=80=9011218=2019081-=E5=AE=89=E7=81=AF?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=A2=9E=E5=8A=A0PLC=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E4=B8=89=E8=89=B2=E7=81=AF-20200910=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java | 20 ++++++++++++++++++++ .../i3plus/pojo/andon/model/CommonMsgModel.java | 3 ++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java index 385b069..cc45276 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java @@ -51,6 +51,22 @@ public class AndonPLC extends BaseBean implements Serializable { @ApiParam(value = "IP地址") private String nodeIP; + @Column(name = "CHANNEL") + @ApiParam("通道") + private String channel; + + @Column(name = "DEVICE") + @ApiParam("终端") + private String device; + + @Column(name = "OPC_URL") + @ApiParam("OPCUA路径") + private String opcUrl; + + @Column(name = "NAME_SPACE_INDEX") + @ApiParam("空间索引") + private Integer nameSpaceIndex = 2; + @Column(name = "CHANNEL_NAME") @ApiParam(value = "通道名称") private String channelName; @@ -67,6 +83,10 @@ public class AndonPLC extends BaseBean implements Serializable { @ApiParam(value = "标签类型") private String tagType; + @Column(name = "DATA_TYPE") + @ApiParam("标签数据类型") + private String dataType; + @Column(name = "GROUP_NO") @ApiParam(value = "分组号") private String groupNo; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java index 47588b4..b6ac672 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,7 +32,7 @@ public class CommonMsgModel implements Serializable { private String msgType; @ApiModelProperty("消息数据") - private Map msgData; + private Map msgData = new HashMap<>(); @ApiModelProperty("流程状态集合") private List routeStatusList; From 21ca0a9d0d74ff3bcbb1f34228b650032ca83f22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 17 Sep 2020 16:47:02 +0800 Subject: [PATCH 21/33] =?UTF-8?q?=E3=80=9011437=2019081-=E5=8D=8A=E6=88=90?= =?UTF-8?q?=E5=93=81=E9=A2=84=E8=A3=85=E9=98=9F=E5=88=97=E4=BC=98=E5=8C=96?= =?UTF-8?q?-20200917=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/MesQueueOrder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index aa802ef..5d1f42f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -168,7 +168,7 @@ public class MesQueueOrder extends BaseBean implements Serializable { public MesQueueOrder(Double seq, String partNo, String partNameRdd,Integer boxQty, Integer queueType,Integer status,String createUser, - String createDatetime,String modifyUser,String modifyDatetime,String workType) { + String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo) { this.seq = seq; this.partNo = partNo; this.partNameRdd = partNameRdd; @@ -180,6 +180,7 @@ public class MesQueueOrder extends BaseBean implements Serializable { this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; this.workType = workType; + this.orderNo = orderNo; } } From e18ad44c14385fd39239d38645207c2dfe987332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 17 Sep 2020 19:27:04 +0800 Subject: [PATCH 22/33] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E8=BF=94=E5=B7=A5=E8=BF=94=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) 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 dcf9033..70fab83 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 @@ -12,10 +12,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -88,6 +85,14 @@ public class MesBom extends BaseBean implements Serializable { @ApiParam("BOM代码") private String bomCode; + @Transient + @ApiParam(value = "过程条码") + public String serialNumber; + + @Transient + @ApiParam(value = "已拆解数量") + public Double scrapQty = 0d; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From cce1d91650e03ae7f9ce1b092a91a291449c4ba8 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 17 Sep 2020 21:33:31 +0800 Subject: [PATCH 23/33] =?UTF-8?q?=E5=AE=A2=E9=80=80=E5=A4=87=E4=BB=B6?= =?UTF-8?q?=E8=BF=94=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 73 ++++++++++++++- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 38 +++++++- .../pojo/mes/bean/MesQueueJitActualDetail.java | 20 ++++ .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 8 ++ .../i3plus/pojo/mes/model/QueueJitActualModel.java | 102 +++++++++++++++++++++ .../pojo/mes/model/QueueJitActualModule.java | 40 -------- .../i3plus/pojo/mes/model/QueueOrderModel.java | 17 ++++ 7 files changed, 256 insertions(+), 42 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.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 77340aa..83defd0 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 @@ -3325,7 +3325,8 @@ public class MesEnumUtil { SPARE_PART_PRODUCTION(100, "备件生产"), REPRODUCTION_RMS(110, "重新生产-报工"), REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), - REVERSE_SPRAY_ORDER(130, "反喷工单"); + REVERSE_SPRAY_ORDER(130, "反喷工单"), + SPARE_RETURN_REPAIR(140, "客退备件返修"); private int value; private String description; @@ -7252,4 +7253,74 @@ public class MesEnumUtil { return tmp; } } + + /** + * 客户JIT队列明细状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIT_ACTUAL_DETAIL_STATUS { + NORMAL(10, "正常"), + WASHED_MATERIAL(20, "已冲料"); + + private int value; + private String description; + + QUEUE_JIT_ACTUAL_DETAIL_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; + } + } + + /** + * JIS_回冲标识：BACKFLUSH = 正常回冲扣减，REPAIR = 返修冲料 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum JIS_BACKFLUSH_STATUS { + BACKFLUSH("BACKFLUSH", "正常回冲扣减"), + REPAIR("REPAIR", "返修冲料"); + + private String value; + private String description; + + JIS_BACKFLUSH_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } 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 9c495fe..413d343 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 @@ -1884,7 +1884,8 @@ public class MesPcnEnumUtil { SPARE_PART_PRODUCTION(100, "备件生产"), REPRODUCTION_RMS(110, "重新生产-报工"), REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), - REVERSE_SPRAY_ORDER(130, "反喷工单"); + REVERSE_SPRAY_ORDER(130, "反喷工单"), + SPARE_RETURN_REPAIR(140, "客退备件返修"); private int value; private String description; @@ -5211,4 +5212,39 @@ public class MesPcnEnumUtil { } } + /** + * 是否展示放空队列 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SHOW_VENTING_QUEUE { + CREATE(10, "显示"), + SHIPMENT(20, "不显示"); + + private int value; + private String description; + + SHOW_VENTING_QUEUE(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; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index 742a516..ca86eb4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -96,6 +96,22 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @ApiParam("组件编号") private String assyNo; + @Column(name = "JIS_BACKFLUSH_STATUS") + @ApiParam("回冲标识") + private String jisBackflushStatus = "BACKFLUSH"; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "IS_EMPTY") + @ApiParam("是否放空") + private Integer isEmpty; + @Transient @ApiParam("工单类型") private Integer woType; @@ -108,6 +124,10 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @ApiParam("数量") private long qty; + @Transient + @ApiParam("是否拆解件") + private Integer isDisPart; + public MesQueueJitActualDetail() { } 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 e33fd3a..505fd9c 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 @@ -128,6 +128,14 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品条码") private String productSn; + @Column(name = "IS_EMPTY") + @ApiParam("是否放空") + private Integer isEmpty; + + @Column(name = "JIS_BACKFLUSH_STATUS") + @ApiParam("回冲标识") + private String jisBackflushStatus; + @Transient @ApiParam("Vin") private String vinCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java new file mode 100644 index 0000000..4cee1fd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java @@ -0,0 +1,102 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/3/20 9:02 下午 + * @Modify: + */ +@Data +@Api("JIT队列列表Model") +public class QueueJitActualModel { + + private Long id; + @ApiParam("vin") + private String vinCode; + @ApiParam("排序号") + private Double seq; + @ApiParam("分组队列编号") + private String queueGroupNo; + @ApiParam("组内编号") + private Integer groupNo; + @ApiParam("JIT排序号") + private String jitSeq; + + @ApiParam("队列编号") + private String jisActualNo; + + @ApiParam("工单类型") + public Integer workType; + + @ApiParam("工单类型") + public String workTypeName; + + @ApiParam("客户产线代码") + private String custProdLineCode; + + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @ApiParam("产品条码") + private String productSn; + + @ApiParam("明细状态名称") + private Integer detailStatus; + + @ApiParam("明细状态名称") + private String detailStatusName; + + @ApiParam("创建人") + private String createUser; + + @ApiParam("创建时间") + private String createDatetime; + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("用量") + private Double qty = 0d; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料号") + private String partName; + + + public QueueJitActualModel() { + + } + + public QueueJitActualModel(Long id, String vinCode, String jisActualNo, Integer workType, String custProdLineCode, String produceCtgyCode, + String productSn, Integer detailStatus, String createUser, String createDatetime) { + this.id = id; + this.vinCode = vinCode; + this.jisActualNo = jisActualNo; + this.workType = workType; + this.custProdLineCode = custProdLineCode; + this.produceCtgyCode = produceCtgyCode; + this.productSn = productSn; + this.detailStatus = detailStatus; + this.createUser = createUser; + this.createDatetime = createDatetime; + } + + public QueueJitActualModel(Long id, String vinCode, String jisActualNo, String partNo, String partName, String produceCtgyCode, Double qty, + String createUser, String createDatetime) { + this.id = id; + this.vinCode = vinCode; + this.jisActualNo = jisActualNo; + this.partNo = partNo; + this.partName = partName; + this.qty = qty; + this.createUser = createUser; + this.createDatetime = createDatetime; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java deleted file mode 100644 index 4cfc59e..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: - * @Author: jokelin - * @Date: 2020/3/20 9:02 下午 - * @Modify: - */ -@Data -public class QueueJitActualModule { - - private Long id; - @ApiParam("vin") - private String vinCode; - @ApiParam("排序号") - private Double seq; - @ApiParam("分组队列编号") - private String queueGroupNo; - @ApiParam("组内编号") - private Integer groupNo; - @ApiParam("JIT排序号") - private String jitSeq; - - public QueueJitActualModule() { - - } - - public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo, String jitSeq) { - this.id = id; - this.vinCode = vinCode; - this.seq = seq; - this.queueGroupNo = queueGroupNo; - this.groupNo = groupNo; - this.jitSeq = jitSeq; - } - -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 8dc57e7..b16d1f9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -106,6 +106,14 @@ public class QueueOrderModel implements Serializable { private String jitSeq; private Integer status; + @ApiParam("回冲标识") + private String jisBackflushStatus; + @ApiParam("队列编号") + private String jisActualNo; + + @ApiParam("是否放空") + private Integer isEmpty; + public QueueOrderModel() { } @@ -350,4 +358,13 @@ public class QueueOrderModel implements Serializable { this.jitSeq = jitSeq; this.status = status; } + + // getQueueJitActualDetailByNo + public QueueOrderModel(Long id, String jisActualNo, String serialNumber, String vinCode, String jisBackflushStatus) { + this.id = id; + this.jisActualNo = jisActualNo; + this.serialNumber = serialNumber; + this.vinCode = vinCode; + this.jisBackflushStatus = jisBackflushStatus; + } } From e6b5caa61c7c0b0b4ff8b810ee34f18925595e58 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 17 Sep 2020 20:52:08 +0800 Subject: [PATCH 24/33] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java | 8 +++++++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 2ad5530..8902313 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -88,6 +88,11 @@ public class WmsCSRange extends BaseBean { @AnnoOutputColumn(hidden = true) public String areaNo; + @Transient + @ApiParam("存储区") + @AnnoOutputColumn(hidden = true) + public String basZoneNo; + public WmsCSRange(){} public WmsCSRange(String zoneNo,String partNo,String partNameRdd){ @@ -96,8 +101,9 @@ public class WmsCSRange extends BaseBean { this.partNameRdd = partNameRdd; } - public WmsCSRange(String zoneNo, String areaNo, String partNo, String partNameRdd) { + public WmsCSRange(String zoneNo, String basZoneNo, String areaNo, String partNo, String partNameRdd) { this.zoneNo = zoneNo; + this.basZoneNo = basZoneNo; this.areaNo = areaNo; this.partNo = partNo; this.partNameRdd = partNameRdd; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 6312970..6dafc68 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -247,7 +247,7 @@ public class WmsStockQuan extends BaseBean { public WmsStockQuan(String organizeCode, String whNo, String zoneNo, String unit, String partNo, String partName, Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, - Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) { + Double consignQty, Double lockQty, Double totalQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) { this.organizeCode = organizeCode; this.whNo = whNo; this.zoneNo = zoneNo; @@ -262,7 +262,7 @@ public class WmsStockQuan extends BaseBean { this.freezeQty = freezeQty; this.consignQty = consignQty; this.lockQty = lockQty; - this.sumQty = sumQty; + this.totalQty = totalQty; this.prodCfgTypeCode = prodCfgTypeCode; this.prodCfgTypeName = prodCfgTypeName; this.scrapQty = scrapQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 9b0e4ed..4e8f778 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1203,7 +1203,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", packBean); - if (wmsMoveDetails.getSrcOrDestZoneno() != null && wmsMoveDetails.getSrcOrDestZoneno().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { + if (wmsMoveDetails.getSrcOrDestZoneno() != null && wmsMoveDetails.getSrcOrDestZoneno().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue() && !StringUtil.isEmpty(wmsMoveDetails.getZoneNo())) { List columnNames = new ArrayList<>(); columnNames.add("srcZoneNo"); columnNames.add("destZoneNo"); From 10d5276fbb95d8cb1eb875b5438e2ea5044e295d Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 17 Sep 2020 23:43:44 +0800 Subject: [PATCH 25/33] =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=A3=80=E6=B5=8B=20?= =?UTF-8?q?=E6=BC=94=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 145 +++++++++++++++++++++ .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 10 +- .../i3plus/pojo/mes/bean/MesGenerateQcOrder.java | 49 +++++++ .../i3plus/pojo/mes/bean/MesQcCheckStandard.java | 4 + .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 14 +- .../i3plus/pojo/mes/bean/MesQcOrderRecord.java | 11 +- .../repository/MesGenerateQcOrderRepository.java | 16 +++ 7 files changed, 240 insertions(+), 9 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGenerateQcOrder.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesGenerateQcOrderRepository.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 ec7d0e5..3dc606c 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 @@ -7217,4 +7217,149 @@ public class MesEnumUtil { } } + + /** + * 质检单审批处理意见 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_ORDER_APPROVAL_CHOICE { + + STOP_LINE(10, "停线"), + RELEASE(20, "放行"); + + private int value; + private String description; + + QC_ORDER_APPROVAL_CHOICE(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; + } + } + + /** + * 整体检测结果状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CHECK_RESULT { + + PASS(10, "通过"), + NON_PASS(20, "不通过"), + CONCESSION_PRODUCTION(30, "让步生产"); + + private int value; + private String description; + + CHECK_RESULT(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; + } + } + + /** + * 整体检测结果状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_ORDER_APPROVAL_TYPE { + + STOP_LINE(10, "停线"), + RELEASE(20, "放行"); + + private int value; + private String description; + + QC_ORDER_APPROVAL_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; + } + } + + /** + * 检测单明细的检测结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_ORDER_DETAIL_CHECK_RESULT { + + OK(10, "OK"), + NG(20, "NG"); + + private int value; + private String description; + + QC_ORDER_DETAIL_CHECK_RESULT(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; + } + } } 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 bcb59d9..40c069d 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 @@ -80,7 +80,9 @@ public class MesPcnEnumUtil { return value; } - public String getData() { return data; } + public String getData() { + return data; + } public String getDescription() { return description; @@ -5216,9 +5218,9 @@ public class MesPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QC_CHECK_DATA_SOURCE { - DB(10, "10", "数据库"), - PLC(20, "20", "PLC"), - MANUAL_INPUT(30, "30", "人工输入"); + MANUAL_INPUT(10, "10", "人工输入"), + DB(30, "30", "数据库"), + PLC(20, "20", "PLC"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGenerateQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGenerateQcOrder.java new file mode 100644 index 0000000..b353da2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesGenerateQcOrder.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: jessica.chen + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_GENERATE_QC_ORDER") +@Api("待生成检验单") +public class MesGenerateQcOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = 14873669015484197L; + + @Column(name = "ORDER_NO") + @ApiParam("质检单号") + private String orderNo; + + @Column(name = "IS_GENERATED") + @ApiParam("是否生成了末检单") + private Integer isGenerated = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @Column(name = "GENERATE_TIME") + @ApiParam("生成时间") + private String generateTime; + + +} 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 1b50bdb..c6c488a 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 @@ -100,6 +100,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("任务单类型") private String checkValueType; + @Column(name = "CHECK_CFG_NO") + @ApiParam("检测值配置编号") + private String checkCfgNo; + @Column(name = "MAXIMUM") @ApiParam("最大数") private Double maximum = 0d; 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 7e25367..0ff6d06 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 @@ -14,6 +14,7 @@ import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; import java.io.Serializable; +import java.util.List; /** * @Description: @@ -29,7 +30,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QC_ORDER") @Api("MES_检验单") -public class MesQcOrder extends BaseBean implements Serializable { +public class MesQcOrder extends BaseBean implements Serializable { private static final long serialVersionUID = -5412635747424111476L; @Column(name = "ORDER_NO") @@ -84,9 +85,9 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("状态") private Integer status; - @Column(name = "CHECK_REULST") + @Column(name = "CHECK_RESULT") @ApiParam("检测整体结果") - private Integer checkReulst = 0; + private Integer checkResult = 0; @Column(name = "MEMO") @ApiParam("备注") @@ -116,9 +117,14 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("任务单类型") private String checkOrderType; + @Deprecated @ApiParam(value = "检测结果") @Transient - private String reulstStatus; + private String resultStatus; + + @ApiParam(value = "显示按钮") + @Transient + private List buttons; @ApiParam(value = "产品条码") @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java index 72337e6..e49d31d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderRecord.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; import java.io.Serializable; @@ -26,7 +27,11 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QC_ORDER_RECORD") +@Table(name = "MES_QC_ORDER_RECORD", indexes = { + @Index(columnList = "QC_ORDER_DETAIL_ID"), + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "ORDER_NO") +}) @Api("MES_检验单检验记录") public class MesQcOrderRecord extends BaseBean implements Serializable { private static final long serialVersionUID = -5245624982023882232L; @@ -51,4 +56,8 @@ public class MesQcOrderRecord extends BaseBean implements Serializable { @ApiParam("检测顺序") private Integer checkSeq; + @Column(name = "QC_ORDER_DETAIL_ID") + @ApiParam("质检单明细id") + private Long qcOrderDetailId; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesGenerateQcOrderRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesGenerateQcOrderRepository.java new file mode 100644 index 0000000..c97836d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesGenerateQcOrderRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesGenerateQcOrder; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-18-17:13 + * @Modify: + **/ +@Repository +public interface MesGenerateQcOrderRepository extends BaseRepository { +} From 8a392814aa897e55c8c818f0474699661ae62ccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 18 Sep 2020 11:32:07 +0800 Subject: [PATCH 26/33] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E6=B6=82=E8=A3=85=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/model/PaintOnLineModel.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java index 4b7addd..10b1c11 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java @@ -29,6 +29,9 @@ public class PaintOnLineModel { @ApiParam("物料名称") private String partNameRdd; + @ApiParam("颜色代码") + private String colorCode; + @ApiParam("颜色") private String color; @@ -47,9 +50,24 @@ public class PaintOnLineModel { @ApiParam("圈数") private Integer rounds; + @ApiParam("小车号") + private String smallCarNo; + + @ApiParam("车数") + private Integer smallCarAmount; + @ApiParam("过程条码") private String serialNumber; @ApiParam("是否虚拟件") private Integer isFictive = 2; + + @ApiParam("反喷标识") + private String reverseSprayMark; + + @ApiParam("备注") + private String memo; + + @ApiParam("工单类型") + private String workType; } From f14cc48243d2dd97324ed6df2ee912239efeafc3 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 18 Sep 2020 18:57:43 +0800 Subject: [PATCH 27/33] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= 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 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 7 ++++++- 2 files changed, 10 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 f9b3812..d14fe0e 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 @@ -520,6 +520,10 @@ public class WmsStockSn extends BaseBean { @ApiParam("物料库位") private String partLocateNo; + @Transient + @ApiParam("数量检查") + private Integer checkQyt; + public WmsStockSn() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 4e8f778..01ba990 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1203,18 +1203,20 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", packBean); + //实时库存待处理数据 if (wmsMoveDetails.getSrcOrDestZoneno() != null && wmsMoveDetails.getSrcOrDestZoneno().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue() && !StringUtil.isEmpty(wmsMoveDetails.getZoneNo())) { List columnNames = new ArrayList<>(); columnNames.add("srcZoneNo"); columnNames.add("destZoneNo"); DdlPreparedPack.getMultOrPackString(wmsMoveDetails.getZoneNo(), columnNames, null, packBean); + DdlPreparedPack.getNumEqualPack(WmsEnumUtil.MOVE_ORDER_STATUS.BE_HANDLE.getValue(), "itemStatus", packBean); } else { DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", packBean); + DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", packBean); } DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", packBean); - DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", packBean); DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getRefType(), "refType", packBean); DdlPreparedPack.getStringLikerPack(wmsMoveDetails.getRefSrc(), "refSrc", packBean); @@ -1359,6 +1361,9 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); + if (wmsStockSn.getCheckQyt() != null && wmsStockSn.getCheckQyt().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { + DdlPreparedPack.getNumberBiggerPack(0, "qty", result); + } if (StringUtil.isEmpty(wmsStockSn.getQualityDateTimeStart())) { wmsStockSn.setQualityDateTimeStart(""); } From 998e87b61d634cf4d2f9a1b53da76ca5282b4445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 18 Sep 2020 19:52:32 +0800 Subject: [PATCH 28/33] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E8=BF=87=E7=A8=8B=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E8=A1=A5=E6=89=93?= 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 | 4 +++- 1 file changed, 3 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 b1bb580..a4c6cd6 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 @@ -213,7 +213,9 @@ public class MesPcnEnumUtil { public enum METHOD_TYPE { EXEC(10, "执行方法"), - COMPLETE(20, "完成方法"); + COMPLETE(20, "完成方法"), + HNC_ISSUED(30, "队列自动下达"), + LABEL_PROPERTIES(40, "标签属性查询方法"); private int value; private String description; From ea875c1a3bb3a286d6f78c83a753f2a23c367844 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Sep 2020 20:50:39 +0800 Subject: [PATCH 29/33] =?UTF-8?q?SWEB=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 1 + .../i3plus/pojo/sweb/bean/SwebPurchaseOrder.java | 4 + .../pojo/sweb/bean/SwebPurchaseOrderDetails.java | 4 +- .../i3plus/pojo/sweb/bean/SwebRequireAlarm.java | 75 ++++++++++++++++++ .../i3plus/pojo/sweb/bean/SwebVendorStock.java | 75 ++++++++++++++++++ .../pojo/sweb/bean/SwebVendorSupplierCapcity.java | 92 ++++++++++++++++++++++ .../repository/SwebRequireAlarmRepository.java | 16 ++++ .../sweb/repository/SwebVendorStockRepository.java | 16 ++++ .../SwebVendorSupplierCapcityRepository.java | 16 ++++ .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 43 ++++++++++ 10 files changed, 340 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebRequireAlarmRepository.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorStockRepository.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorSupplierCapcityRepository.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 24d3342..df92d67 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 @@ -263,6 +263,7 @@ public class WmsEnumUtil { this.description = description; } + public int getValue() { return value; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java index 723d9cb..8ea25cf 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java @@ -109,6 +109,10 @@ public class SwebPurchaseOrder extends BaseBean { @ApiParam(value = "订单来源") private Integer orderSource; + @Column(name = "IS_EXT_ADD") + @ApiParam(value = "是否追加") + private Integer isExtAdd; + @Transient @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value = "预计到货时间 开始时间") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index 80833fe..6037326 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -55,9 +55,9 @@ public class SwebPurchaseOrderDetails extends BaseBean { @ApiParam(value = "零件名称") private String partName; - /*@ApiParam(value = "订单类型", example = "1") + @ApiParam(value = "订单类型", example = "1") @Column(name = "ORDER_TYPE") - public Integer orderType;*/ + public Integer orderType; @ApiParam("零件类型") @Column(name = "PART_TYPE") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java new file mode 100644 index 0000000..accc6b4 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.sweb.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 javax.persistence.Transient; + +/** + * @Description : 库存需求报警 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-09-17 + * @Modify: + **/ +@Data +@Table(name = "SWEB_REQUIRE_ALARM") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("库存需求报警") +public class SwebRequireAlarm extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam("物料代码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "VENDOR_CODE") + @ApiParam("供应商代码") + private String vendorCode; + + @Column(name = "VENDOR_NAME") + @ApiParam("供应商名称") + private String vendorName; + + @Column(name = "START_QTY") + @ApiParam("开班库存") + private Double startQty; + + @Column(name = "ALARM_LEVEL") + @ApiParam("报警级别") + private String alarmLevel; + + @Column(name = "REASON") + @ApiParam("原因分析") + private String reason; + + @Column(name = "TRACK_REMARK") + @ApiParam("跟踪情况") + private String trackRemark; + + @Column(name = "COUNT_DATE") + @ApiParam("日期") + private Double countDate; + + @Transient + @ApiParam("日期") + private String dateStart; + + @Transient + @ApiParam("日期") + private String dateEnd; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java new file mode 100644 index 0000000..3e8547b --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.sweb.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 javax.persistence.Transient; + +/** + * @Description : 供应商安全库存 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-09-17 + * @Modify: + **/ +@Data +@Table(name = "SWEB_VENDOR_STOCK") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("供应商安全库存") +public class SwebVendorStock extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam("物料代码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "VENDOR_CODE") + @ApiParam("供应商代码") + private String vendorCode; + + @Column(name = "VENDOR_NAME") + @ApiParam("供应商名称") + private String vendorName; + + @Column(name = "SAFE_TYPE") + @ApiParam("安全库存计算类型") + private Integer safeType; + + @Column(name = "SAFE_VALUE") + @ApiParam("计数值") + private String safeValue; + + @Column(name = "QTY") + @ApiParam("库存数量") + private Double qty; + + @Column(name = "COUNT_MONTH") + @ApiParam("月份") + private String countMonth; + + @Column(name = "COUNT_WEEK") + @ApiParam("周") + private String countWeek; + + @Transient + @ApiParam("日期") + private String dateStart; + + @Transient + @ApiParam("日期") + private String dateEnd; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java new file mode 100644 index 0000000..f0f2d7e --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java @@ -0,0 +1,92 @@ +package cn.estsh.i3plus.pojo.sweb.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 javax.persistence.Transient; + +/** + * @Description : 供应商供货能力 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-09-16 + * @Modify: + **/ +@Data +@Table(name = "SWEB_VENDOR_SUPPLIER_CAPCITY") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("供应商供货能力") +public class SwebVendorSupplierCapcity extends BaseBean { + private static final long serialVersionUID = 2327910806789997252L; + + @Column(name = "VENDOR_CODE") + @ApiParam("供应商代码") + private String vendorCode; + + @Column(name = "VENDOR_NAME") + @ApiParam("供应商名称") + private String vendorName; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "CURRENT_QTY") + @ApiParam("当前库存") + private Double currentQty; + + @Column(name = "PLAN_PRODUCT_QTY") + @ApiParam("计划生产或到货") + private Double planProductQty; + + @Column(name = "PLAN_REQUEST_QTY") + @ApiParam("计划需求数量") + private Double planRequestQty; + + @Column(name = "END_QTY") + @ApiParam("期末库存") + private Double endQty; + + @Column(name = "IS_DANGER") + @ApiParam("是否存在风险") + private Integer isDanger; + + @Column(name = "DANGER_SPEC") + @ApiParam("风险描述") + private String dangerSpec; + + @Column(name = "STATUS") + @ApiParam("状态") + private String status; + + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + + @Column(name = "TRACK_DATE") + @ApiParam("日期") + private String trackDate; + + @Transient + @ApiParam("日期") + private String dateStart; + + @Transient + @ApiParam("日期") + private String dateEnd; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebRequireAlarmRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebRequireAlarmRepository.java new file mode 100644 index 0000000..e9397f8 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebRequireAlarmRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebRequireAlarm; +import org.springframework.stereotype.Repository; + +/** + * @Description : 库存需求报警 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-09-17 + * @Modify: + **/ +@Repository +public interface SwebRequireAlarmRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorStockRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorStockRepository.java new file mode 100644 index 0000000..1616b4b --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorStockRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebVendorStock; +import org.springframework.stereotype.Repository; + +/** + * @Description : 供应商安全库存 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-09-17 + * @Modify: + **/ +@Repository +public interface SwebVendorStockRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorSupplierCapcityRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorSupplierCapcityRepository.java new file mode 100644 index 0000000..653d469 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorSupplierCapcityRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebVendorSupplierCapcity; +import org.springframework.stereotype.Repository; + +/** + * @Description :供应商供货能力 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-09-17 + * @Modify: + **/ +@Repository +public interface SwebVendorSupplierCapcityRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 276b52b..e81e51b 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -203,4 +203,47 @@ public class SwebHqlPack { DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); return buildHql(details, result); } + + public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(capcity.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringLikerPack(capcity.getPartNo(), "partNo", result); + DdlPreparedPack.getNumEqualPack(capcity.getStatus(), "status", result); + if (!StringUtil.isEmpty(capcity.getDateStart())) { + DdlPreparedPack.getStringBiggerPack(capcity.getDateStart(), "trackDate", result); + } + if (!StringUtil.isEmpty(capcity.getDateEnd())) { + DdlPreparedPack.getStringSmallerPack(capcity.getDateEnd(), "trackDate", result); + } + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + return buildHql(capcity, result); + } + + public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(alarm.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result); + if (!StringUtil.isEmpty(alarm.getDateStart())) { + DdlPreparedPack.getStringBiggerPack(alarm.getDateStart(), "countDate", result); + } + if (!StringUtil.isEmpty(alarm.getDateEnd())) { + DdlPreparedPack.getStringSmallerPack(alarm.getDateEnd(), "countDate", result); + } + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + return buildHql(alarm, result); + } + + public static DdlPackBean getSwebVendorStock(SwebVendorStock stock) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(stock.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringLikerPack(stock.getPartNo(), "partNo", result); +// if (!StringUtil.isEmpty(alarm.getDateStart())) { +// DdlPreparedPack.getStringBiggerPack(alarm.getDateStart(), "countDate", result); +// } +// if (!StringUtil.isEmpty(alarm.getDateEnd())) { +// DdlPreparedPack.getStringSmallerPack(alarm.getDateEnd(), "countDate", result); +// } + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + return buildHql(stock, result); + } } From 2c3571b014d54bd5d5fb28e877825c505086afdb Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 18 Sep 2020 21:12:16 +0800 Subject: [PATCH 30/33] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTJ=20MGN=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 d30ca85..8169f1f 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 @@ -242,12 +242,16 @@ public class WmsDocMovementMaster extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") public Integer pickingOrderStatus; + /** + * 备注2 + **/ @Column(name = "SECONDARY_REMAKE") - @ApiParam(value = "备注2") + @ApiParam(value = "单据原因") private String secondaryRemake; + /**备注3**/ @Column(name = "THIRD_REMAKE") - @ApiParam(value = "备注3") + @ApiParam(value = "客户类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_REMARK_PERSON", listColumnName = "name", explicitColumnName = "dictionaryValue") private String thirdRemake; From b253a020b917943916ad60ce28578943a428544e Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Sep 2020 21:43:36 +0800 Subject: [PATCH 31/33] =?UTF-8?q?=E5=90=88=E5=B9=B6test=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-mongo/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 +- 22 files changed, 22 insertions(+), 22 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-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..15ad445 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/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 1674a47..123fdc9 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 cc6131f..f06d17f 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 6749bda5588dbbbb041324291f845023fa4bbd0a Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Sep 2020 21:47:27 +0800 Subject: [PATCH 32/33] =?UTF-8?q?=E5=90=88=E5=B9=B6dev=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-mongo/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 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/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 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 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 f06d17f..cc6131f 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 5f144781c925bed8162dbbde1f8675db78bbcb2f Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Sep 2020 22:01:56 +0800 Subject: [PATCH 33/33] =?UTF-8?q?SWEB=E5=90=88=E5=B9=B6test=E4=BB=A3?= =?UTF-8?q?=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-mongo/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 +- 22 files changed, 22 insertions(+), 22 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-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..15ad445 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/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 1674a47..123fdc9 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 cc6131f..f06d17f 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=./