From 9418a0838be0bb457ea8f48cc295c589dbaf1429 Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 5 Nov 2019 17:01:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1129=20?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=BC=96=E7=A0=81=E9=85=8D=E7=BD=AE=E5=9F=BA?= =?UTF-8?q?=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 | 82 +++++++++++++++++++++- .../i3plus/pojo/mes/bean/MesProductEncodeCfg.java | 46 ++++++++++++ .../repository/MesProductEncodeCfgRepository.java | 14 ++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 25 ++++++- 4 files changed, 163 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProductEncodeCfgRepository.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 2a6c96c..55323d9 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 @@ -13,6 +13,82 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * MesProductEncodeCfg 匹配类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_MATCH_TYPE { + + ORGANIZATION("10", "工厂"), + PART("20", "物料"), + CUST_CODE("30", "客户代码"), + CUST_PART_NO("40", "客户物料号"), + WORK_CENTER("50", "产线"); + + private String value; + private String description; + + MES_MATCH_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; + } + } + + /** + * MesProductEncodeCfg 编码类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_CODE_TYPE { + + SERIAL_SN("10", "过程条码"), + PRODUCT_SN("20", "产品条码"), + PACK_SN("30", "包装条码"); + + private String value; + private String description; + + MES_CODE_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; + } + } + + /** * MesDatasource 数据源类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -51,10 +127,10 @@ public class MesEnumUtil { } /** - * MesRepair 数据对象操作类型 + * Mes 数据对象操作类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_DADA_OPRATE_TYPE { + public enum MES_DATA_OPERATE_TYPE { INSERT(10, "insert"), SELECT(20, "select"), @@ -63,7 +139,7 @@ public class MesEnumUtil { private int value; private String description; - MES_DADA_OPRATE_TYPE(int value, String description) { + MES_DATA_OPERATE_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/MesProductEncodeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java new file mode 100644 index 0000000..5eac148 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java @@ -0,0 +1,46 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\5 10:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCT_ENCODE_CFG") +@Api("产品编码配置") +public class MesProductEncodeCfg extends BaseBean { + + @Column(name = "CODE_TYPE") + @ApiParam("编码类型") + private String codeType; + + @Column(name = "MATCH_TYPE") + @ApiParam("匹配类型") + private String matchType; + + @Column(name = "MATCH_VALUE") + @ApiParam("匹配值") + private String matchValue; + + @Column(name = "RULE_CODE") + @ApiParam("编码规则代码") + private String ruleCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProductEncodeCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProductEncodeCfgRepository.java new file mode 100644 index 0000000..e32004c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProductEncodeCfgRepository.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.MesProductEncodeCfg; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\5 10:59 + * @Modify: + **/ +public interface MesProductEncodeCfgRepository 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 f3d65be..a524002 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 @@ -1653,7 +1653,7 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesDataObject.getOperateType(), "operateType", packBean); } if (!StringUtils.isEmpty(mesDataObject.getFieldPk())) { - DdlPreparedPack.getStringLikerPack(mesDataObject.getObjectName(), "fieldPk", packBean); + DdlPreparedPack.getStringLikerPack(mesDataObject.getFieldPk(), "fieldPk", packBean); } return packBean; } @@ -1683,4 +1683,27 @@ public class MesHqlPack { } return packBean; } + + /** + * 产品编码配置 + * @param mesProductEncodeCfg + * @param organizeCode + * @return + */ + public static DdlPackBean getMesProductEncodeCfg(MesProductEncodeCfg mesProductEncodeCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesProductEncodeCfg, organizeCode); + if (!StringUtils.isEmpty(mesProductEncodeCfg.getMatchValue())) { + DdlPreparedPack.getStringLikerPack(mesProductEncodeCfg.getMatchValue(), "matchValue", packBean); + } + if (!StringUtils.isEmpty(mesProductEncodeCfg.getCodeType())) { + DdlPreparedPack.getStringEqualPack(mesProductEncodeCfg.getCodeType(), "codeType", packBean); + } + if (!StringUtils.isEmpty(mesProductEncodeCfg.getMatchType())) { + DdlPreparedPack.getStringEqualPack(mesProductEncodeCfg.getMatchType(), "matchType", packBean); + } + if (!StringUtils.isEmpty(mesProductEncodeCfg.getRuleCode())) { + DdlPreparedPack.getStringEqualPack(mesProductEncodeCfg.getRuleCode(), "ruleCode", packBean); + } + return packBean; + } } From 3b447fa77a7d04501f201ceb2e3ae0fba75931ff Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 5 Nov 2019 18:08:34 +0800 Subject: [PATCH 2/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 --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index e85047d..b7a1607 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 @@ -1933,4 +1933,40 @@ public class MesPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SN_TRAVEL_OPERATE { + + WORKCELL_SCAN(10, "工位扫描"), + CHECK_QUALITY(20, "质量判定"), + DISASSEMBLE_MATERIAL(30, "物料拆解"), + REWORK(40, "返修作业"); + + private int value; + private String description; + + SN_TRAVEL_OPERATE(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; + } + } + + }