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 e537459..1e56902 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 @@ -83,72 +83,6 @@ public class MesEnumUtil { } /** - * 排序校验模式 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum CHECK_PROD_SEQ_FLAG { - PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"), - CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"), - OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"), - ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序"); - - private int value; - private String code; - private String description; - - CHECK_PROD_SEQ_FLAG(int value, String code, String description) { - this.value = value; - this.code = code; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public String getCode() { - return code; - } - - 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 codeOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].code; - } - } - return tmp; - } - - public static int descOf(String desc) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(desc)) { - tmp = values()[i].value; - } - } - return tmp; - } - - public static String valueOfDescription(int val) { - return valueOf(val); - } - } - /** * JIS发运是否按主队列顺序扫描 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -4176,7 +4110,6 @@ public class MesEnumUtil { public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG { NORMAL(10, "正常"), EMPTYING(20, "放空"); - private int value; private String description; @@ -4309,20 +4242,19 @@ public class MesEnumUtil { return tmp; } } - /** - * mes生产队列是否锁定 + * 关键件条码校验工步对应的物料分类的值 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum QUEUE_ORDER_IS_LOCK { + public enum PART_TYPE_THREE { - TRUE(1, "是"), - FALSE(2, "否"); + MM(10, "MM"), + MS(20, "MS"); private int value; private String description; - QUEUE_ORDER_IS_LOCK(int value, String description) { + PART_TYPE_THREE(int value, String description) { this.value = value; this.description = description; } 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/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java index 7c0abc6..befec26 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java @@ -55,6 +55,30 @@ public class MesKpData extends BaseBean implements Serializable { @ApiParam("数据下限") private Double lowerLimit; + @Column(name = "TERMINAL_ID") + @ApiParam("工位") + private Integer terminalId; + + @Column(name = "TORQUE_GROUP") + @ApiParam("扭矩组") + private String torqueGroup; + + @Column(name = "TORQUE_GROUP_SEQ") + @ApiParam("扭矩组顺序") + private Integer torqueGroupSeq; + + @Column(name = "TORQUE") + @ApiParam("扭矩项") + private String torque; + + @Column(name = "TORQUE_SEQ") + @ApiParam("扭矩项顺序") + private Integer torqueSeq; + + @Column(name = "JOB_ID") + @ApiParam("JOB_ID") + private Integer jobId; + @Transient @ApiParam("扭矩值") private Double torqueValue; @@ -63,6 +87,19 @@ public class MesKpData extends BaseBean implements Serializable { @ApiParam("是否在范围之内") private Boolean ok; + @Transient + @ApiParam("应采个数") + private Integer shouldNum; + + @Transient + @ApiParam("实采个数") + private Integer actualNum; + + @Transient + @ApiParam("记录颜色") + private String color; + + public double getKeyDataCountVal() { return this.keyDataCount == null ? 0 : this.keyDataCount; } 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/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index 33cb908..6cfbd40 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -58,6 +58,10 @@ public class MesWorkCenter extends BaseBean implements Serializable { @ApiParam("运行状态") private String runningStatus; + @Column(name = "PRODUCTION_CAPACITY") + @ApiParam("产能") + private Integer productionCapacity; + @Transient @ApiParam(value = "子集列表") private List childTreeList; 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 { +}