From 4308084ca304f90a8afe5238f2f5e4423e92b2ac Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 4 Nov 2019 15:54:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=BD=E5=8F=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=201130?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 6 +++++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) 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 ac36ee1..633a068 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 @@ -33,9 +33,13 @@ public class MesProduceSn extends BaseBean implements Serializable { private static final long serialVersionUID = 6641051790330191326L; @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; 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 88c9257..9f2dc8c 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 @@ -30,9 +30,13 @@ import javax.persistence.Transient; public class MesProduceSn extends BaseBean { @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; From 32dbaed8fea47349be5fb2c4af84f751f56275d9 Mon Sep 17 00:00:00 2001 From: jokelone Date: Mon, 4 Nov 2019 18:07:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1129?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=B9=E8=B1=A1=E3=80=81=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E3=80=81=E4=BA=A7=E5=93=81=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 76 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesDataObject.java | 1 - .../cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java | 6 +- .../mes/repository/MesDataObjectRepository.java | 14 ++++ .../mes/repository/MesObjectCfgRepository.java | 14 ++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 72 ++++++++++++++++++++ 6 files changed, 180 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataObjectRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesObjectCfgRepository.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 fc5e745..2a6c96c 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 @@ -9,9 +9,85 @@ import com.fasterxml.jackson.annotation.JsonFormat; * @CreateDate : 2018-10-23 15:53 * @Modify: **/ + public class MesEnumUtil { /** + * MesDatasource 数据源类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_DB_SOURCE_TYPE { + + SOURCE_MARIA_DB("SOURCE_MARIA_DB", "MariaDB"), + SOURCE_SQL_SERVER("SOURCE_SQL_SERVER", "SQL Server"), + SOURCE_ORACLE("SOURCE_ORACLE", "Oracle"), + SOURCE_POSTGRE_SQL("SOURCE_POSTGRE_SQL", "PostgreSql"); + + private String value; + private String description; + + MES_DB_SOURCE_TYPE(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; + } + } + + /** + * MesRepair 数据对象操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_DADA_OPRATE_TYPE { + + INSERT(10, "insert"), + SELECT(20, "select"), + UPDATE(30, "update"); + + private int value; + private String description; + + MES_DADA_OPRATE_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; + } + } + + /** * MesRepair 处理措施 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java index debf5a3..c41888b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java @@ -31,7 +31,6 @@ public class MesDataObject extends BaseBean { @ApiParam("对象代码") private String objectCode; - @Column(name = "OBJECT_NAME") @ApiParam("对象名称") private String objectName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java index 72fbe02..50b9ecf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java @@ -47,6 +47,10 @@ public class MesProdPack extends BaseBean { @ApiParam("包装标签模板2") private String packLabelTemplate2; + @Column(name = "PACK_LABEL_TEMPLATE") + @ApiParam("包装标签模板") + private String packLabelTemplate; + @Column(name = "PACK_LABEL_TEMPLATE3") @ApiParam("包装标签模板3") private String packLabelTemplate3; @@ -58,6 +62,4 @@ public class MesProdPack extends BaseBean { @Column(name = "PROD_CFG_TYPE") @ApiParam("项目") private String prodCfgType; - - } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataObjectRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataObjectRepository.java new file mode 100644 index 0000000..b17e7ee --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataObjectRepository.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.MesDataObject; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\4 9:53 + * @Modify: + **/ +public interface MesDataObjectRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesObjectCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesObjectCfgRepository.java new file mode 100644 index 0000000..f310400 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesObjectCfgRepository.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.MesObjectCfg; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\4 9:37 + * @Modify: + **/ +public interface MesObjectCfgRepository extends BaseRepository { +} 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 69b01b7..ad7909d 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 @@ -1603,4 +1603,76 @@ public class MesHqlPack { } return packBean; } + + /** + * 对象结构 + * @param mesObjectCfg + * @param organizeCode + * @return + */ + public static DdlPackBean getMesObjectCfg(MesObjectCfg mesObjectCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesObjectCfg, organizeCode); + if (!StringUtils.isEmpty(mesObjectCfg.getObjectCode())) { + DdlPreparedPack.getStringLikerPack(mesObjectCfg.getObjectCode(), "objectCode", packBean); + } + if (!StringUtils.isEmpty(mesObjectCfg.getFieldCode())) { + DdlPreparedPack.getStringLikerPack(mesObjectCfg.getFieldCode(), "fieldCode", packBean); + } + if (!StringUtils.isEmpty(mesObjectCfg.getFieldName())) { + DdlPreparedPack.getStringLikerPack(mesObjectCfg.getFieldName(), "fieldName", packBean); + } + if (!StringUtils.isEmpty(mesObjectCfg.getFieldType())) { + DdlPreparedPack.getStringLikerPack(mesObjectCfg.getFieldType(), "fieldType", packBean); + } + return packBean; + } + + /** + * 数据对象 + * @param mesDataObject + * @param organizeCode + * @return + */ + public static DdlPackBean getMesDataObject(MesDataObject mesDataObject, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesDataObject, organizeCode); + if (!StringUtils.isEmpty(mesDataObject.getObjectCode())) { + DdlPreparedPack.getStringLikerPack(mesDataObject.getObjectCode(), "objectCode", packBean); + } + if (!StringUtils.isEmpty(mesDataObject.getObjectName())) { + DdlPreparedPack.getStringLikerPack(mesDataObject.getObjectName(), "objectName", packBean); + } + if (mesDataObject.getOperateType() != null) { + DdlPreparedPack.getNumEqualPack(mesDataObject.getOperateType(), "operateType", packBean); + } + if (!StringUtils.isEmpty(mesDataObject.getFieldPk())) { + DdlPreparedPack.getStringLikerPack(mesDataObject.getObjectName(), "fieldPk", packBean); + } + return packBean; + } + + /** + * 产品包装关系 + * @param mesProdPack + * @param organizeCode + * @return + */ + public static DdlPackBean getMesProdPack(MesProdPack mesProdPack, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdPack, organizeCode); + if (!StringUtils.isEmpty(mesProdPack.getPartNo())) { + DdlPreparedPack.getStringEqualPack(mesProdPack.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesProdPack.getCustomerCode())) { + DdlPreparedPack.getStringEqualPack(mesProdPack.getCustomerCode(), "customerCode", packBean); + } + if (!StringUtils.isEmpty(mesProdPack.getPackSpec())) { + DdlPreparedPack.getStringLikerPack(mesProdPack.getPackSpec(), "packSpec", packBean); + } + if (!StringUtils.isEmpty(mesProdPack.getPackLabelTemplate())) { + DdlPreparedPack.getStringLikerPack(mesProdPack.getPackLabelTemplate(), "packLabelTemplate", packBean); + } + if (!StringUtils.isEmpty(mesProdPack.getProdLabelTemplate())) { + DdlPreparedPack.getStringLikerPack(mesProdPack.getProdLabelTemplate(), "prodLabelTemplate", packBean); + } + return packBean; + } }