From 7aecf9dcc0eb3249d91ff699ae2e53eccae3ea84 Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 11 Mar 2020 10:58:21 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90task=201436=20=E5=B7=A5=E6=AD=A5-?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E4=BB=B6=E7=BB=91=E5=AE=9A=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=B9=B6=E8=BD=AC=E8=BF=87=E7=A8=8B=E6=9D=A1=E7=A0=81=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 71 ---------------------- .../pojo/mes/pcn/bean/MesProdScatterCfgBom.java | 55 +++++++++++++++++ .../repository/MesProdScatterCfgBomRepository.java | 16 +++++ .../i3plus/pojo/mes/bean/MesProdScatterCfgBom.java | 55 +++++++++++++++++ .../repository/MesProdScatterCfgBomRepository.java | 15 +++++ 5 files changed, 141 insertions(+), 71 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterCfgBomRepository.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 850ce6c..6882f7c 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 @@ -4063,75 +4063,4 @@ public class MesEnumUtil { return tmp; } } - - /** - * 客户JIT生产队列状态 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_QUEUE_JIT_ACTUAL_STATUS { - CREATE(10, "创建"), - LANDED(20, "下达"), - CANCEL(30, "取消"); - - private int value; - private String description; - - MES_QUEUE_JIT_ACTUAL_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; - } - } - - /** - * 客户JIT生产队列特殊标识 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG { - NORMAL(10, "正常"), - EMPTYING(20, "放空"); - - private int value; - private String description; - - MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG(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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java new file mode 100644 index 0000000..180b0df --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; +import java.math.BigDecimal; + +/** + * @Description :散件产品配置明细 + * @Reference : + * @Author : zcg + * @Date : 2020/3/9 0009 - 17:52 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_SCATTER_CFG_BOM") +@Api("散件产品配置明细") +public class MesProdScatterCfgBom extends BaseBean implements Serializable { + + @Column(name = "SP_CFG_CODE") + @ApiParam("散件配置编码") + private String spCfgCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "PART_NO") + @ApiParam("散件产品代码") + private String partNo; + + @Column(name = "ITEM_PART_NO") + @ApiParam("原材料物料号") + private String itemPartNo; + + @Column(name = "QTY") + @ApiParam("用量") + private BigDecimal qty; + + @Column(name = "IS_KEY_PART") + @ApiParam("是否关键件") + private Integer isKeyPart ; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java new file mode 100644 index 0000000..6827df9 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdScatterCfgBom; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/9 0009 - 18:03 + */ +@Repository +public interface MesProdScatterCfgBomRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java new file mode 100644 index 0000000..73fae24 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java @@ -0,0 +1,55 @@ +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; +import java.math.BigDecimal; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/9 0009 - 17:58 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_SCATTER_CFG_BOM") +@Api("散件产品配置明细") +public class MesProdScatterCfgBom extends BaseBean implements Serializable { + + @Column(name = "SP_CFG_CODE") + @ApiParam("散件配置编码") + private String spCfgCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "PART_NO") + @ApiParam("散件产品代码") + private String partNo; + + @Column(name = "ITEM_PART_NO") + @ApiParam("原材料物料号") + private String itemPartNo; + + @Column(name = "QTY") + @ApiParam("用量") + private BigDecimal qty; + + @Column(name = "IS_KEY_PART") + @ApiParam("是否关键件") + private Integer isKeyPart ; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterCfgBomRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterCfgBomRepository.java new file mode 100644 index 0000000..d21d930 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterCfgBomRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProdScatterCfgBom; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/9 0009 - 18:56 + */ +@Repository +public interface MesProdScatterCfgBomRepository extends BaseRepository { +}