From 5f6a7c9a98e73bb84f8d37a699507540a75cd54b Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 12 Nov 2020 18:42:26 +0800 Subject: [PATCH 1/5] =?UTF-8?q?Fix=20bug#12380=2019048-=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=B8=8B=E5=8F=91BOM=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java index c276781..a2488f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description 全量BOM @@ -103,4 +104,15 @@ public class WmsBomTotal extends BaseBean { public boolean hasChild() { return category != null && category.trim().equals(MGANA_BOM_HAS_CHILD); } + + /** + * 导入列 + */ + @Transient + @ApiParam(value = "行数") + private Integer rows; + + @Transient + @ApiParam(value = "状态") + private Integer status; } From 86998e109ed4bb174195d7962340204d5c8370b5 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 12 Nov 2020 20:38:38 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=80=BB=E8=A3=85=20=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E5=88=A4=E5=AE=9A?= 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 | 3 +++ 1 file changed, 3 insertions(+) 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 931906d..4cc7cf7 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 @@ -42,4 +42,7 @@ public class DismantleRecordModel { @ApiParam("不良集合") private List defectList; + + @ApiParam("返修工位标志") + private String repairFlag; } From 89bf22521a4f93c0ac79cf8383c92ec8931e5004 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 13 Nov 2020 10:11:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?Fix=20bug#12380=2019048-=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=B8=8B=E5=8F=91BOM=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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 7effd9e..1d731cd 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 @@ -2349,6 +2349,21 @@ public class WmsEnumUtil { public String getDescription() { return description; } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } /** From cea2d334e307034ad7d9cb525100295fd1f64598 Mon Sep 17 00:00:00 2001 From: simon Date: Fri, 13 Nov 2020 14:56:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=B8=AD=E8=88=AA-=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=85=AC=E5=B7=AE=E4=B8=8A=E7=BA=BF=E5=92=8C=E5=85=AC=E5=B7=AE?= =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E8=B5=8B=E5=80=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java | 15 +++++++++------ .../i3plus/pojo/mes/model/MesQualityStandardModel.java | 8 ++++---- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java index 707ff42..88a7573 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -69,11 +70,11 @@ public class MesQualityStandard extends BaseBean implements Serializable { @Column(name = "IS_CONCESSION") @ApiParam("是否允许让步") - private String isConcession; + private Integer isConcession; @Column(name = "CHECK_INTERVAL") @ApiParam("间隔时间") - private String checkInterval; + private Integer checkInterval = 0; //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2 @Column(name = "NUMBER_FLAG") @@ -99,13 +100,15 @@ public class MesQualityStandard extends BaseBean implements Serializable { @ApiParam("检验值类型") private String checkValueType; - @Column(name = "maximum") + @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("公差上限") - private BigDecimal maximum; + private Double maximum = 0d; - @Column(name = "minimum") + @Column(name = "MINIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("公差下限") - private BigDecimal minimum; + private Double minimum = 0d; @Column(name = "IS_KEY_CHECK_ITEM") @ApiParam("是否关键检测项") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java index fc27237..8a023f4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java @@ -45,10 +45,10 @@ public class MesQualityStandardModel { private String checkFrequency; @ApiParam("是否允许让步") - private String isConcession; + private Integer isConcession; @ApiParam("间隔时间") - private String checkInterval; + private Integer checkInterval; //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2 @ApiParam("个数标识") @@ -70,10 +70,10 @@ public class MesQualityStandardModel { private String checkValueType; @ApiParam("公差上限") - private BigDecimal maximum; + private Double maximum; @ApiParam("公差下限") - private BigDecimal minimum; + private Double minimum; @ApiParam("是否关键检测项") private Integer isKeyCheckItem; From 84986eb644ad991d179383121e36df024ad91417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 13 Nov 2020 15:51:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index cfcc146..90d847f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -168,4 +168,13 @@ public class IfProductOffLine extends BaseBean implements Serializable { this.workCenterCode = workCenterCode; this.qcStatus = qcStatus; } + + public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double itemQty, String createDatetime) { + this.workCenterCode = workCenterCode; + this.partNo = partNo; + this.partName = partName; + this.packageNo = packageNo; + this.itemQty = itemQty; + this.createDatetime = createDatetime; + } }