From 3eda200854068c9042d0cc9ee533855f05fdc304 Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 22 Nov 2019 11:03:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90bug=EF=BC=9A6545=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E6=9E=9A=E4=B8=BE=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/MesPartObject.java | 13 ++++++++ .../mes/repository/MesPartObjectRepository.java | 14 +++++++++ 3 files changed, 62 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartObjectRepository.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 328f36e..cd3143f 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 @@ -14,6 +14,41 @@ public class MesEnumUtil { /** + * MES_TYPE_CFG 类型信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_TYPE_CFG { + + DEFECT("DEFECT", "缺陷"), + DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"), + REPAIR("REPAIR", "处理措施"); + + private String value; + private String description; + + MES_TYPE_CFG(String value, String description) { + this.value = value; + this.description = description; + } + + public String 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.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * RAW_PART_STATUS 原材料状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java index b950b1a..12280a7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description: @@ -39,4 +40,16 @@ public class MesPartObject extends BaseBean { @Column(name = "OBJECT_NAME") @ApiParam("物料名称") private String objectName; + + @Transient + @ApiParam("产品条码") + private String productSn; + + @Transient + @ApiParam("产品条码") + private String serialNumber; + + @Transient + @ApiParam("字段总数") + private Integer fieldNum; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartObjectRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartObjectRepository.java new file mode 100644 index 0000000..815de2b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartObjectRepository.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.MesPartObject; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\21 17:06 + * @Modify: + **/ +public interface MesPartObjectRepository extends BaseRepository { +} From 7d623560b6cb9df3af74d9e2e012e21a194d8d73 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 22 Nov 2019 11:10:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1202?= =?UTF-8?q?=EF=BC=8C=E6=9D=A1=E7=A0=81=E8=A1=A5=E6=89=93=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 13 +++- .../pojo/mes/pcn}/model/SnPrintDataModel.java | 4 +- .../i3plus/pojo/mes/pcn}/model/SnPrintModel.java | 2 +- .../pojo/mes/pcn}/model/SnPrintValueModel.java | 4 +- .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 70 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 14 +---- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 69 --------------------- 7 files changed, 89 insertions(+), 87 deletions(-) rename modules/{i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes => i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn}/model/SnPrintDataModel.java (82%) rename modules/{i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes => i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn}/model/SnPrintModel.java (92%) rename modules/{i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes => i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn}/model/SnPrintValueModel.java (93%) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java index 633a068..b4fff69 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -132,6 +132,14 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("操作类型") private Integer operateType; + @Transient + @ApiParam("下线时间开始") + private String outWorkCenterTimeStart; + + @Transient + @ApiParam("下线时间截止") + private String outWorkCenterTimeEnd; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } @@ -178,9 +186,12 @@ public class MesProduceSn extends BaseBean implements Serializable { ", workOrderNo='" + workOrderNo + '\'' + ", custSn='" + custSn + '\'' + ", custPartNo='" + custPartNo + '\'' + - ", snType='" + snType + '\'' + + ", snType=" + snType + ", tray='" + tray + '\'' + ", resultMsg='" + resultMsg + '\'' + + ", operateType=" + operateType + + ", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' + + ", outWorkCenterTimeEnd='" + outWorkCenterTimeEnd + '\'' + '}'; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java similarity index 82% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java index 874ed08..7a2c56b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java @@ -1,6 +1,6 @@ -package cn.estsh.i3plus.pojo.mes.model; +package cn.estsh.i3plus.pojo.mes.pcn.model; -import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java similarity index 92% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java index bb2620a..5f65795 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.model; +package cn.estsh.i3plus.pojo.mes.pcn.model; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintValueModel.java similarity index 93% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintValueModel.java index 42dbbea..d3e47e4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintValueModel.java @@ -1,6 +1,6 @@ -package cn.estsh.i3plus.pojo.mes.model; +package cn.estsh.i3plus.pojo.mes.pcn.model; -import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index 82ef884..032919c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -280,4 +280,74 @@ public class MesHqlPack { return packBean; } + /** + * 按条件分页查询产品条码补打印数据 + * @param mesProduceSn + * @return + */ + public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) { + DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode()); + if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { + DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); + } + + if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getProductSn())) { + DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean); + } + + if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); + } + + if (!org.springframework.util.StringUtils.isEmpty(mesProduceSn.getSnStatus())) { + DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); + } + + // 时间段查询 + DdlPreparedPack.timeBuilder( + mesProduceSn.getCreateDateTimeStart(), + mesProduceSn.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + DdlPreparedPack.timeBuilder( + mesProduceSn.getOutWorkCenterTimeStart(), + mesProduceSn.getOutWorkCenterTimeEnd(), + "outWorkCenterTime", packBean, true); + + return packBean; + } + + /** + * 按条件分页查询包装条码补打印数据 + * @param mesPackage + * @return + */ + public static DdlPackBean getPackageSnPrint(MesPackage mesPackage) { + + DdlPackBean packBean = getAllBaseData(mesPackage.getOrganizeCode()); + if (!org.springframework.util.StringUtils.isEmpty(mesPackage.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean); + } + + if (!org.springframework.util.StringUtils.isEmpty(mesPackage.getPackLevel())) { + DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean); + } + + if (!org.springframework.util.StringUtils.isEmpty(mesPackage.getPackageNo())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); + } + + if (!org.springframework.util.StringUtils.isEmpty(mesPackage.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); + } + + // 时间段查询 + DdlPreparedPack.timeBuilder( + mesPackage.getCreateDateTimeStart(), + mesPackage.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + + return packBean; + } + + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 7e72209..9a81548 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -129,15 +129,6 @@ public class MesProduceSn extends BaseBean { @ApiParam("返回信息") private String resultMsg; - @Transient - @ApiParam("下线时间开始") - private String outWorkCenterTimeStart; - - @Transient - @ApiParam("下线时间截止") - private String outWorkCenterTimeEnd; - - public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } @@ -184,11 +175,10 @@ public class MesProduceSn extends BaseBean { ", workOrderNo='" + workOrderNo + '\'' + ", custSn='" + custSn + '\'' + ", custPartNo='" + custPartNo + '\'' + - ", snType='" + snType + '\'' + + ", snType=" + snType + ", tray='" + tray + '\'' + + ", operateType=" + operateType + ", resultMsg='" + resultMsg + '\'' + - ", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' + - ", outWorkCenterTimeEnd='" + outWorkCenterTimeEnd + '\'' + '}'; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index d39ad15..70087fd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -1923,73 +1923,4 @@ public class MesHqlPack { return packBean; } - /** - * 按条件分页查询产品条码补打印数据 - * @param mesProduceSn - * @return - */ - public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) { - DdlPackBean packBean = getMesAllData(mesProduceSn.getOrganizeCode()); - if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); - } - - if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean); - } - - if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); - } - - if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) { - DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); - } - - // 时间段查询 - DdlPreparedPack.timeBuilder( - mesProduceSn.getCreateDateTimeStart(), - mesProduceSn.getCreateDateTimeEnd(), - "createDatetime", packBean, true); - DdlPreparedPack.timeBuilder( - mesProduceSn.getOutWorkCenterTimeStart(), - mesProduceSn.getOutWorkCenterTimeEnd(), - "outWorkCenterTime", packBean, true); - - return packBean; - } - - /** - * 按条件分页查询包装条码补打印数据 - * @param mesPackage - * @return - */ - public static DdlPackBean getPackageSnPrint(MesPackage mesPackage) { - - DdlPackBean packBean = getMesAllData(mesPackage.getOrganizeCode()); - if (!StringUtils.isEmpty(mesPackage.getPartNo())) { - DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean); - } - - if (!StringUtils.isEmpty(mesPackage.getPackLevel())) { - DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean); - } - - if (!StringUtils.isEmpty(mesPackage.getPackageNo())) { - DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); - } - - if (!StringUtils.isEmpty(mesPackage.getWorkCenterCode())) { - DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); - } - - // 时间段查询 - DdlPreparedPack.timeBuilder( - mesPackage.getCreateDateTimeStart(), - mesPackage.getCreateDateTimeEnd(), - "createDatetime", packBean, true); - - return packBean; - } - }